From c847279e14dc185d0a90e3533d265e48fd3238f0 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 6 Jan 2016 15:51:23 -0800
Subject: [PATCH] Consolidate nav-tab dropdown styles with nav-tab styles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 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
---
 scss/_nav.scss | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/scss/_nav.scss b/scss/_nav.scss
index 55e0fe1dfb..6bb09fdbdd 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);
-}