Skip to content
Snippets Groups Projects
Commit 2240657e authored by Patrick Jentsch's avatar Patrick Jentsch
Browse files

fix multiple things

parent 67571230
No related branches found
No related tags found
No related merge requests found
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
{{ super() }} {{ super() }}
{% endblock metas %} {% 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 %} {% block styles %}
{{ super() }} {{ super() }}
{% if current_user.is_authenticated %} {% 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 %} {% 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"> <link href="{{ url_for('static', filename='css/nopaque.css') }}" media="screen,projection" rel="stylesheet">
<style> <style>
.primary-color {background-color: {{ COLORS.primary }} !important;} .primary-color {background-color: {{ COLORS.primary }} !important;}
...@@ -59,7 +59,8 @@ ...@@ -59,7 +59,8 @@
{% if scheme_color is not defined %} {% if scheme_color is not defined %}
{% set scheme_color = COLORS.primary %} {% set scheme_color = COLORS.primary %}
{% endif %} {% 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 .pagination li.active {background-color: {{ scheme_color }};}
main .table-of-contents a.active {border-color: {{ scheme_color }};} main .table-of-contents a.active {border-color: {{ scheme_color }};}
main .tabs .tab a {color: inherit;} main .tabs .tab a {color: inherit;}
...@@ -92,7 +93,7 @@ ...@@ -92,7 +93,7 @@
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
<div class="nav-content secondary-color"> <div class="nav-content primary-color" style="filter: brightness(120%);">
{% block nav_content %}{% endblock nav_content %} {% block nav_content %}{% endblock nav_content %}
</div> </div>
</nav> </nav>
...@@ -117,6 +118,7 @@ ...@@ -117,6 +118,7 @@
<span class="white-text email">{{ current_user.email }}</span> <span class="white-text email">{{ current_user.email }}</span>
</div> </div>
</li> </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="#"><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') }}"><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> <li><a href="{{ url_for('main.dashboard', _anchor='corpora') }}" style="padding-left: 47px;"><i class="material-icons">book</i>My Corpora</a></li>
......
<ul class="tabs tabs-transparent"> <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 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"><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"><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"><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> <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> </ul>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
<div class="col s12"> <div class="col s12">
<h3>Submit a job</h3> <h2>Submit a job</h2>
<div class="card"> <div class="card">
<form class="nopaque-submit-form" data-progress-modal="progress-modal"> <form class="nopaque-submit-form" data-progress-modal="progress-modal">
<div class="card-content"> <div class="card-content">
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</div> </div>
<div class="col s12"> <div class="col s12">
<h3>Submit a job</h3> <h2>Submit a job</h2>
<div class="card"> <div class="card">
<form class="nopaque-submit-form" data-progress-modal="progress-modal"> <form class="nopaque-submit-form" data-progress-modal="progress-modal">
<div class="card-content"> <div class="card-content">
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
<div class="col s12"> <div class="col s12">
<h3>Submit a job</h3> <h2>Submit a job</h2>
<div class="card"> <div class="card">
<form class="nopaque-submit-form" data-progress-modal="progress-modal"> <form class="nopaque-submit-form" data-progress-modal="progress-modal">
<div class="card-content"> <div class="card-content">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment