From e1c503836d585191d788ee2203df7499c7d718f2 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Fri, 12 Jun 2020 10:56:52 +1000
Subject: [PATCH] Improve barcode icon in navbar

---
 InvenTree/InvenTree/static/css/inventree.css   | 13 +++++++++++++
 InvenTree/stock/templates/stock/item_base.html |  2 +-
 InvenTree/templates/navbar.html                |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index c1ecc953a1..ccf0671d56 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -82,12 +82,25 @@
     float: left;
 }
 
+.navbar-barcode-li {
+    border-left: none;
+    border-right: none;
+}
+
 .navbar-nav > li {
     border-left: 1px solid;
     border-right: 1px solid;
     border-color: #eee;
 }
 
+.navbar-form {
+    padding-right: 3px;
+}
+
+#barcode-scan {
+    margin-top: 8px;
+}
+
 .icon-header {
     margin-right: 10px;
 }
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index 7b9f083f48..dc83144dfd 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -78,7 +78,7 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
         <button id='barcode-options' title='{% trans "Barcode actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-qrcode'></span> <span class='caret'></span></button>
         <ul class='dropdown-menu' role='menu'>
             <li><a href='#' id='show-qr-code'><span class='fas fa-qrcode'></span> {% trans "Show QR Code" %}</a></li>
-            <li><a href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
+            <li class='disabled'><a href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
             {% if item.uid %}
             <li><a href='#' id='unlink-barcode'><span class='fas fa-unlink'></span> {% trans "Unlink Barcode" %}</a></li>
             {% else %}
diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html
index 1caa1fa950..0a231044cd 100644
--- a/InvenTree/templates/navbar.html
+++ b/InvenTree/templates/navbar.html
@@ -28,7 +28,7 @@
     </ul>
     <ul class="nav navbar-nav navbar-right">
         {% include "search_form.html" %}
-        <li class ='nav navbar-nav'>
+        <li class ='navbar-barcode-li nav navbar-nav'>
           <button id='barcode-scan' class='btn btn-default' title='{% trans "Scan Barcode" %}'>
               <span class='fas fa-qrcode'></span>
           </button>