diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index bfac59e182..df4d59f95b 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -206,8 +206,19 @@ font-size: 10px; } +.sidenav-left .badge { + position: absolute; + right: 3px; + margin-right: 5px; +} + .treeview .list-group-item { - padding: 6px 12px; + padding: 10px 5px; +} + +.treeview .list-group-item .indent { + margin-left: 3px; + margin-right: 3px; } .list-group-item-condensed { @@ -678,23 +689,32 @@ input[type="submit"] { display: flex; } -/* The side navigation menu */ -.menubar-left { +.sidenav { height: 100%; /* 100% Full-height */ width: 0px; /* 0 width - change this with JavaScript */ position: relative; /* Stay in place */ - background-color: #fff; /* Black*/ overflow-x: hidden; /* Disable horizontal scroll */ overflow: hidden; transition: 0.1s; /* 0.5 second transition effect to slide in the sidenav */ - left: 0px; - top: 0px; z-index: 100; display: inline-block; + background-color: #fff; /* Black*/ } -.menubar-right { - display: none; +.sidenav li { + white-space: nowrap; + overflow-x: hidden; +} + +/* The side navigation menu */ +.sidenav-left { + left: 0px; + top: 0px; +} + +.sidenav-right { + right: 0px; + top: 0px; } .wrapper { diff --git a/InvenTree/InvenTree/static/script/inventree/sidenav.js b/InvenTree/InvenTree/static/script/inventree/sidenav.js index b5fcc70f47..55daba0d6a 100644 --- a/InvenTree/InvenTree/static/script/inventree/sidenav.js +++ b/InvenTree/InvenTree/static/script/inventree/sidenav.js @@ -76,7 +76,7 @@ function openSideNav(navId) { } $(navId).animate({ - width: '250px', + width: '150px', display: 'block' }, 50); diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html index fd0ad840f4..e7743b5ebe 100644 --- a/InvenTree/templates/base.html +++ b/InvenTree/templates/base.html @@ -74,7 +74,7 @@ InvenTree