diff --git a/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.html b/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.html index bd02f23d2b37..dd1c2fe132dd 100644 --- a/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.html +++ b/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.html @@ -73,7 +73,7 @@ [ngbTooltip]="(isCollapsed ? 'Expand' : 'Collapse') + ' Menu (Ctrl + M)'" (click)="toggleCollapseState()" > -
+
diff --git a/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.scss b/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.scss index ec44cc37ac80..73ef30a5dcda 100644 --- a/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.scss +++ b/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.scss @@ -107,12 +107,12 @@ $exam-test-run-offset: 38px; } .double-arrow.menu-closed { - transform: translate(24px) rotate(0deg); + transform: translate(24px); } .double-arrow { - transform: translate(187px) rotate(180deg); - transition: all ease 0.2s; + transform: translate(187px); + transition: transform ease 0.3s; cursor: pointer; width: 30px; align-items: center; @@ -120,6 +120,16 @@ $exam-test-run-offset: 38px; display: flex; } +.menu-closed .double-arrow-icon { + transform: rotate(0deg); +} + +.double-arrow-icon { + transform: rotate(180deg); + + transition: transform ease 0.3s 0.3s; +} + .me-negative { margin-right: -5px; } diff --git a/src/main/webapp/app/overview/course-conversations/course-conversations.component.html b/src/main/webapp/app/overview/course-conversations/course-conversations.component.html index 9979347728ec..90b2559fa81a 100644 --- a/src/main/webapp/app/overview/course-conversations/course-conversations.component.html +++ b/src/main/webapp/app/overview/course-conversations/course-conversations.component.html @@ -22,7 +22,7 @@ } @if (isCodeOfConductAccepted && isServiceSetUp && course) {
-
+
+
@if (course) {
diff --git a/src/main/webapp/app/overview/course-exercises/course-exercises.component.html b/src/main/webapp/app/overview/course-exercises/course-exercises.component.html index 6be118bf7475..830d3863c55e 100644 --- a/src/main/webapp/app/overview/course-exercises/course-exercises.component.html +++ b/src/main/webapp/app/overview/course-exercises/course-exercises.component.html @@ -1,4 +1,4 @@ -
+
@if (course) {
diff --git a/src/main/webapp/app/overview/course-lectures/course-lectures.component.html b/src/main/webapp/app/overview/course-lectures/course-lectures.component.html index ee245be3e109..29c7787fcc4a 100644 --- a/src/main/webapp/app/overview/course-lectures/course-lectures.component.html +++ b/src/main/webapp/app/overview/course-lectures/course-lectures.component.html @@ -1,4 +1,4 @@ -
+
@if (course) {
diff --git a/src/main/webapp/app/overview/course-overview.component.html b/src/main/webapp/app/overview/course-overview.component.html index 3d3a67a9b876..e5641f6db02f 100644 --- a/src/main/webapp/app/overview/course-overview.component.html +++ b/src/main/webapp/app/overview/course-overview.component.html @@ -63,7 +63,7 @@
@@ -121,7 +121,7 @@ [ngbTooltip]="(isNavbarCollapsed ? 'Expand' : 'Collapse') + ' Menu (Ctrl + M)'" (click)="toggleCollapseState()" > -
+
diff --git a/src/main/webapp/app/overview/course-overview.component.scss b/src/main/webapp/app/overview/course-overview.component.scss index a5376a397fcd..872969c33810 100644 --- a/src/main/webapp/app/overview/course-overview.component.scss +++ b/src/main/webapp/app/overview/course-overview.component.scss @@ -3,7 +3,7 @@ $menu-width-open: 220px; $breadcrumb-height: 45px; // needed to make the exam fullscreen // Sidebar Button Transition Variables -$transition-delay: 0.1s; +$transition-delay: 0.3s; $transition-in-between-delay: 0.2s; $transition-chevron-rotate-length: 0.2s; $transition-chevron-max-width-length: 0.2s; @@ -196,12 +196,12 @@ jhi-secured-image { } .double-arrow.menu-closed { - transform: translate(16px) rotate(0deg); + transform: translate(16px); } .double-arrow { - transform: translate(180px) rotate(180deg); - transition: all ease 0.3s; + transform: translate(180px); + transition: transform ease 0.3s; cursor: pointer; width: 30px; align-items: center; @@ -209,6 +209,16 @@ jhi-secured-image { display: flex; } +.menu-closed .double-arrow-icon { + transform: rotate(0deg); +} + +.double-arrow-icon { + transform: rotate(180deg); + + transition: transform ease 0.3s 0.3s; +} + .me-negative { margin-right: -5px; } @@ -290,8 +300,19 @@ jhi-secured-image { transition: opacity $transition-color-length $transition-delay + $transition-chevron-rotate-length * 2 ease-in-out; } -.btn-sidebar-collapse:hover::after, +.btn-sidebar-collapse:hover::after { + background-color: var(--sidebar-card-selected-bg); +} + .btn-sidebar-collapse:hover::before { + background-color: var(--link-item-bg); +} + +.btn-sidebar-collapse:active::after { + background-color: var(--link-item-bg); +} + +.btn-sidebar-collapse:active::before { background-color: var(--sidebar-card-selected-bg); } diff --git a/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-groups.component.html b/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-groups.component.html index c2acc5bebdc0..c6f3864b47b7 100644 --- a/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-groups.component.html +++ b/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-groups.component.html @@ -1,4 +1,4 @@ -
+
@if (course) {
diff --git a/src/main/webapp/app/shared/sidebar/sidebar.component.html b/src/main/webapp/app/shared/sidebar/sidebar.component.html index ea513b48174e..a70e2a9e604f 100644 --- a/src/main/webapp/app/shared/sidebar/sidebar.component.html +++ b/src/main/webapp/app/shared/sidebar/sidebar.component.html @@ -1,74 +1,76 @@ -