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

diff --git a/scss/_nav.scss b/scss/_nav.scss
index 55e0fe1dfb6398894284d4c81b0367703698426b..6bb09fdbdd70e128520a2ec396e667de1ed4a80c 100644 (file)
--- 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);
-}