4 files changed, 27 insertions, 22 deletions

diff --git a/lib/navs.less b/lib/navs.less
index dee482aea..804a273bb 100644
--- a/lib/navs.less
+++ b/lib/navs.less
@@ -175,21 +175,25 @@
 // ---------
 
 // Position the menu
-.nav .dropdown-menu {
+.pills .dropdown-menu,
+.tabs .dropdown-menu {
   top: 33px;
   border-width: 1px;
 }
 .pills .dropdown-menu {
   .border-radius(4px);
 }
-.nav .dropdown-toggle .caret {
+.tabs .dropdown-toggle .caret,
+.pills .dropdown-toggle .caret {
   border-top-color: @linkColor;
   margin-top: 6px;
 }
-.nav .dropdown-toggle:hover .caret {
+.tabs .dropdown-toggle:hover .caret,
+.pills .dropdown-toggle:hover .caret {
   border-top-color: @linkColorHover;
 }
-.nav .open .dropdown-toggle {
+.tabs .open .dropdown-toggle,
+.pills .open .dropdown-toggle {
   background-color: #999;
   border-color: #999;
 }
diff --git a/lib/responsive.less b/lib/responsive.less
index e87b8495f..5131aa625 100644
--- a/lib/responsive.less
+++ b/lib/responsive.less
@@ -67,7 +67,6 @@
       .opacity(100);
       content: "↓";
     }
-
     .nav:hover > li {
       display: block;
     }
@@ -76,13 +75,6 @@
     }
   }
 
-  // Resize modals
-  .modal {
-    width: auto;
-    margin: 0;
-    &.fade.in { top: auto; }
-  }
-
   // Remove the horizontal form styles
   .horizontal-form .control-group > label {
     float: none;
@@ -110,10 +102,12 @@
     left: 20px;
     right: 20px;
     width: auto;
-    .close {
-      padding: 10px;
-    }
+    &.fade.in { top: auto; }
   }
+  .modal-header .close {
+    padding: 10px;
+  }
+
 }
 
 
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 7432e849b..a1f41ab66 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -39,8 +39,14 @@ body {
 .sidebar-right  { padding-right: @fluidSidebarWidth + 40; }
 
 // Float the sidebars accordingly
-.sidebar-left .fluid-sidebar   { float: left; margin-left: (@fluidSidebarWidth + 20) * -1; }
-.sidebar-right .fluid-sidebar  { float: right; margin-right: (@fluidSidebarWidth + 20) * -1; }
+.sidebar-left .fluid-sidebar {
+  float: left;
+  margin-left: (@fluidSidebarWidth + 20) * -1;
+}
+.sidebar-right .fluid-sidebar {
+  float: right;
+  margin-right: (@fluidSidebarWidth + 20) * -1;
+}
 
 // The main content area
 .fluid-content {
diff --git a/lib/variables.less b/lib/variables.less
index 37f5adb71..97b6f9e3c 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -49,12 +49,13 @@
 
 // Z-INDEX
 // -------
+
 @zindexDropdown:        1000;
-@zindexFixedNavbar:     1010;
-@zindexModalBackdrop:   1020;
-@zindexModal:           1030;
-@zindexPopover:         1040;
-@zindexTwipsy:          1050;
+@zindexPopover:         1010;
+@zindexTwipsy:          1020;
+@zindexFixedNavbar:     1030;
+@zindexModalBackdrop:   1040;
+@zindexModal:           1050;
 
 
 // THEME VARIABLES