From 7de39c15d1de8e8a2660d98f9bba7e08630ca463 Mon Sep 17 00:00:00 2001 From: Suttrop <239040530+suttrop@users.noreply.github.com> Date: Mon, 22 Jun 2026 21:48:13 +0200 Subject: [PATCH 1/9] add different heights for different separators --- evap/static/scss/components/_progress.scss | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/evap/static/scss/components/_progress.scss b/evap/static/scss/components/_progress.scss index 5f098ad1ef..a04f2859ff 100644 --- a/evap/static/scss/components/_progress.scss +++ b/evap/static/scss/components/_progress.scss @@ -75,8 +75,25 @@ .seperator { width: 1px; - height: 8px; + //height: 8px; border: $dark-gray 1px solid; } } +.progress-step:nth-of-type(3n + 1) { + .seperator { + height: 8px; + } +} + +.progress-step:nth-of-type(3n + 2) { + .seperator { + height: 26px; + } +} + +.progress-step:nth-of-type(3n) { + .seperator { + height: 44px; + } +} From 6d883950225cb80b951c2f2e5f6e1a7618115787 Mon Sep 17 00:00:00 2001 From: Suttrop <239040530+suttrop@users.noreply.github.com> Date: Mon, 22 Jun 2026 21:48:53 +0200 Subject: [PATCH 2/9] rename seperator class to separator --- evap/static/scss/components/_progress.scss | 8 ++++---- .../templates/student_global_evaluation_progress.html | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/evap/static/scss/components/_progress.scss b/evap/static/scss/components/_progress.scss index a04f2859ff..65418eb094 100644 --- a/evap/static/scss/components/_progress.scss +++ b/evap/static/scss/components/_progress.scss @@ -73,7 +73,7 @@ grid-column-start: 1; grid-row-start: 2; - .seperator { + .separator { width: 1px; //height: 8px; border: $dark-gray 1px solid; @@ -81,19 +81,19 @@ } .progress-step:nth-of-type(3n + 1) { - .seperator { + .separator { height: 8px; } } .progress-step:nth-of-type(3n + 2) { - .seperator { + .separator { height: 26px; } } .progress-step:nth-of-type(3n) { - .seperator { + .separator { height: 44px; } } diff --git a/evap/student/templates/student_global_evaluation_progress.html b/evap/student/templates/student_global_evaluation_progress.html index 80aaedd46c..41cfde0cf4 100644 --- a/evap/student/templates/student_global_evaluation_progress.html +++ b/evap/student/templates/student_global_evaluation_progress.html @@ -28,7 +28,7 @@ {% for reward in global_evaluation_progress.rewards_with_progress %}
-
+
{{ reward.vote_ratio|percentage:1 }}
From 6edc964748aa9c24276a463b26ea2708bcc94401 Mon Sep 17 00:00:00 2001 From: Suttrop <239040530+suttrop@users.noreply.github.com> Date: Mon, 6 Jul 2026 21:51:36 +0200 Subject: [PATCH 3/9] only show on smaller screens --- evap/static/scss/components/_progress.scss | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/evap/static/scss/components/_progress.scss b/evap/static/scss/components/_progress.scss index 65418eb094..bd7fc9fb82 100644 --- a/evap/static/scss/components/_progress.scss +++ b/evap/static/scss/components/_progress.scss @@ -80,20 +80,22 @@ } } -.progress-step:nth-of-type(3n + 1) { - .separator { - height: 8px; +@include media-breakpoint-down(md) { + .progress-step:nth-of-type(3n + 1) { + .separator { + height: 8px; + } } -} - -.progress-step:nth-of-type(3n + 2) { - .separator { - height: 26px; + + .progress-step:nth-of-type(3n + 2) { + .separator { + height: 26px; + } } -} - -.progress-step:nth-of-type(3n) { - .separator { - height: 44px; + + .progress-step:nth-of-type(3n) { + .separator { + height: 44px; + } } } From ca88600cbfc793e9320c2a46632c4cea46865a2a Mon Sep 17 00:00:00 2001 From: Suttrop <239040530+suttrop@users.noreply.github.com> Date: Mon, 6 Jul 2026 21:55:19 +0200 Subject: [PATCH 4/9] comment oopsie --- evap/static/scss/components/_progress.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evap/static/scss/components/_progress.scss b/evap/static/scss/components/_progress.scss index bd7fc9fb82..2b0e6aa8aa 100644 --- a/evap/static/scss/components/_progress.scss +++ b/evap/static/scss/components/_progress.scss @@ -75,7 +75,7 @@ .separator { width: 1px; - //height: 8px; + height: 8px; border: $dark-gray 1px solid; } } From eca09256b6188b3d3e75668fa6937e0021475d25 Mon Sep 17 00:00:00 2001 From: Suttrop <239040530+suttrop@users.noreply.github.com> Date: Mon, 3 Aug 2026 19:26:57 +0200 Subject: [PATCH 5/9] change styling of separators --- evap/static/scss/components/_progress.scss | 6 +++--- .../templates/student_global_evaluation_progress.html | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/evap/static/scss/components/_progress.scss b/evap/static/scss/components/_progress.scss index 2b0e6aa8aa..deade1d339 100644 --- a/evap/static/scss/components/_progress.scss +++ b/evap/static/scss/components/_progress.scss @@ -82,19 +82,19 @@ @include media-breakpoint-down(md) { .progress-step:nth-of-type(3n + 1) { - .separator { + .spaced { height: 8px; } } .progress-step:nth-of-type(3n + 2) { - .separator { + .spaced { height: 26px; } } .progress-step:nth-of-type(3n) { - .separator { + .spaced { height: 44px; } } diff --git a/evap/student/templates/student_global_evaluation_progress.html b/evap/student/templates/student_global_evaluation_progress.html index 41cfde0cf4..85e2490359 100644 --- a/evap/student/templates/student_global_evaluation_progress.html +++ b/evap/student/templates/student_global_evaluation_progress.html @@ -32,7 +32,8 @@
{{ reward.vote_ratio|percentage:1 }}
-
{{ reward.text }}
+
+
{{ reward.text }}
{% endfor %} From 030880bbba1906517e744b46fe3e8f9efc0bc371 Mon Sep 17 00:00:00 2001 From: Suttrop <239040530+suttrop@users.noreply.github.com> Date: Mon, 3 Aug 2026 19:32:03 +0200 Subject: [PATCH 6/9] hide second separator on desktop --- evap/static/scss/components/_progress.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/evap/static/scss/components/_progress.scss b/evap/static/scss/components/_progress.scss index deade1d339..3d3ea23169 100644 --- a/evap/static/scss/components/_progress.scss +++ b/evap/static/scss/components/_progress.scss @@ -80,6 +80,12 @@ } } +@include media-breakpoint-up(md) { + .spaced { + display: none; + } +} + @include media-breakpoint-down(md) { .progress-step:nth-of-type(3n + 1) { .spaced { From bd6e789e8f80afd0426a0531c6b55f0139644278 Mon Sep 17 00:00:00 2001 From: Suttrop <239040530+suttrop@users.noreply.github.com> Date: Mon, 3 Aug 2026 19:32:30 +0200 Subject: [PATCH 7/9] decrease separator height --- evap/static/scss/components/_progress.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evap/static/scss/components/_progress.scss b/evap/static/scss/components/_progress.scss index 3d3ea23169..e366183da9 100644 --- a/evap/static/scss/components/_progress.scss +++ b/evap/static/scss/components/_progress.scss @@ -89,19 +89,19 @@ @include media-breakpoint-down(md) { .progress-step:nth-of-type(3n + 1) { .spaced { - height: 8px; + display: none; } } .progress-step:nth-of-type(3n + 2) { .spaced { - height: 26px; + height: 18px; } } .progress-step:nth-of-type(3n) { .spaced { - height: 44px; + height: 36px; } } } From 3a34df21e705a3299dc182a9047326e73a9a2d40 Mon Sep 17 00:00:00 2001 From: Suttrop <239040530+suttrop@users.noreply.github.com> Date: Mon, 3 Aug 2026 20:43:39 +0200 Subject: [PATCH 8/9] clean css --- evap/static/scss/components/_progress.scss | 30 +++++++++------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/evap/static/scss/components/_progress.scss b/evap/static/scss/components/_progress.scss index e366183da9..78d8c3183d 100644 --- a/evap/static/scss/components/_progress.scss +++ b/evap/static/scss/components/_progress.scss @@ -13,6 +13,7 @@ .progress-container .progress-disabled { background-color: $light-gray; + .progress-bartext { text-shadow: none; color: tint-color($medium-gray, 10%); @@ -86,22 +87,15 @@ } } -@include media-breakpoint-down(md) { - .progress-step:nth-of-type(3n + 1) { - .spaced { - display: none; - } - } - - .progress-step:nth-of-type(3n + 2) { - .spaced { - height: 18px; - } - } - - .progress-step:nth-of-type(3n) { - .spaced { - height: 36px; - } - } +.progress-step:nth-of-type(3n + 1) .spaced { + display: none; } + +.progress-step:nth-of-type(3n + 2) .spaced { + height: 18px; +} + + +.progress-step:nth-of-type(3n) .spaced { + height: 36px; +} \ No newline at end of file From d23686b6bb4ef7e486c1a53a6eaf034a966e5551 Mon Sep 17 00:00:00 2001 From: Suttrop <239040530+suttrop@users.noreply.github.com> Date: Mon, 3 Aug 2026 21:33:39 +0200 Subject: [PATCH 9/9] \n --- evap/static/scss/components/_progress.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evap/static/scss/components/_progress.scss b/evap/static/scss/components/_progress.scss index 78d8c3183d..1a4d6b9cf7 100644 --- a/evap/static/scss/components/_progress.scss +++ b/evap/static/scss/components/_progress.scss @@ -98,4 +98,4 @@ .progress-step:nth-of-type(3n) .spaced { height: 36px; -} \ No newline at end of file +}