diff --git a/package.json b/package.json index ca33230c..fcf53332 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "private": true, "dependencies": { "bootstrap": "^4.1.1", + "jquery": "^3.3.1", "font-awesome": "^4.7.0", "bootbox": "^4.4.0", "jquery-serializejson": "^2.8.1", diff --git a/public/css/grocy.css b/public/css/grocy.css index cdc99538..8bc026c4 100644 --- a/public/css/grocy.css +++ b/public/css/grocy.css @@ -24,6 +24,12 @@ max-width: 260px; border-left: 0; overflow-y: auto; + height: 100%; +} + +#sidebar > ul > a > li { + background-color: #e5e5e5; + border: 0; } @media (min-width: 768px) { @@ -36,25 +42,25 @@ } } -.sidebar-nav > li > a { +.sidebar-nav > li { padding-right: 20px; padding-left: 20px; transition: all 0.3s; } -.sidebar-nav > li > a:hover { +.sidebar-nav > li:hover { box-shadow: inset 5px 0 0 #337ab7; transition: all 0.3s; } -.sidebar-nav > li > a:focus { +.sidebar-nav > li:focus { box-shadow: inset 5px 0 0 #ab2230; transition: all 0.3s; } -.sidebar-nav > .active > a, -.sidebar-nav > .active > a:hover, -.sidebar-nav > .active > a:focus { +.sidebar-nav > .active, +.sidebar-nav > .active:hover, +.sidebar-nav > .active:focus { background-color: #d6d6d6; box-shadow: inset 5px 0 0 #ab2230; transition: all 0.3s; diff --git a/views/components/menu.blade.php b/views/components/menu.blade.php index 2822c9d8..e54a87f0 100644 --- a/views/components/menu.blade.php +++ b/views/components/menu.blade.php @@ -1,66 +1,96 @@ - -