aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-10-17 22:08:49 -0700
committerMark Otto <[email protected]>2016-10-17 22:08:49 -0700
commit484a8e3901b01cdbc2ca4bf5bb94905809883e96 (patch)
tree2552710b00eae41253cd7ffffec22ab3e26ca864
parente24f406ce160e45aee2587da47d044a9df254410 (diff)
downloadbootstrap-484a8e3901b01cdbc2ca4bf5bb94905809883e96.tar.xz
bootstrap-484a8e3901b01cdbc2ca4bf5bb94905809883e96.zip
add navbar-brand and navbar-nav styles to the toggleable
-rw-r--r--scss/_navbar.scss29
1 files changed, 23 insertions, 6 deletions
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 4f2229db9..ea4f57817 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;
}
}
}