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

Mobile improvements #2054

Merged
merged 20 commits into from
Feb 26, 2024
Merged

Mobile improvements #2054

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
eefb284
avoid overflows in rewards overview on mobile
LinqLover Oct 23, 2023
75af5b2
make navbar menu scrollable for small display heights
LinqLover Oct 23, 2023
11f0936
make footer horizontally scrollable on small screens
LinqLover Oct 23, 2023
47e18ff
button-open-notebook should not overlay navbar menu
LinqLover Oct 23, 2023
2590cce
contact form: enable line breaks in anonymous sender button
LinqLover Oct 23, 2023
6380673
remove horizontal overflows in contributor index
LinqLover Oct 23, 2023
dd52928
avoid horizontal overflows of percentage value in distribution bars
LinqLover Oct 23, 2023
efa6793
avoid horizontal overflows in grade views
LinqLover Oct 23, 2023
472e893
avoid horizontal overflows in contributor evaluation form
LinqLover Oct 23, 2023
70c8597
Update evap/static/scss/components/_buttons.scss
LinqLover Oct 23, 2023
6ff1ef2
avoid horizontal overflows in some staff views
LinqLover Nov 6, 2023
149a57c
make staff overview mobile-friendly
LinqLover Nov 6, 2023
91aca6c
avoid horizontal overflows of breadcrumb arrow
LinqLover Nov 6, 2023
d80cbde
Merge remote-tracking branch 'origin/mobile-1' into mobile-1
LinqLover Nov 6, 2023
cf0135f
avoid horizontal overflows in staff faq views
LinqLover Nov 6, 2023
7c85821
fix navbar menus on desktop
LinqLover Nov 6, 2023
2216d83
Revert "Update evap/static/scss/components/_buttons.scss"
richardebeling Feb 26, 2024
2c6afd2
Revert "button-open-notebook should not overlay navbar menu"
richardebeling Feb 26, 2024
a390631
Update evap/static/scss/components/_distribution-bar.scss
richardebeling Feb 26, 2024
911526b
Update evap/static/scss/components/_staff-index.scss
richardebeling Feb 26, 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
4 changes: 2 additions & 2 deletions evap/contributor/templates/contributor_evaluation_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h5 class="card-title">{% trans 'Course data' %}</h5>
</div>
</div>
<div class="card mb-3">
<div class="card-body">
<div class="card-body table-responsive">
<div class="d-flex">
<h5 class="card-title me-auto">{% trans 'Evaluation data' %}</h5>
{% if evaluation.allow_editors_to_edit %}
Expand All @@ -80,7 +80,7 @@ <h5 class="card-title me-auto">{% trans 'Evaluation data' %}</h5>
</div>
</div>
<div class="card mb-3">
<div class="card-body">
<div class="card-body table-responsive">
{% include 'contribution_formset.html' with formset=formset staff=False editable=editable %}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions evap/contributor/templates/contributor_index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</div>
{% if user.is_delegate %}
<div class="btn-switch btn-switch-light ms-2 d-print-none">
<div class="btn-switch-label"><span class="fas fa-people-arrows-left-right"></span> {% trans 'Delegated evaluations' %}</div>
<div class="btn-switch-label text-break break-spaces"><span class="fas fa-people-arrows-left-right"></span> {% trans 'Delegated evaluations' %}</div>
<div class="btn-switch btn-group">
<a href="{% url 'contributor:index' %}?show_delegated=true" role="button" class="btn btn-sm btn-light{% if show_delegated %} active{% endif %}">
{% trans 'Show' %}
Expand All @@ -42,7 +42,7 @@
<div class="card-header">
{{ semester.semester_name }}
</div>
<div class="card-body">
<div class="card-body table-responsive">
<table class="table table-seamless-links table-vertically-aligned">
<thead>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion evap/evaluation/templates/contact_modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h5 class="modal-title" id="{{ modal_id }}Label">{{ title }}</h5>
<input type="radio" class="btn-check" name="{{ modal_id }}RadioGroup" id="{{ modal_id }}SenderName" checked>
<label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}SenderName">{{ user.full_name }}</label>
<input type="radio" class="btn-check" name="{{ modal_id }}RadioGroup" id="{{ modal_id }}AnonymousName">
<label class="btn btn-sm btn-outline-primary" for="{{ modal_id }}AnonymousName">{% trans 'Anonymous' %}</label>
<label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}AnonymousName">{% trans 'Anonymous' %}</label>
</div>
{% else %}
<input type="text" class="form-control mx-auto text-break" id="{{ modal_id }}SenderName" disabled value="{{ user.full_name }}"/>
Expand Down
2 changes: 1 addition & 1 deletion evap/evaluation/templates/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="vote-bg-orange" style="width: 6%;"></div>
<div class="vote-bg-red" style="width: 3%;"></div>
</div>
<nav class="navbar navbar-expand">
<nav class="navbar navbar-expand overflow-x-scroll">
<div class="collapse navbar-collapse justify-content-between">
<ul class="navbar-nav justify-content-start">
<li class="nav-item my-auto">
Expand Down
2 changes: 1 addition & 1 deletion evap/evaluation/templates/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="fas fa-bars fa-fw"></span>
</button>
<div class="collapse navbar-collapse justify-content-between" id="navbarNavDropdown">
<div class="collapse navbar-collapse justify-content-between overflow-y-scroll" id="navbarNavDropdown">
<span class="d-none {% if user.is_participant and user.is_responsible_or_contributor_or_delegate or user.is_reviewer %}d-xl-block{% else %}d-lg-block{% endif %} navbar-nav justify-content-start">
<a href="{% url 'evaluation:index' %}"><img class="brand-image" src="{% static 'images/evap.png' %}" alt=""/></a>
</span>
Expand Down
2 changes: 1 addition & 1 deletion evap/grades/templates/grades_course_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h3 class="mb-3">{{ course.name }} ({{ semester.name }})</h3>
<div class="card-header">
{% trans 'Uploaded grade documents' %}
</div>
<div class="card-body">
<div class="card-body table-responsive">
{% if grade_documents %}
<table class="table table-striped table-vertically-aligned">
<thead>
Expand Down
2 changes: 1 addition & 1 deletion evap/grades/templates/grades_semester_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h3 class="col-8 mb-0">
<div class="card-header">
{% trans 'Courses' %}
</div>
<div class="card-body">
<div class="card-body table-responsive">
{% if courses %}
<table class="table table-striped grade-course-table table-vertically-aligned">
<thead>
Expand Down
4 changes: 2 additions & 2 deletions evap/rewards/templates/rewards_index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="card-header">
{% trans 'Redeem points' %}
</div>
<div class="card-body">
<div class="card-body table-responsive">
<p><b>{% trans 'Total points available' %}: {{ total_points_available }}</b></p>
{% if total_points_available > 0 %}
{% if events %}
Expand Down Expand Up @@ -62,7 +62,7 @@
<div class="card-header">
{% trans 'Reward points history' %}
</div>
<div class="card-body">
<div class="card-body table-responsive">
{% if reward_point_actions %}
<table class="table table-striped">
<thead>
Expand Down
4 changes: 4 additions & 0 deletions evap/static/scss/_utilities.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,7 @@ a.no-underline:hover {
.z-over-fixed {
z-index: $zindex-fixed + 1;
}

.break-spaces {
white-space: break-spaces;
}
2 changes: 2 additions & 0 deletions evap/static/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

$fa-font-path: "../font-awesome/webfonts";

$brand-height: 42px;

$enable-smooth-scroll: false;

$grid-breakpoints: (
Expand Down
2 changes: 1 addition & 1 deletion evap/static/scss/components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ a:not([href]):not(.disabled) {
.button-open-notebook {
position: fixed;
bottom: $footer-height + 20px;
z-index: $zindex-fixed;
z-index: $zindex-sticky - 1; /* be behind sticky navbar menus */
richardebeling marked this conversation as resolved.
Show resolved Hide resolved
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
Expand Down
4 changes: 4 additions & 0 deletions evap/static/scss/components/_distribution-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@
margin: 0 0.5rem;
}

&:not(:empty) {
min-width: calc(3ch + 2*3px);
richardebeling marked this conversation as resolved.
Show resolved Hide resolved
richardebeling marked this conversation as resolved.
Show resolved Hide resolved
}

}

.result-widget:hover {
Expand Down
4 changes: 4 additions & 0 deletions evap/static/scss/components/_nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,7 @@
.nav-item {
padding: 0 0.25rem;
}

#navbarNavDropdown {
max-height: calc(100vh - $brand-height);
}
2 changes: 1 addition & 1 deletion evap/static/scss/evap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ body {
}

.brand-image {
height: 42px;
height: $brand-height;
}

.color-bar {
Expand Down