From: Mark Otto <markdotto@gmail.com>
Date: Tue, 18 Oct 2016 05:08:49 +0000 (-0700)
Subject: add navbar-brand and navbar-nav styles to the toggleable
X-Git-Tag: v4.0.0-alpha.5~4^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=484a8e3901b01cdbc2ca4bf5bb94905809883e96;p=thirdparty%2Fbootstrap.git

add navbar-brand and navbar-nav styles to the toggleable
---

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;
       }
     }
   }