From 2240657e8c60d118d8d92b0ba130218cc90d1d07 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <pjentsch@sfb1288inf-Notebook.fritz.box>
Date: Wed, 28 Oct 2020 11:21:05 +0100
Subject: [PATCH] fix multiple things
---
...denav-fixed.css => materialize.sidenav-fixed.css} | 0
...icky-footer.css => materialize.sticky-footer.css} | 0
web/app/templates/nopaque.html.j2 | 12 +++++++-----
web/app/templates/services/_nav_content.html.j2 | 6 +++---
web/app/templates/services/file-setup.html.j2 | 2 +-
web/app/templates/services/nlp.html.j2 | 2 +-
web/app/templates/services/ocr.html.j2 | 2 +-
7 files changed, 13 insertions(+), 11 deletions(-)
rename web/app/static/css/{materialize.fix.sidenav-fixed.css => materialize.sidenav-fixed.css} (100%)
rename web/app/static/css/{materialize.fix.sticky-footer.css => materialize.sticky-footer.css} (100%)
diff --git a/web/app/static/css/materialize.fix.sidenav-fixed.css b/web/app/static/css/materialize.sidenav-fixed.css
similarity index 100%
rename from web/app/static/css/materialize.fix.sidenav-fixed.css
rename to web/app/static/css/materialize.sidenav-fixed.css
diff --git a/web/app/static/css/materialize.fix.sticky-footer.css b/web/app/static/css/materialize.sticky-footer.css
similarity index 100%
rename from web/app/static/css/materialize.fix.sticky-footer.css
rename to web/app/static/css/materialize.sticky-footer.css
diff --git a/web/app/templates/nopaque.html.j2 b/web/app/templates/nopaque.html.j2
index 80ad189c..824a61fa 100644
--- a/web/app/templates/nopaque.html.j2
+++ b/web/app/templates/nopaque.html.j2
@@ -13,14 +13,14 @@
{{ super() }}
{% endblock metas %}
-{% block title %}{% if request.path != url_for('main.index') and title is defined %}{{title}} | {% endif %}nopaque{% endblock title %}
+{% block title %}{{title}}{% endblock title %}
{% block styles %}
{{ super() }}
{% if current_user.is_authenticated %}
-<link href="{{ url_for('static', filename='css/materialize.fix.sidenav-fixed.css') }}" media="screen,projection" rel="stylesheet">
+<link href="{{ url_for('static', filename='css/materialize.sidenav-fixed.css') }}" media="screen,projection" rel="stylesheet">
{% endif %}
-<link href="{{ url_for('static', filename='css/materialize.fix.sticky-footer.css') }}" media="screen,projection" rel="stylesheet">
+<link href="{{ url_for('static', filename='css/materialize.sticky-footer.css') }}" media="screen,projection" rel="stylesheet">
<link href="{{ url_for('static', filename='css/nopaque.css') }}" media="screen,projection" rel="stylesheet">
<style>
.primary-color {background-color: {{ COLORS.primary }} !important;}
@@ -59,7 +59,8 @@
{% if scheme_color is not defined %}
{% set scheme_color = COLORS.primary %}
{% endif %}
- main button, main .btn, main .btn-floating {background-color: {{ scheme_color }};}
+ 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 }};}
main .tabs .tab a {color: inherit;}
@@ -92,7 +93,7 @@
{% endif %}
</ul>
</div>
- <div class="nav-content secondary-color">
+ <div class="nav-content primary-color" style="filter: brightness(120%);">
{% block nav_content %}{% endblock nav_content %}
</div>
</nav>
@@ -117,6 +118,7 @@
<span class="white-text email">{{ current_user.email }}</span>
</div>
</li>
+ <li><a href="{{ url_for('main.index') }}">nopaque</a></li>
<li><a href="#"><i class="material-icons">linear_scale</i>Workflow</a></li>
<li><a href="{{ url_for('main.dashboard') }}"><i class="material-icons">dashboard</i>Dashboard</a></li>
<li><a href="{{ url_for('main.dashboard', _anchor='corpora') }}" style="padding-left: 47px;"><i class="material-icons">book</i>My Corpora</a></li>
diff --git a/web/app/templates/services/_nav_content.html.j2 b/web/app/templates/services/_nav_content.html.j2
index 05980bef..9de14015 100644
--- a/web/app/templates/services/_nav_content.html.j2
+++ b/web/app/templates/services/_nav_content.html.j2
@@ -1,10 +1,10 @@
<ul class="tabs tabs-transparent">
<li class="tab disabled"><i class="material-icons left" style="line-height: 48px;">explore</i>Roadmap</li>
<li class="tab"><a{%if request.path == url_for('services.service', service='file-setup') %} class="active"{% endif %} href="{{ url_for('services.service', service='file-setup') }}" target="_self">File setup</a></li>
- <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
+ <li class="tab disabled"><i class="material-icons" style="line-height: 48px;">navigate_next</i></li>
<li class="tab"><a{%if request.path == url_for('services.service', service='ocr') %} class="active"{% endif %} href="{{ url_for('services.service', service='ocr') }}" target="_self">OCR</a></li>
- <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
+ <li class="tab disabled"><i class="material-icons" style="line-height: 48px;">navigate_next</i></li>
<li class="tab"><a{%if request.path == url_for('services.service', service='nlp') %} class="active"{% endif %} href="{{ url_for('services.service', service='nlp') }}" target="_self">NLP</a></li>
- <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
+ <li class="tab disabled"><i class="material-icons" style="line-height: 48px;">navigate_next</i></li>
<li class="tab"><a{%if request.path == url_for('services.service', service='corpus_analysis') %} class="active"{% endif %} href="{{ url_for('services.service', service='corpus_analysis') }}" target="_self">Corpus Analysis</a></li>
</ul>
diff --git a/web/app/templates/services/file-setup.html.j2 b/web/app/templates/services/file-setup.html.j2
index dfdb0930..c7cf5367 100644
--- a/web/app/templates/services/file-setup.html.j2
+++ b/web/app/templates/services/file-setup.html.j2
@@ -44,7 +44,7 @@
</div>
<div class="col s12">
- <h3>Submit a job</h3>
+ <h2>Submit a job</h2>
<div class="card">
<form class="nopaque-submit-form" data-progress-modal="progress-modal">
<div class="card-content">
diff --git a/web/app/templates/services/nlp.html.j2 b/web/app/templates/services/nlp.html.j2
index dafca7e0..4298465b 100644
--- a/web/app/templates/services/nlp.html.j2
+++ b/web/app/templates/services/nlp.html.j2
@@ -62,7 +62,7 @@
</div>
<div class="col s12">
- <h3>Submit a job</h3>
+ <h2>Submit a job</h2>
<div class="card">
<form class="nopaque-submit-form" data-progress-modal="progress-modal">
<div class="card-content">
diff --git a/web/app/templates/services/ocr.html.j2 b/web/app/templates/services/ocr.html.j2
index 0ce9cce1..bcd71944 100644
--- a/web/app/templates/services/ocr.html.j2
+++ b/web/app/templates/services/ocr.html.j2
@@ -44,7 +44,7 @@
</div>
<div class="col s12">
- <h3>Submit a job</h3>
+ <h2>Submit a job</h2>
<div class="card">
<form class="nopaque-submit-form" data-progress-modal="progress-modal">
<div class="card-content">
--
GitLab