From eefb28485c639da9d3dc11769c3d28f00fa2af34 Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Mon, 23 Oct 2023 18:08:35 +0000 Subject: [PATCH 01/19] avoid overflows in rewards overview on mobile --- evap/rewards/templates/rewards_index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evap/rewards/templates/rewards_index.html b/evap/rewards/templates/rewards_index.html index 4ad138271b..96e11bdcd7 100644 --- a/evap/rewards/templates/rewards_index.html +++ b/evap/rewards/templates/rewards_index.html @@ -15,7 +15,7 @@
{% trans 'Redeem points' %}
-
+

{% trans 'Total points available' %}: {{ total_points_available }}

{% if total_points_available > 0 %} {% if events %} @@ -62,7 +62,7 @@
{% trans 'Reward points history' %}
-
+
{% if reward_point_actions %} From 75af5b2ec104a4cbd4b2831bf487cdd98c48ca78 Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Mon, 23 Oct 2023 18:19:23 +0000 Subject: [PATCH 02/19] make navbar menu scrollable for small display heights --- evap/evaluation/templates/navbar.html | 2 +- evap/static/scss/_variables.scss | 2 ++ evap/static/scss/components/_nav.scss | 4 ++++ evap/static/scss/evap.scss | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/evap/evaluation/templates/navbar.html b/evap/evaluation/templates/navbar.html index 17e653d959..f2203f79ac 100644 --- a/evap/evaluation/templates/navbar.html +++ b/evap/evaluation/templates/navbar.html @@ -12,7 +12,7 @@ -
+
diff --git a/evap/static/scss/_variables.scss b/evap/static/scss/_variables.scss index b069329a73..899b004e0f 100644 --- a/evap/static/scss/_variables.scss +++ b/evap/static/scss/_variables.scss @@ -2,6 +2,8 @@ $fa-font-path: "../font-awesome/webfonts"; +$brand-height: 42px; + $enable-smooth-scroll: false; $grid-breakpoints: ( diff --git a/evap/static/scss/components/_nav.scss b/evap/static/scss/components/_nav.scss index 7596088606..455d5731f5 100644 --- a/evap/static/scss/components/_nav.scss +++ b/evap/static/scss/components/_nav.scss @@ -29,3 +29,7 @@ .nav-item { padding: 0 0.25rem; } + +#navbarNavDropdown { + max-height: calc(100vh - $brand-height); +} diff --git a/evap/static/scss/evap.scss b/evap/static/scss/evap.scss index 0afa6168ae..fb2a687f72 100644 --- a/evap/static/scss/evap.scss +++ b/evap/static/scss/evap.scss @@ -40,7 +40,7 @@ body { } .brand-image { - height: 42px; + height: $brand-height; } .color-bar { From 11f093629dcbdd2b94737eb0899785901e440b6f Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Mon, 23 Oct 2023 18:20:14 +0000 Subject: [PATCH 03/19] make footer horizontally scrollable on small screens The previous behavior was the footer became wider than the screen and the entire page width was increased. --- evap/evaluation/templates/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evap/evaluation/templates/footer.html b/evap/evaluation/templates/footer.html index 2c747d68e6..4b8155ee60 100644 --- a/evap/evaluation/templates/footer.html +++ b/evap/evaluation/templates/footer.html @@ -6,7 +6,7 @@
-
{% if user.is_delegate %}
-
{% trans 'Delegated evaluations' %}
+
{% trans 'Delegated evaluations' %}
{% trans 'Show' %} @@ -42,7 +42,7 @@
{{ semester.semester_name }}
-
+
diff --git a/evap/static/scss/_utilities.scss b/evap/static/scss/_utilities.scss index dd91f2ce3e..d56f26cd28 100644 --- a/evap/static/scss/_utilities.scss +++ b/evap/static/scss/_utilities.scss @@ -71,3 +71,7 @@ a.no-underline:hover { .z-over-fixed { z-index: $zindex-fixed + 1; } + +.break-spaces { + white-space: break-spaces; +} From dd52928b4431818ea02143025e975c21b2dd33e5 Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Mon, 23 Oct 2023 19:10:37 +0000 Subject: [PATCH 07/19] avoid horizontal overflows of percentage value in distribution bars --- evap/static/scss/components/_distribution-bar.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/evap/static/scss/components/_distribution-bar.scss b/evap/static/scss/components/_distribution-bar.scss index f3f6311e05..eb25c830d7 100644 --- a/evap/static/scss/components/_distribution-bar.scss +++ b/evap/static/scss/components/_distribution-bar.scss @@ -62,6 +62,10 @@ margin: 0 0.5rem; } + &:not(:empty) { + min-width: calc(3ch + 2*3px); + } + } .result-widget:hover { From efa6793e13843a413b61ff87d30d728b560b0ab7 Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Mon, 23 Oct 2023 19:33:09 +0000 Subject: [PATCH 08/19] avoid horizontal overflows in grade views --- evap/grades/templates/grades_course_view.html | 2 +- evap/grades/templates/grades_semester_view.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/evap/grades/templates/grades_course_view.html b/evap/grades/templates/grades_course_view.html index 1bf12162c8..c655c9b075 100644 --- a/evap/grades/templates/grades_course_view.html +++ b/evap/grades/templates/grades_course_view.html @@ -9,7 +9,7 @@

{{ course.name }} ({{ semester.name }})

{% trans 'Uploaded grade documents' %}
-
+
{% if grade_documents %}
diff --git a/evap/grades/templates/grades_semester_view.html b/evap/grades/templates/grades_semester_view.html index bc0d8d7153..6e62c60099 100644 --- a/evap/grades/templates/grades_semester_view.html +++ b/evap/grades/templates/grades_semester_view.html @@ -30,7 +30,7 @@

{% trans 'Courses' %}
-
+
{% if courses %}

From 472e8938be89132e640462bf102d9cdac2bdd6e6 Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Mon, 23 Oct 2023 20:14:46 +0000 Subject: [PATCH 09/19] avoid horizontal overflows in contributor evaluation form --- evap/contributor/templates/contributor_evaluation_form.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evap/contributor/templates/contributor_evaluation_form.html b/evap/contributor/templates/contributor_evaluation_form.html index ecd2e22c51..09d301d776 100644 --- a/evap/contributor/templates/contributor_evaluation_form.html +++ b/evap/contributor/templates/contributor_evaluation_form.html @@ -59,7 +59,7 @@
{% trans 'Course data' %}
-
+
{% trans 'Evaluation data' %}
{% if evaluation.allow_editors_to_edit %} @@ -80,7 +80,7 @@
{% trans 'Evaluation data' %}
-
+
{% include 'contribution_formset.html' with formset=formset staff=False editable=editable %}
From 70c8597bee0edfa6b15c75c258832ef32717124f Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Mon, 23 Oct 2023 22:26:36 +0200 Subject: [PATCH 10/19] Update evap/static/scss/components/_buttons.scss --- evap/static/scss/components/_buttons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evap/static/scss/components/_buttons.scss b/evap/static/scss/components/_buttons.scss index 098ebf6462..9b8aa6f2e4 100644 --- a/evap/static/scss/components/_buttons.scss +++ b/evap/static/scss/components/_buttons.scss @@ -158,7 +158,7 @@ a:not([href]):not(.disabled) { .button-open-notebook { position: fixed; bottom: $footer-height + 20px; - z-index: $zindex-sticky - 1; + z-index: $zindex-sticky - 1; /* be behind sticky navbar menus */ border-top-left-radius: 0; border-bottom-left-radius: 0; } From 6ff1ef2084ba5e44ed2f3637d64fbe745908a574 Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Mon, 6 Nov 2023 18:15:03 +0000 Subject: [PATCH 11/19] avoid horizontal overflows in some staff views --- .../templates/rewards_reward_point_redemption_event_list.html | 2 +- evap/staff/templates/staff_course_type_index.html | 2 +- evap/staff/templates/staff_degree_index.html | 2 +- evap/staff/templates/staff_evaluation_form.html | 2 +- evap/staff/templates/staff_questionnaire_form.html | 2 +- evap/staff/templates/staff_questionnaire_index_list.html | 2 +- evap/staff/templates/staff_semester_view.html | 4 ++-- evap/staff/templates/staff_text_answer_warnings.html | 2 +- evap/staff/templates/staff_user_list.html | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/evap/rewards/templates/rewards_reward_point_redemption_event_list.html b/evap/rewards/templates/rewards_reward_point_redemption_event_list.html index 3648befacf..c3a4f28a32 100644 --- a/evap/rewards/templates/rewards_reward_point_redemption_event_list.html +++ b/evap/rewards/templates/rewards_reward_point_redemption_event_list.html @@ -1,7 +1,7 @@
{% trans title %}
-
+
{% if events %}
diff --git a/evap/staff/templates/staff_course_type_index.html b/evap/staff/templates/staff_course_type_index.html index 9227366b0f..c45f18a296 100644 --- a/evap/staff/templates/staff_course_type_index.html +++ b/evap/staff/templates/staff_course_type_index.html @@ -17,7 +17,7 @@ {{ formset.management_form }}
-
+
diff --git a/evap/staff/templates/staff_degree_index.html b/evap/staff/templates/staff_degree_index.html index fed5997aad..9f643bd07e 100644 --- a/evap/staff/templates/staff_degree_index.html +++ b/evap/staff/templates/staff_degree_index.html @@ -13,7 +13,7 @@ {{ formset.management_form }}
-
+
diff --git a/evap/staff/templates/staff_evaluation_form.html b/evap/staff/templates/staff_evaluation_form.html index 79d88732ed..ef05c733a6 100644 --- a/evap/staff/templates/staff_evaluation_form.html +++ b/evap/staff/templates/staff_evaluation_form.html @@ -28,7 +28,7 @@

-
+
{% include 'contribution_formset.html' with formset=formset manager=True editable=editable %}
diff --git a/evap/staff/templates/staff_questionnaire_form.html b/evap/staff/templates/staff_questionnaire_form.html index 21122e80d4..4cc57ed509 100644 --- a/evap/staff/templates/staff_questionnaire_form.html +++ b/evap/staff/templates/staff_questionnaire_form.html @@ -20,7 +20,7 @@
{% trans 'General Options' %}
-
+
{% trans 'Questions' %}
{{ formset.management_form }} {% include 'bootstrap_form_errors.html' with errors=formset.non_form_errors %} diff --git a/evap/staff/templates/staff_questionnaire_index_list.html b/evap/staff/templates/staff_questionnaire_index_list.html index c4f0331e3b..8465d395b3 100644 --- a/evap/staff/templates/staff_questionnaire_index_list.html +++ b/evap/staff/templates/staff_questionnaire_index_list.html @@ -6,7 +6,7 @@
-
+

diff --git a/evap/staff/templates/staff_semester_view.html b/evap/staff/templates/staff_semester_view.html index f586e5f83f..6b34d43a1b 100644 --- a/evap/staff/templates/staff_semester_view.html +++ b/evap/staff/templates/staff_semester_view.html @@ -80,7 +80,7 @@

{% endif %}
-
+

@@ -259,7 +259,7 @@

-
+ {% if num_evaluations > 0 %}

diff --git a/evap/staff/templates/staff_text_answer_warnings.html b/evap/staff/templates/staff_text_answer_warnings.html index a517a0bfee..39d2da8d52 100644 --- a/evap/staff/templates/staff_text_answer_warnings.html +++ b/evap/staff/templates/staff_text_answer_warnings.html @@ -16,7 +16,7 @@ {{ formset.management_form }}
-
+
diff --git a/evap/staff/templates/staff_user_list.html b/evap/staff/templates/staff_user_list.html index 174cca33ac..a472b830a4 100644 --- a/evap/staff/templates/staff_user_list.html +++ b/evap/staff/templates/staff_user_list.html @@ -37,7 +37,7 @@
-
+
From 149a57c6b703bd3f33fe8bc903c0824d6b322498 Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Mon, 6 Nov 2023 18:16:28 +0000 Subject: [PATCH 12/19] make staff overview mobile-friendly --- evap/staff/templates/staff_index.html | 168 ++++++++---------- evap/static/scss/_components.scss | 1 + evap/static/scss/components/_staff-index.scss | 17 ++ 3 files changed, 89 insertions(+), 97 deletions(-) create mode 100644 evap/static/scss/components/_staff-index.scss diff --git a/evap/staff/templates/staff_index.html b/evap/staff/templates/staff_index.html index 03fec7bd6b..e83a85e5cd 100644 --- a/evap/staff/templates/staff_index.html +++ b/evap/staff/templates/staff_index.html @@ -1,106 +1,80 @@ {% extends 'staff_base.html' %} {% block content %} -
-
-
-
-

{% trans 'Semesters' %}

- {% if semesters %} - - {% else %} - {% trans 'There are no semesters yet.' %} - {% endif %} - {% trans 'Create new semester' %} -
-
+
+
+

{% trans 'Semesters' %}

+ {% if semesters %} + + {% else %} + {% trans 'There are no semesters yet.' %} + {% endif %} + {% trans 'Create new semester' %}
-
-
-
-

{% trans 'Questionnaires' %}

- - {% trans 'Create new questionnaire' %} -
-
-
-
-

{% trans 'Users' %}

- - {% trans 'Create new user' %} -
-
+
+

{% trans 'Questionnaires' %}

+ + {% trans 'Create new questionnaire' %}
-
-
-
-

{% trans 'Degrees' %}

- -
-
-
-
-

{% trans 'Course types' %}

- -
-
-
-
-

{% trans 'Text answer warnings' %}

- -
-
-
-
-

{% trans 'Reward Points' %}

- -
-
+
+

{% trans 'Users' %}

+ + {% trans 'Create new user' %}
-
-
-
-

{% trans 'Templates' %}

- -
-
-
-
-

{% trans 'FAQ and Infotexts' %}

- -
-
+
+

{% trans 'Degrees' %}

+ +
+
+

{% trans 'Course types' %}

+ +
+
+

{% trans 'Text answer warnings' %}

+ +
+
+

{% trans 'Reward Points' %}

+ +
+
+

{% trans 'Templates' %}

+ +
+
+

{% trans 'FAQ and Infotexts' %}

+
{% endblock %} diff --git a/evap/static/scss/_components.scss b/evap/static/scss/_components.scss index 9fc73c5d1a..ccbee1df31 100644 --- a/evap/static/scss/_components.scss +++ b/evap/static/scss/_components.scss @@ -19,4 +19,5 @@ @import "components/distribution-bar"; @import "components/quick-review"; +@import "components/staff-index"; @import "components/notebook"; diff --git a/evap/static/scss/components/_staff-index.scss b/evap/static/scss/components/_staff-index.scss new file mode 100644 index 0000000000..5c829dbcfb --- /dev/null +++ b/evap/static/scss/components/_staff-index.scss @@ -0,0 +1,17 @@ +.staff-index-card-columns { + @include media-breakpoint-up(sm) { + column-count: 2; + @include media-breakpoint-up(lg) { + column-count: 3; + } + + .card { + display: inline-block; + width: 100%; + } + } + + .card { + margin-bottom: 1rem; + } +} From 91aca6c4f1f6fc83f5c8824c41b5c97c2dab07d9 Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Mon, 6 Nov 2023 18:18:30 +0000 Subject: [PATCH 13/19] avoid horizontal overflows of breadcrumb arrow --- .../contributor_evaluation_form.html | 10 ++++++---- .../templates/development_components.html | 12 ++++++----- evap/grades/templates/grades_base.html | 20 ++++++++++--------- .../templates/results_evaluation_detail.html | 10 ++++++---- evap/staff/templates/staff_base.html | 20 ++++++++++--------- evap/static/scss/components/_breadcrumb.scss | 4 ++++ evap/student/templates/student_vote.html | 10 ++++++---- 7 files changed, 51 insertions(+), 35 deletions(-) diff --git a/evap/contributor/templates/contributor_evaluation_form.html b/evap/contributor/templates/contributor_evaluation_form.html index 09d301d776..15273ba34d 100644 --- a/evap/contributor/templates/contributor_evaluation_form.html +++ b/evap/contributor/templates/contributor_evaluation_form.html @@ -5,10 +5,12 @@ {% block title %}{% trans 'Your EvaP' %} - {{ block.super }}{% endblock %} {% block breadcrumb_bar %} -
    -
  • {{ evaluation.course.semester.name }}
    • -
  • {{ evaluation.full_name }}
    • -
+
+
    +
  • {{ evaluation.course.semester.name }}
    • +
  • {{ evaluation.full_name }}
    • +
+
{% endblock %} {% block content %} diff --git a/evap/development/templates/development_components.html b/evap/development/templates/development_components.html index 303da8149f..901c4ebfb8 100644 --- a/evap/development/templates/development_components.html +++ b/evap/development/templates/development_components.html @@ -3,11 +3,13 @@ {% block title %}{% trans 'Development' %} - {{ block.super }}{% endblock %} {% block breadcrumb_bar %} -
    - {% block breadcrumb %} -
  • {% trans 'Development' %}
    • - {% endblock %} -
+
+
    + {% block breadcrumb %} +
  • {% trans 'Development' %}
    • + {% endblock %} +
+
{% endblock %} {% block content %} diff --git a/evap/grades/templates/grades_base.html b/evap/grades/templates/grades_base.html index ae4a1eed23..67cd61f1f6 100644 --- a/evap/grades/templates/grades_base.html +++ b/evap/grades/templates/grades_base.html @@ -3,13 +3,15 @@ {% block title %}{% trans 'Grade publishing' %} - {{ block.super }}{% endblock %} {% block breadcrumb_bar %} -
    - {% block breadcrumb %} - {% if disable_breadcrumb_grades or not user.is_grade_publisher %} -
  • {% trans 'Grade publishing' %}
    • - {% else %} -
  • {% trans 'Grade publishing' %}
    • - {% endif %} - {% endblock %} -
+
+
    + {% block breadcrumb %} + {% if disable_breadcrumb_grades or not user.is_grade_publisher %} +
  • {% trans 'Grade publishing' %}
    • + {% else %} +
  • {% trans 'Grade publishing' %}
    • + {% endif %} + {% endblock %} +
+
{% endblock %} diff --git a/evap/results/templates/results_evaluation_detail.html b/evap/results/templates/results_evaluation_detail.html index 3061028785..7f119e613e 100644 --- a/evap/results/templates/results_evaluation_detail.html +++ b/evap/results/templates/results_evaluation_detail.html @@ -7,10 +7,12 @@ {% block title %}{{ evaluation.full_name }} - {{ evaluation.course.semester.name }} - {% trans 'Results' %} - {{ block.super }}{% endblock %} {% block breadcrumb_bar %} -
    -
  • {{ evaluation.course.semester.name }}
    • -
  • {{ evaluation.full_name }}
    • -
+
+
    +
  • {{ evaluation.course.semester.name }}
    • +
  • {{ evaluation.full_name }}
    • +
+
{% endblock %} {% block content %} diff --git a/evap/staff/templates/staff_base.html b/evap/staff/templates/staff_base.html index 97de9c79bd..dbdff8038a 100644 --- a/evap/staff/templates/staff_base.html +++ b/evap/staff/templates/staff_base.html @@ -3,13 +3,15 @@ {% block title %}{% trans 'Manage' %} - {{ block.super }}{% endblock %} {% block breadcrumb_bar %} -
    - {% block breadcrumb %} - {% if disable_breadcrumb_manager or not user.is_manager %} -
  • {% trans 'Manage' %}
    • - {% else %} -
  • {% trans 'Manage' %}
    • - {% endif %} - {% endblock %} -
+
+
    + {% block breadcrumb %} + {% if disable_breadcrumb_manager or not user.is_manager %} +
  • {% trans 'Manage' %}
    • + {% else %} +
  • {% trans 'Manage' %}
    • + {% endif %} + {% endblock %} +
+
{% endblock %} diff --git a/evap/static/scss/components/_breadcrumb.scss b/evap/static/scss/components/_breadcrumb.scss index 150df8394f..f33e3262b5 100644 --- a/evap/static/scss/components/_breadcrumb.scss +++ b/evap/static/scss/components/_breadcrumb.scss @@ -25,3 +25,7 @@ border-right: 13px solid transparent; } } + +.breadcrumb-bar { + overflow-x: hidden; /* breadcrumb::after must not overflow screen */ +} diff --git a/evap/student/templates/student_vote.html b/evap/student/templates/student_vote.html index 07569d2f1e..837bfdc010 100644 --- a/evap/student/templates/student_vote.html +++ b/evap/student/templates/student_vote.html @@ -7,10 +7,12 @@ {% block title %}{{ evaluation.full_name }} - {% trans 'Evaluation' %} - {{ block.super }}{% endblock %} {% block breadcrumb_bar %} -
    -
  • {{ evaluation.course.semester.name }}
    • -
  • {{ evaluation.full_name }}
    • -
+
+
    +
  • {{ evaluation.course.semester.name }}
    • +
  • {{ evaluation.full_name }}
    • +
+
{% endblock %} {% block content %} From cf0135f6562e059fc227656236750ab6c04b1041 Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Mon, 6 Nov 2023 18:27:07 +0000 Subject: [PATCH 14/19] avoid horizontal overflows in staff faq views --- evap/staff/templates/staff_faq_index.html | 2 +- evap/staff/templates/staff_faq_section.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/evap/staff/templates/staff_faq_index.html b/evap/staff/templates/staff_faq_index.html index f261d1c1e7..027d39d2c6 100644 --- a/evap/staff/templates/staff_faq_index.html +++ b/evap/staff/templates/staff_faq_index.html @@ -13,7 +13,7 @@ {{ formset.management_form }}
-
+
diff --git a/evap/staff/templates/staff_faq_section.html b/evap/staff/templates/staff_faq_section.html index dd4e0c404c..1804ff4208 100644 --- a/evap/staff/templates/staff_faq_section.html +++ b/evap/staff/templates/staff_faq_section.html @@ -14,7 +14,7 @@ {{ formset.management_form }}
-
+
From 7c858212c9892541c47e24ce22b02df4d7871028 Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Mon, 6 Nov 2023 18:58:03 +0000 Subject: [PATCH 15/19] fix navbar menus on desktop regression from regression from 75af5b2ec104a4cbd4b2831bf487cdd98c48ca78 --- evap/evaluation/templates/navbar.html | 2 +- evap/static/scss/components/_nav.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/evap/evaluation/templates/navbar.html b/evap/evaluation/templates/navbar.html index f2203f79ac..17e653d959 100644 --- a/evap/evaluation/templates/navbar.html +++ b/evap/evaluation/templates/navbar.html @@ -12,7 +12,7 @@ -
+
diff --git a/evap/static/scss/components/_nav.scss b/evap/static/scss/components/_nav.scss index 455d5731f5..7ebb2ea4cf 100644 --- a/evap/static/scss/components/_nav.scss +++ b/evap/static/scss/components/_nav.scss @@ -4,6 +4,10 @@ background-color: $darker-gray; } +.navbar-collapse.show { + overflow-y: scroll; /* scrollable menus on mobile */ +} + .navbar-nav .nav-link, .navbar-nav .navbar-text { padding: .0 .5rem; From 2216d837a8326096cbe6abc66c009634ec913c50 Mon Sep 17 00:00:00 2001 From: Richard Ebeling Date: Mon, 26 Feb 2024 20:07:05 +0100 Subject: [PATCH 16/19] Revert "Update evap/static/scss/components/_buttons.scss" This reverts commit 70c8597bee0edfa6b15c75c258832ef32717124f. --- evap/static/scss/components/_buttons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evap/static/scss/components/_buttons.scss b/evap/static/scss/components/_buttons.scss index 9b8aa6f2e4..098ebf6462 100644 --- a/evap/static/scss/components/_buttons.scss +++ b/evap/static/scss/components/_buttons.scss @@ -158,7 +158,7 @@ a:not([href]):not(.disabled) { .button-open-notebook { position: fixed; bottom: $footer-height + 20px; - z-index: $zindex-sticky - 1; /* be behind sticky navbar menus */ + z-index: $zindex-sticky - 1; border-top-left-radius: 0; border-bottom-left-radius: 0; } From 2c6afd2ff288cdf37350dc3cfbd7bbb847f42126 Mon Sep 17 00:00:00 2001 From: Richard Ebeling Date: Mon, 26 Feb 2024 20:07:09 +0100 Subject: [PATCH 17/19] Revert "button-open-notebook should not overlay navbar menu" This reverts commit 47e18ffd1e52910f1bdaf25a5a5cbe09bc9e0aa9. --- evap/static/scss/components/_buttons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evap/static/scss/components/_buttons.scss b/evap/static/scss/components/_buttons.scss index 098ebf6462..c7524789a9 100644 --- a/evap/static/scss/components/_buttons.scss +++ b/evap/static/scss/components/_buttons.scss @@ -158,7 +158,7 @@ a:not([href]):not(.disabled) { .button-open-notebook { position: fixed; bottom: $footer-height + 20px; - z-index: $zindex-sticky - 1; + z-index: $zindex-fixed; border-top-left-radius: 0; border-bottom-left-radius: 0; } From a3906317c1c1f92ab147b6a0a845ddf24cfb1e03 Mon Sep 17 00:00:00 2001 From: Richard Ebeling Date: Mon, 26 Feb 2024 20:08:30 +0100 Subject: [PATCH 18/19] Update evap/static/scss/components/_distribution-bar.scss Co-authored-by: Johannes Wolf --- evap/static/scss/components/_distribution-bar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evap/static/scss/components/_distribution-bar.scss b/evap/static/scss/components/_distribution-bar.scss index eb25c830d7..b6c8aadc25 100644 --- a/evap/static/scss/components/_distribution-bar.scss +++ b/evap/static/scss/components/_distribution-bar.scss @@ -63,7 +63,7 @@ } &:not(:empty) { - min-width: calc(3ch + 2*3px); + min-width: calc(3ch + 2*3px); // 3 characters + left and right border } } From 911526bc49dd089447508950dcdf4b360b695edb Mon Sep 17 00:00:00 2001 From: Richard Ebeling Date: Mon, 26 Feb 2024 20:11:53 +0100 Subject: [PATCH 19/19] Update evap/static/scss/components/_staff-index.scss Co-authored-by: Niklas Mohrin --- evap/static/scss/components/_staff-index.scss | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/evap/static/scss/components/_staff-index.scss b/evap/static/scss/components/_staff-index.scss index 5c829dbcfb..45a3336d9b 100644 --- a/evap/static/scss/components/_staff-index.scss +++ b/evap/static/scss/components/_staff-index.scss @@ -1,17 +1,17 @@ .staff-index-card-columns { @include media-breakpoint-up(sm) { column-count: 2; - @include media-breakpoint-up(lg) { - column-count: 3; - } - - .card { - display: inline-block; - width: 100%; - } + } + @include media-breakpoint-up(lg) { + column-count: 3; } .card { margin-bottom: 1rem; + + @include media-breakpoint-up(sm) { + display: inline-block; + width: 100%; + } } }