From 484a8e3901b01cdbc2ca4bf5bb94905809883e96 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2016 22:08:49 -0700 Subject: [PATCH] add navbar-brand and navbar-nav styles to the toggleable --- scss/_navbar.scss | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 4f2229db95..ea4f578170 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -68,9 +68,10 @@ // .navbar-brand { - display: block; - padding-top: $navbar-brand-padding-y; + float: left; + padding-top: $navbar-brand-padding-y; padding-bottom: $navbar-brand-padding-y; + margin-right: 1rem; font-size: $font-size-lg; @include hover-focus { @@ -134,15 +135,31 @@ .navbar-toggleable { @each $breakpoint in map-keys($grid-breakpoints) { $next: breakpoint-next($breakpoint, $grid-breakpoints); + &-#{$breakpoint} { @include clearfix; - @include media-breakpoint-up($next) { - display: block !important; + @include media-breakpoint-down($breakpoint) { .navbar-brand { - float: left; - margin-right: 1rem; + float: none; + display: block; + margin-top: .5rem; + margin-right: 0; } + + .navbar-nav { + margin-top: .5rem; + margin-bottom: .5rem; + + .dropdown-menu { + position: static; + float: none; + } + } + } + + @include media-breakpoint-up($next) { + display: block; } } }