]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
add navbar-brand and navbar-nav styles to the toggleable
authorMark Otto <markdotto@gmail.com>
Tue, 18 Oct 2016 05:08:49 +0000 (22:08 -0700)
committerMark Otto <markdotto@gmail.com>
Tue, 18 Oct 2016 05:08:49 +0000 (22:08 -0700)
scss/_navbar.scss

index 4f2229db95ff6ed0d9a0bd325cccdefb7c76b12b..ea4f578170ad006d5b63db8194f4ef9b71674a60 100644 (file)
 //
 
 .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 {
 .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;
       }
     }
   }