diff --git a/web/app/templates/_constants.html.j2 b/web/app/templates/_constants.html.j2 index 197aca99ce23881d589c8305faa9950b9160cb55..a14fd1359a80bb6bfaa9b3c9944d3bca5b94be0f 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 824a61fafba1c4528e2fc5cdfaf288fd7628369e..7998e2d61df521b9b2b98a007011a5509464b5c3 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 }};} </style> {% endblock styles %} @@ -93,7 +98,7 @@ {% endif %} </ul> </div> - <div class="nav-content primary-color" style="filter: brightness(120%);"> + <div class="nav-content secondary-color"> {% block nav_content %}{% endblock nav_content %} </div> </nav> @@ -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 %} <div class="container"> diff --git a/web/app/templates/services/corpus_analysis.html.j2 b/web/app/templates/services/corpus_analysis.html.j2 index bcb125deaef8e5f1eedcf59c4d7c9eb149c76797..4fa11f6a4c4d611b2be8d36a00a56a99e139fb8d 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 c7cf5367aa0350365aa18be14b809f44de27286c..69ecce8d904a16c923dc1258591ca9637cda66d7 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 4298465bd7c112ad1ebde6711e51edbd5f8eb7a6..89109a96671a0878c84cb84df0f94d542c575ba3 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 bcd7194449d540a153668dc84b3f95c0689944ad..ec1c9cba203fa2e44b5967eec2e493b40339e20a 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' %}