From c305c01e5525dbd8229dc0842e0f89caed229730 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 28 Oct 2020 12:25:36 +0100 Subject: [PATCH] Use two scheme colors instead of one --- web/app/templates/_constants.html.j2 | 3 +- web/app/templates/nopaque.html.j2 | 29 +++++++++++-------- .../services/corpus_analysis.html.j2 | 3 +- web/app/templates/services/file-setup.html.j2 | 3 +- web/app/templates/services/nlp.html.j2 | 3 +- web/app/templates/services/ocr.html.j2 | 3 +- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/web/app/templates/_constants.html.j2 b/web/app/templates/_constants.html.j2 index 197aca99..a14fd135 100644 --- a/web/app/templates/_constants.html.j2 +++ b/web/app/templates/_constants.html.j2 @@ -1,5 +1,6 @@ {% set COLORS = {'primary': '#00426f', - 'secondary': '#b1b3b4', + 'secondary': '#1A5C89', + 'footer': '#b1b3b4', 'corpus_analysis': '#aa9cc9', 'corpus_analysis_darken': '#6b3f89', 'corpus_analysis_lighten': '#ebe8f6', diff --git a/web/app/templates/nopaque.html.j2 b/web/app/templates/nopaque.html.j2 index 824a61fa..7998e2d6 100644 --- a/web/app/templates/nopaque.html.j2 +++ b/web/app/templates/nopaque.html.j2 @@ -27,6 +27,8 @@ .primary-color-text {color: {{ COLORS.primary }} !important;} .secondary-color {background-color: {{ COLORS.secondary }} !important;} .secondary-color-text {color: {{ COLORS.secondary }} !important;} + .footer-color {background-color: {{ COLORS.footer }} !important;} + .footer-color-text {color: {{ COLORS.footer }} !important;} .corpus-analysis-color {background-color: {{ COLORS.corpus_analysis }} !important;} .corpus-analysis-color-text {color: {{ COLORS.corpus_analysis }} !important;} @@ -56,20 +58,23 @@ .nlp-color.lighten {background-color: {{ COLORS.nlp_lighten }} !important;} .nlp-color-text.text-lighten {color: {{ COLORS.nlp_lighten }} !important;} - {% if scheme_color is not defined %} - {% set scheme_color = COLORS.primary %} + {% if scheme_primary_color is not defined %} + {% set scheme_primary_color = COLORS.primary %} {% endif %} - main .btn, main .btn-small, main .btn-large, main .btn-floating {background-color: {{ scheme_color }};} - main .btn:hover, main .btn-large:hover, main .btn-small:hover, main .btn-floating:hover {background-color: {{ scheme_color }}; filter: brightness(133%);} - main .pagination li.active {background-color: {{ scheme_color }};} - main .table-of-contents a.active {border-color: {{ scheme_color }};} + {% if scheme_secondary_color is not defined %} + {% set scheme_secondary_color = COLORS.secondary %} + {% endif %} + main .btn, main .btn-small, main .btn-large, main .btn-floating {background-color: {{ scheme_primary_color }};} + main .btn:hover, main .btn-large:hover, main .btn-small:hover, main .btn-floating:hover {background-color: {{ scheme_secondary_color }};} + main .pagination li.active {background-color: {{ scheme_primary_color }};} + main .table-of-contents a.active {border-color: {{ scheme_primary_color }};} main .tabs .tab a {color: inherit;} - main .tabs .tab a:hover {color: {{ scheme_color }};} + main .tabs .tab a:hover {color: {{ scheme_primary_color }};} main .tabs .tab a.active, .tabs .tab a:focus.active { - color: {{ scheme_color }}; - background-color: {{ scheme_color }}28; + color: {{ scheme_primary_color }}; + background-color: {{ scheme_primary_color }}28; } - main .tabs .indicator {background-color: {{ scheme_color }};} + main .tabs .indicator {background-color: {{ scheme_primary_color }};} {% endblock styles %} @@ -93,7 +98,7 @@ {% endif %} -
+
{% block nav_content %}{% endblock nav_content %}
@@ -149,7 +154,7 @@ {% block page_content %}{% endblock page_content %} {% endblock main %} -{% block footer_attribs %} class="page-footer secondary-color"{% endblock footer_attribs %} +{% block footer_attribs %} class="page-footer footer-color"{% endblock footer_attribs %} {% block footer %}
diff --git a/web/app/templates/services/corpus_analysis.html.j2 b/web/app/templates/services/corpus_analysis.html.j2 index bcb125de..4fa11f6a 100644 --- a/web/app/templates/services/corpus_analysis.html.j2 +++ b/web/app/templates/services/corpus_analysis.html.j2 @@ -1,7 +1,8 @@ {% extends "nopaque.html.j2" %} {% from '_constants.html.j2' import COLORS %} -{% set scheme_color = COLORS.corpus_analysis_darken %} +{% set scheme_primary_color = COLORS.corpus_analysis_darken %} +{% set scheme_secondary_color = COLORS.corpus_analysis %} {% block nav_content %} {% include 'services/_nav_content.html.j2' %} diff --git a/web/app/templates/services/file-setup.html.j2 b/web/app/templates/services/file-setup.html.j2 index c7cf5367..69ecce8d 100644 --- a/web/app/templates/services/file-setup.html.j2 +++ b/web/app/templates/services/file-setup.html.j2 @@ -2,7 +2,8 @@ {% import 'materialize/wtf.html.j2' as wtf %} {% from '_constants.html.j2' import COLORS %} -{% set scheme_color = COLORS.file_setup_darken %} +{% set scheme_primary_color = COLORS.file_setup_darken %} +{% set scheme_secondary_color = COLORS.file_setup %} {% block nav_content %} {% include 'services/_nav_content.html.j2' %} diff --git a/web/app/templates/services/nlp.html.j2 b/web/app/templates/services/nlp.html.j2 index 4298465b..89109a96 100644 --- a/web/app/templates/services/nlp.html.j2 +++ b/web/app/templates/services/nlp.html.j2 @@ -2,7 +2,8 @@ {% import 'materialize/wtf.html.j2' as wtf %} {% from '_constants.html.j2' import COLORS %} -{% set scheme_color = COLORS.nlp_darken %} +{% set scheme_primary_color = COLORS.nlp_darken %} +{% set scheme_secondary_color = COLORS.nlp %} {% block nav_content %} {% include 'services/_nav_content.html.j2' %} diff --git a/web/app/templates/services/ocr.html.j2 b/web/app/templates/services/ocr.html.j2 index bcd71944..ec1c9cba 100644 --- a/web/app/templates/services/ocr.html.j2 +++ b/web/app/templates/services/ocr.html.j2 @@ -2,7 +2,8 @@ {% import 'materialize/wtf.html.j2' as wtf %} {% from '_constants.html.j2' import COLORS %} -{% set scheme_color = COLORS.ocr_darken %} +{% set scheme_primary_color = COLORS.ocr_darken %} +{% set scheme_secondary_color = COLORS.ocr %} {% block nav_content %} {% include 'services/_nav_content.html.j2' %}