From 16c1d9f318bf30d3c4c92e7027b8c380dea8ec12 Mon Sep 17 00:00:00 2001 From: George Katsikas <giorgakis.katsikas@gmail.com> Date: Wed, 19 Jul 2023 20:26:03 +0300 Subject: [PATCH] change heading font sizes and match to bs classes --- ..._hx_productionstream_details_contents.html | 4 ++-- .../templates/production/production_new.html | 13 ++++++----- .../scipost/assets/config/preconfig.scss | 22 ++++++++++++++----- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/scipost_django/production/templates/production/_hx_productionstream_details_contents.html b/scipost_django/production/templates/production/_hx_productionstream_details_contents.html index 476f155e9..63294a87c 100644 --- a/scipost_django/production/templates/production/_hx_productionstream_details_contents.html +++ b/scipost_django/production/templates/production/_hx_productionstream_details_contents.html @@ -10,7 +10,7 @@ <div class="accordion" id="productionstream-{{ productionstream.id }}-actions-accordion"> - <h3>Actions</h3> + <h4>Actions</h4> {% if perms.scipost.can_take_decisions_related_to_proofs %} <div class="accordion-item"> @@ -204,7 +204,7 @@ <div id="productionstream-{{ productionstream.id }}-event-container" class="col-12 col-md d-flex flex-column"> {% comment %} This might be better to refactor with an OOB response on each event addition {% endcomment %} - <h3>Events</h3> + <h4>Events</h4> <div id="productionstream-{{ productionstream.id }}-event-list" class="overflow-scroll mb-4" style="max-height: max(50vh, 40em)" diff --git a/scipost_django/production/templates/production/production_new.html b/scipost_django/production/templates/production/production_new.html index 6f2c4b9ba..31fc80e05 100644 --- a/scipost_django/production/templates/production/production_new.html +++ b/scipost_django/production/templates/production/production_new.html @@ -16,17 +16,19 @@ <h1>Production Streams</h1> </div> <div class="col-12 col-sm-auto"> + {% if perms.scipost.can_promote_user_to_production_officer %} - <a class="btn-link fs-6" href="{% url 'production:production_team' %}">Production Team</a> + <a class="btn-link fs-4" href="{% url 'production:production_team' %}">Production Team</a> | {% endif %} - <a class="btn-link fs-6" href="{% url 'finances:personal_timesheet' %}">Personal Timesheet</a> + + <a class="btn-link fs-4" href="{% url 'finances:personal_timesheet' %}">Personal Timesheet</a> </div> </div> <details id="productionstreams-filter-details" class="card my-4"> - <summary class="card-header fs-6 d-flex flex-row align-items-center justify-content-between list-triangle"> - <div>Search / Filter / Bulk Actions</div> + <summary class="card-header d-flex flex-row align-items-center justify-content-between list-triangle"> + <div class="fs-3">Search / Filter / Bulk Actions</div> <div class="d-none d-md-flex align-items-center"> <div id="indicator-search-productionstreams" class="htmx-indicator"> @@ -60,10 +62,11 @@ {% comment %} Bulk Action buttons {% endcomment %} {% if perms.scipost.can_assign_production_officer or perms.scipost.can_assign_production_supervisor %} - <hr> + <hr /> <div hx-get="{% url 'production:_hx_productionstream_actions_bulk_assign_officers' %}" hx-trigger="load"></div> {% endif %} + </div> </details> diff --git a/scipost_django/scipost/static/scipost/assets/config/preconfig.scss b/scipost_django/scipost/static/scipost/assets/config/preconfig.scss index 75c460daa..25416435d 100644 --- a/scipost_django/scipost/static/scipost/assets/config/preconfig.scss +++ b/scipost_django/scipost/static/scipost/assets/config/preconfig.scss @@ -125,12 +125,22 @@ $font-size-base: 0.8rem; $font-size-sm: 0.7rem; $font-size-lg: 1.0rem; -$h1-font-size: 1.5rem; -$h2-font-size: 1.25rem; -$h3-font-size: 1.05rem; -$h4-font-size: 1.0rem; -$h5-font-size: 0.8rem; -$h6-font-size: 0.8rem; +$h1-font-size: $font-size-base * 1.9; +$h2-font-size: $font-size-base * 1.65; +$h3-font-size: $font-size-base * 1.45; +$h4-font-size: $font-size-base * 1.35; +$h5-font-size: $font-size-base * 1.2; +$h6-font-size: $font-size-base * 1.1; + +$font-sizes: ( + 1: $h1-font-size, + 2: $h2-font-size, + 3: $h3-font-size, + 4: $h4-font-size, + 5: $h5-font-size, + 6: $h6-font-size +); + $close-font-weight: 100; -- GitLab