From 1e31774ce7f85289f599417524fd4a8647a4316f Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 27 Oct 2021 15:48:42 +1100 Subject: [PATCH] Working on navbar --- InvenTree/InvenTree/static/css/inventree.css | 30 +++- InvenTree/templates/js/dynamic/inventree.js | 2 +- InvenTree/templates/navbar.html | 147 ++++++++++--------- InvenTree/templates/search_form.html | 8 +- 4 files changed, 112 insertions(+), 75 deletions(-) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index 3527f1d0af..6f8bd858b7 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -128,6 +128,10 @@ object-fit: fill; } +.navbar { + border-bottom: 1px solid #ccc; +} + .navbar-brand { float: left; } @@ -250,6 +254,19 @@ border-radius: 5px; } +.label { + display: inline; + font-size: 75%; + line-height: 1; + padding-left: 4px; + padding-right: 4px; + color: white; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + border-radius: .25em; +} + .label-red { background: var(--label-red); } @@ -639,6 +656,7 @@ padding-right: 10px; padding-top: 5px; width: 100%; + max-width: 100%; display: inline-block; transition: 0.1s; } @@ -929,13 +947,19 @@ input[type="submit"] { .panel-heading { padding: 5px 10px; - background-color: #fafafa; + padding-left: 15px; + padding-top: 10px; + color: #333; + background-color: #dcdcdc; + border-bottom: 1px solid #ccc; } .panel-inventree { - padding: 10px; box-shadow: 2px 2px #DDD; - border-color: #ccc; + margin-bottom: 20px; + background-color: #fff; + border: 1px solid #ccc; + border-radius: 5px; } .panel-hidden { diff --git a/InvenTree/templates/js/dynamic/inventree.js b/InvenTree/templates/js/dynamic/inventree.js index 4766565d3c..054c957107 100644 --- a/InvenTree/templates/js/dynamic/inventree.js +++ b/InvenTree/templates/js/dynamic/inventree.js @@ -111,7 +111,7 @@ function inventreeDocReady() { modal.modal({ backdrop: 'static', - keyboard: 'false', + keyboard: true, }); modal.modal('show'); diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html index a17ae0d804..7f438bdb59 100644 --- a/InvenTree/templates/navbar.html +++ b/InvenTree/templates/navbar.html @@ -4,10 +4,11 @@ {% settings_value 'BARCODE_ENABLE' as barcodes %} -