diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css new file mode 100644 index 00000000..794ff849 --- /dev/null +++ b/konova/static/css/konova.css @@ -0,0 +1,23 @@ +/* +Declare some basic colours +*/ +:root{ + --rlp-red: #871d33; + --rlp-grey-dark: #8e8e8e; + --rlp-grey-light: #c6c6c6; +} + + +.nav{ + background-color: var(--rlp-red); + height: 50px; +} + +.menu-elem{ + border-left: 1px solid white; + border-right: 1px solid white; +} + +.nav-btn{ + color: white; +} \ No newline at end of file diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 2f712edf..8fe31e91 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -224,7 +224,7 @@ msgstr "Neues Ökokonto hinzufügen" #: konova/settings.py:62 msgid "Edit eco account" -msgstr "Ökokonto" +msgstr "Ökokonto bearbeiten" #: konova/settings.py:63 msgid "Delete eco account" diff --git a/templates/anonymous-user-navbar.html b/templates/anonymous-user-navbar.html deleted file mode 100644 index 0836ac03..00000000 --- a/templates/anonymous-user-navbar.html +++ /dev/null @@ -1,22 +0,0 @@ -{% load i18n %} -
- -
\ No newline at end of file diff --git a/templates/authenticated-user-navbar.html b/templates/authenticated-user-navbar.html deleted file mode 100644 index 9e977ae7..00000000 --- a/templates/authenticated-user-navbar.html +++ /dev/null @@ -1,128 +0,0 @@ -{% load i18n %} - -
- -
- -
- {% trans 'You are currently working as ' %} - {{ current_role.type }} ({{ current_role.org }}) - {% trans 'Change...' %} -
\ No newline at end of file diff --git a/templates/base.html b/templates/base.html index cf7e2ea2..471fba83 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,5 +1,5 @@ -{% load static i18n fontawesome_5 %} +{% load static i18n fontawesome_5 bootstrap4 %} @@ -7,89 +7,28 @@ {% bootstrap_css %} {% bootstrap_javascript jquery='full' %} {% fontawesome_5_static %} + {% block head %} {% endblock %} -{% if render_header %} -
-
-
-
-

{{ base_frontend_title }}

-
-
- -
-
-
-{% endif %} -
- - -
-
- {% for message in messages %} -
- {{ message }} -
- {% endfor %} -
- -
-
- {% block body %} -
- {% block body_left %} -   - {% endblock %} -
-
- {% block body_middle %} - {% endblock %} -
-
- {% block body_right %} -   - {% endblock %} -
- {% endblock %} -
-
-
-
-