From 1ef9cbc6e4b2a002eea4515f3779318f2ee60666 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 8 Jan 2012 12:40:30 -0800
Subject: rejigger z-index ranks for popovers/topbar/etc

---
 lib/variables.less | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib')

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
-- 
cgit v1.2.3


From cb9be7bd0cde19b3b401d2dcdfb6162dd00b5ab5 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 8 Jan 2012 13:21:44 -0800
Subject: clean up dup css in responsive, fix navbar dropdown caret

---
 lib/navs.less        |  6 ++++--
 lib/responsive.less  | 16 +++++-----------
 lib/scaffolding.less | 10 ++++++++--
 3 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'lib')

diff --git a/lib/navs.less b/lib/navs.less
index dee482aea..65d459da9 100644
--- a/lib/navs.less
+++ b/lib/navs.less
@@ -182,11 +182,13 @@
 .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 {
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: "&darr;";
     }
-
     .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 {
-- 
cgit v1.2.3


From 6226b14e3b97819119da0f026e9d3ae6dd0a31c0 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 8 Jan 2012 13:30:23 -0800
Subject: fix placement of dropdowns in navbar after getting to general in
 those styles

---
 lib/navs.less | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/navs.less b/lib/navs.less
index 65d459da9..804a273bb 100644
--- a/lib/navs.less
+++ b/lib/navs.less
@@ -175,7 +175,8 @@
 // ---------
 
 // Position the menu
-.nav .dropdown-menu {
+.pills .dropdown-menu,
+.tabs .dropdown-menu {
   top: 33px;
   border-width: 1px;
 }
@@ -191,7 +192,8 @@
 .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;
 }
-- 
cgit v1.2.3