inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 20:46:47 +00:00
Code

Merge branch 'master' of git://github.com/inventree/InvenTree into new_homepage_layout

Browse Source
This commit is contained in:
eeintech 2020-09-16 17:03:59 -05:00
commit 28a55f0a58
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/InvenTree/static/css/inventree.css
View File

@ -82,9 +82,10 @@
float: left; float: left;
} }
.navbar-barcode-li { #navbar-barcode-li {
border-left: none; border-left: none;
border-right: none; border-right: none;
padding-right: 5px;
} }
.navbar-nav > li { .navbar-nav > li {

2
InvenTree/templates/navbar.html
View File

@ -36,7 +36,7 @@
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
{% include "search_form.html" %} {% include "search_form.html" %}
<li class ='navbar-barcode-li nav navbar-nav'> <li id='navbar-barcode-li'>
<button id='barcode-scan' class='btn btn-default' title='{% trans "Scan Barcode" %}'> <button id='barcode-scan' class='btn btn-default' title='{% trans "Scan Barcode" %}'>
<span class='fas fa-qrcode'></span> <span class='fas fa-qrcode'></span>
</button> </button>