From 2216bffee8cc1fdd3e697dc4a33c023fe3e59f4b Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 25 Aug 2020 11:49:43 +0200 Subject: [PATCH] Further color updates --- web/app/static/css/nopaque.css | 10 --- web/app/templates/nopaque.html.j2 | 80 +++++++++++-------- .../services/corpus_analysis.html.j2 | 6 +- web/app/templates/services/file-setup.html.j2 | 15 ++-- web/app/templates/services/nlp.html.j2 | 14 ++-- web/app/templates/services/ocr.html.j2 | 10 ++- .../macros.html.j2} | 25 +++++- .../{macros => utils}/materialize.html.j2 | 6 +- 8 files changed, 101 insertions(+), 65 deletions(-) rename web/app/templates/{macros/query_result_macro.html.j2 => utils/macros.html.j2} (73%) rename web/app/templates/{macros => utils}/materialize.html.j2 (90%) diff --git a/web/app/static/css/nopaque.css b/web/app/static/css/nopaque.css index 07d1c004..f1e6f5e0 100644 --- a/web/app/static/css/nopaque.css +++ b/web/app/static/css/nopaque.css @@ -1,13 +1,3 @@ -nav, .footer-copyright { - background-color: #00426f !important; - color: white !important; -} - -.page-footer { - background-color: #b1b3b4; - color: white; -} - /* * ### Start sticky footer ### * Force the footer to always stay on the bottom of the page regardless of how diff --git a/web/app/templates/nopaque.html.j2 b/web/app/templates/nopaque.html.j2 index 36187b6a..d2036d6d 100644 --- a/web/app/templates/nopaque.html.j2 +++ b/web/app/templates/nopaque.html.j2 @@ -1,6 +1,7 @@ -{% import "macros/materialize.html.j2" as M %} +{% import "utils/materialize.html.j2" as M %} -{% if title == '' %} + +{% if title is not defined %} {% set title = None %} {% endif %} @@ -12,6 +13,13 @@ {% set main_class = 'grey lighten-5' %} {% endif %} +{% if parallax is not defined %} + {% set parallax = False %} +{% endif %} + +{% set nopaque_primary_color = '#00426f' %} +{% set nopaque_secondary_color = '#b1b3b4' %} + {% set corpus_analysis_color = '#aa9cc9' %} {% set corpus_analysis_color_darken = '#6b3f89' %} {% set corpus_analysis_color_lighten = '#ebe8f6' %} @@ -28,6 +36,12 @@ {% set ocr_color_darken = '#00a58b' %} {% set ocr_color_lighten = '#e7f4f1' %} + +{%- macro insert_content() -%} + {% block page_content %}{% endblock %} +{%- endmacro -%} + + @@ -36,15 +50,12 @@ nopaque - {% if request.path != url_for('main.index') %} - – {{ title }} - {% endif %} + {% if request.path != url_for('main.index') %} – {{ title }}{% endif %} - {% if current_user.is_authenticated %} + {% if current_user.is_authenticated %} +