From d6f1d5245c753a15c7acffed89e32b875ca9ad17 Mon Sep 17 00:00:00 2001 From: robdy Date: Wed, 27 Jun 2018 23:16:51 +0200 Subject: [PATCH 1/2] fixed menu overlapping --- assets/styles/bootstrap/navbar.less | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/assets/styles/bootstrap/navbar.less b/assets/styles/bootstrap/navbar.less index 61a87c9d..9a24c059 100644 --- a/assets/styles/bootstrap/navbar.less +++ b/assets/styles/bootstrap/navbar.less @@ -51,8 +51,6 @@ overflow-x: visible; padding-right: @navbar-padding-horizontal; padding-left: @navbar-padding-horizontal; - border-top: 1px solid transparent; - box-shadow: inset 0 1px 0 rgba(255,255,255,.1); &:extend(.clearfix all); -webkit-overflow-scrolling: touch; @@ -300,10 +298,6 @@ margin-left: -@navbar-padding-horizontal; margin-right: -@navbar-padding-horizontal; padding: 10px @navbar-padding-horizontal; - border-top: 1px solid transparent; - border-bottom: 1px solid transparent; - @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); - .box-shadow(@shadow); // Mixin behavior for optimum display .form-inline(); @@ -664,4 +658,9 @@ } } } + #main-navbar { + @media (max-width: @screen-xs-max) { + padding-top: 35px; + } + } } From 4bf5e52cf39053d2f23020a94990c933efceeeed Mon Sep 17 00:00:00 2001 From: robdy Date: Thu, 28 Jun 2018 22:06:50 +0200 Subject: [PATCH 2/2] fixed menu for tablets --- assets/styles/bootstrap/navbar.less | 8 ++++++++ assets/styles/bootstrap/variables.less | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/assets/styles/bootstrap/navbar.less b/assets/styles/bootstrap/navbar.less index 9a24c059..8494b04d 100644 --- a/assets/styles/bootstrap/navbar.less +++ b/assets/styles/bootstrap/navbar.less @@ -51,6 +51,9 @@ overflow-x: visible; padding-right: @navbar-padding-horizontal; padding-left: @navbar-padding-horizontal; + border-top: 0px solid transparent; + box-shadow: inset 0 0px 0 rgba(255,255,255,.1); + &:extend(.clearfix all); -webkit-overflow-scrolling: touch; @@ -298,6 +301,11 @@ margin-left: -@navbar-padding-horizontal; margin-right: -@navbar-padding-horizontal; padding: 10px @navbar-padding-horizontal; + border-top: 0px solid transparent; + border-bottom: 0px solid transparent; + @shadow: inset 0 0px 0 rgba(255,255,255,.1), 0 0px 0 rgba(255,255,255,.1); + .box-shadow(@shadow); + // Mixin behavior for optimum display .form-inline(); diff --git a/assets/styles/bootstrap/variables.less b/assets/styles/bootstrap/variables.less index 582f0f8d..a78e3a46 100644 --- a/assets/styles/bootstrap/variables.less +++ b/assets/styles/bootstrap/variables.less @@ -305,7 +305,7 @@ @grid-gutter-width: 30px; // Navbar collapse //** Point at which the navbar becomes uncollapsed. -@grid-float-breakpoint: @screen-sm-min; +@grid-float-breakpoint: @screen-md-min; //** Point at which the navbar begins collapsing. @grid-float-breakpoint-max: (@grid-float-breakpoint - 1);