From 444aeb37e66de87acaae94fec140db2783868da1 Mon Sep 17 00:00:00 2001 From: Johannes Schriewer Date: Tue, 22 Dec 2020 04:27:57 +0100 Subject: [PATCH] Styling --- inventory/static/inventory/css/main.css | 45 +++++++++++++++++-- inventory/static/inventory/img/logout.svg | 1 + inventory/templates/base.html | 13 ++++++ .../templates/inventory/area_detail.html | 7 ++- .../templates/inventory/box-generic.html | 9 +++- .../templates/inventory/box-ikea-samla.html | 9 ++-- .../templates/inventory/box-raaco-even.html | 9 ++-- .../templates/inventory/box-raaco-simple.html | 9 ++-- .../templates/inventory/box-smd-box-all.html | 11 +++-- .../templates/inventory/item_detail.html | 10 +++-- .../templates/inventory/workshop_detail.html | 8 +++- .../templates/inventory/workshop_list.html | 5 ++- inventory/templates/registration/login.html | 4 ++ 13 files changed, 113 insertions(+), 27 deletions(-) create mode 100644 inventory/static/inventory/img/logout.svg diff --git a/inventory/static/inventory/css/main.css b/inventory/static/inventory/css/main.css index 185762c..d28e233 100644 --- a/inventory/static/inventory/css/main.css +++ b/inventory/static/inventory/css/main.css @@ -1,5 +1,7 @@ -body { +body, html { font-family: sans-serif; + margin: 0; + padding: 0; } table.attribute-list { @@ -50,6 +52,27 @@ table.box th { border-style: solid; } +nav { + display: flex; + justify-content: space-between; + background-color: #292981; + color: #ffffff; + padding: 20px; + margin-bottom: 20px; +} + +nav form { + display: inline-block; + margin: 0; +} + +nav button { + border: 1px solid #e0e0e0; + background-color: #333381; + color: #ffffff; + padding: 8px 10px 8px 10px; +} + h1 { margin-top: 20px; } @@ -63,7 +86,21 @@ h1 .small { h2 .small { font-size: 12pt; font-weight: normal; - color: #808080; +} + +nav h2 { + margin-top: 0; + margin-bottom: 0; + display: inline-block; + width: auto; +} + +nav h2 .small { + color: #c0c0c0; +} + +nav .icon { + filter: invert(); } main { @@ -71,7 +108,7 @@ main { } @media (min-width: 1025px) { - h1 { + h1, h2 { width: 80%; } @@ -81,7 +118,7 @@ main { } @media (max-width: 1024px) { - h1 { + h1, h2 { width: 95%; } diff --git a/inventory/static/inventory/img/logout.svg b/inventory/static/inventory/img/logout.svg new file mode 100644 index 0000000..fdc3f4e --- /dev/null +++ b/inventory/static/inventory/img/logout.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/inventory/templates/base.html b/inventory/templates/base.html index 1ce1fc9..66c3f92 100644 --- a/inventory/templates/base.html +++ b/inventory/templates/base.html @@ -8,6 +8,19 @@ {% block head %}{% endblock %} + +
{% block content %} {% endblock %} diff --git a/inventory/templates/inventory/area_detail.html b/inventory/templates/inventory/area_detail.html index 49a3385..f7ab7e0 100644 --- a/inventory/templates/inventory/area_detail.html +++ b/inventory/templates/inventory/area_detail.html @@ -3,8 +3,13 @@ {% block title %}{{ area.container.display_name }} - {{ area.name }}{% endblock %} +{% block header_bar %} + + {{ area.container.display_name }} - {{ area.name }} + {{ area.description}} +{% endblock %} + {% block content %} -

{{ area.container.display_name }} - {{ area.name }} {{ area.description}}

Areas