Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Plagiarism checks: Fix scrolling issue on side-by-side viewer for modeling #9748

Merged
merged 7 commits into from
Nov 16, 2024
Merged

Plagiarism checks: Fix scrolling issue on side-by-side viewer for modeling #9748

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
af269d0
Development: set overflow-y to be auto to allow scrolling for larger …
AjayvirS Nov 9, 2024
b532d2a
Merge branch 'develop' into bugfix/5402-scrolldown-plagiarism-editor
AjayvirS Nov 9, 2024
cfdb328
Merge branch 'develop' into bugfix/general/5402-scrolldown-plagiarism…
AjayvirS Nov 14, 2024
6590f0a
Update src/main/webapp/app/exercises/modeling/shared/modeling-editor.…
AjayvirS Nov 14, 2024
9406779
add support for all webkit browsers
AjayvirS Nov 14, 2024
633662b
allow horizontal overflow and add suggestions
AjayvirS Nov 14, 2024
52f3bc4
fix playwright test to be more specific at selecting element (fixes f…
AjayvirS Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,11 @@ <h4 class="modal-title" jhiTranslate="artemisApp.modelingEditor.helpModal.title"
}
</div>
@if (readOnly) {
<div class="d-flex align-items-center justify-content-center readonly-diagram" [innerHtml]="readOnlySVG" [style.margin-top]="isFullScreen ? '30px' : ''"></div>
<div
class="d-flex align-items-center justify-content-center readonly-diagram scroll-container"
[innerHtml]="readOnlySVG"
[ngClass]="{ 'full-screen-margin': isFullScreen }"
></div>
}

@if (withExplanation) {
Expand Down
19 changes: 18 additions & 1 deletion src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,24 @@ $draggable-width: 15px;

.readonly-diagram {
height: 100%;
overflow: hidden;
overflow-x: auto;
overflow-y: auto;
}
AjayvirS marked this conversation as resolved.
Show resolved Hide resolved

.scroll-container {
scrollbar-width: thin; /* Firefox */
&::-webkit-scrollbar {
width: 6px; /* WebKit */
}

&::-webkit-scrollbar-thumb {
background-color: rgba(0, 0, 0, 0.2);
border-radius: 3px;
}
}

.full-screen-margin {
margin-top: 30px;
}

@keyframes spin {
Expand Down
Loading