From 23b8c8f32671d984bc47116fee5a2c3d41307900 Mon Sep 17 00:00:00 2001 From: Izoman Date: Tue, 7 Feb 2017 15:39:20 +0100 Subject: [PATCH] #39 Hamburger menu fixed on admin + Made admin pages more mobile friendly --- resources/assets/sass/_mediaqueries.scss | 2 +- resources/assets/sass/components/_topnav.scss | 34 ++- resources/views/layouts/backoffice.blade.php | 223 +++++++++--------- 3 files changed, 147 insertions(+), 112 deletions(-) diff --git a/resources/assets/sass/_mediaqueries.scss b/resources/assets/sass/_mediaqueries.scss index 8da1502..c9ccc3e 100644 --- a/resources/assets/sass/_mediaqueries.scss +++ b/resources/assets/sass/_mediaqueries.scss @@ -114,7 +114,7 @@ img { display: none; } - .navbar-default{ + .navbar-default, .navbar-inverse{ .navbar-brand{ padding: 0 25px } diff --git a/resources/assets/sass/components/_topnav.scss b/resources/assets/sass/components/_topnav.scss index 38e995f..3434d2f 100644 --- a/resources/assets/sass/components/_topnav.scss +++ b/resources/assets/sass/components/_topnav.scss @@ -23,7 +23,7 @@ } } -.navbar-default{ +.navbar-default, .navbar-inverse{ .navbar-brand{ padding: 0; } @@ -34,8 +34,10 @@ margin-right: 100px; margin-top: ($navbar-height - $navlogo-height)/2; } +} - .navbar-nav{ +.navbar-default { + .navbar-nav{ li{ a{ box-sizing: border-box; @@ -49,6 +51,34 @@ } } + &.active{ + a{ + // border-bottom: 0px none; + + &:hover, &:focus{ + // border-bottom: 0px none; + } + } + } + } + } +} + +.navbar-inverse { + .navbar-nav{ + li{ + a{ + box-sizing: border-box; + padding: 0 30px; + height: $navbar-height; + line-height: $navbar-height; + + &:hover, &:focus{ + // border-bottom: 0px none; + background-color: darken($color-orange, 43%); + } + } + &.active{ a{ // border-bottom: 0px none; diff --git a/resources/views/layouts/backoffice.blade.php b/resources/views/layouts/backoffice.blade.php index a86b00b..510fbbd 100644 --- a/resources/views/layouts/backoffice.blade.php +++ b/resources/views/layouts/backoffice.blade.php @@ -9,117 +9,122 @@ - + - - -
-
-
-
-
- @yield('content') -
-
-@include('partials.footer') + {{-- MAIN CONTENT --}} +
+ @yield('content') +
+ + @include('partials.footer') +