aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-01-06 15:51:23 -0800
committerMark Otto <[email protected]>2016-01-06 15:51:23 -0800
commitc847279e14dc185d0a90e3533d265e48fd3238f0 (patch)
treef1ac3242135323ccdebf190f831d7369ccbca6cd /scss
parentfac0c31a27e1d65638c561b254316dd6c0726cc8 (diff)
downloadbootstrap-c847279e14dc185d0a90e3533d265e48fd3238f0.tar.xz
bootstrap-c847279e14dc185d0a90e3533d265e48fd3238f0.zip
Consolidate nav-tab dropdown styles with nav-tab styles
- Moves styles up the document a bit to nest them - Drops the static 1px for $navbar-tabs-border-width so once again it’s all tied together should folks customize that
Diffstat (limited to 'scss')
-rw-r--r--scss/_nav.scss19
1 files changed, 7 insertions, 12 deletions
diff --git a/scss/_nav.scss b/scss/_nav.scss
index 55e0fe1df..6bb09fdbd 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -88,6 +88,13 @@
border-color: $nav-tabs-active-link-hover-border-color $nav-tabs-active-link-hover-border-color transparent;
}
}
+
+ .dropdown-menu {
+ // Make dropdown border overlap tab border
+ margin-top: -$nav-tabs-border-width;
+ // Remove the top rounded corners here since there is a hard edge above the menu
+ @include border-top-radius(0);
+ }
}
@@ -148,15 +155,3 @@
display: block;
}
}
-
-
-//
-// Dropdowns
-//
-
-.nav-tabs .dropdown-menu {
- // Make dropdown border overlap tab border
- margin-top: -1px;
- // Remove the top rounded corners here since there is a hard edge above the menu
- @include border-top-radius(0);
-}