From c10590678019b9b78e0af7893361d005d839c8b5 Mon Sep 17 00:00:00 2001
From: Blake Embrey <blake.embrey@onthehouse.com.au>
Date: Mon, 10 Dec 2012 16:42:41 +1000
Subject: Update .dropdown-menu selectors to avoid conflicts with other
 elements. Fixes #6197

---
 less/dropdowns.less | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'less/dropdowns.less')

diff --git a/less/dropdowns.less b/less/dropdowns.less
index 484bd3dda..a0d4b1fd0 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -72,7 +72,7 @@
   }
 
   // Links within the dropdown menu
-  li > a {
+  > li > a {
     display: block;
     padding: 3px 20px;
     clear: both;
@@ -85,8 +85,8 @@
 
 // Hover state
 // -----------
-.dropdown-menu li > a:hover,
-.dropdown-menu li > a:focus,
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
 .dropdown-submenu:hover > a {
   text-decoration: none;
   color: @dropdownLinkColorHover;
@@ -95,8 +95,8 @@
 
 // Active state
 // ------------
-.dropdown-menu .active > a,
-.dropdown-menu .active > a:hover {
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover {
   color: @dropdownLinkColorActive;
   text-decoration: none;
   outline: 0;
@@ -106,12 +106,12 @@
 // Disabled state
 // --------------
 // Gray out text and ensure the hover state remains gray
-.dropdown-menu .disabled > a,
-.dropdown-menu .disabled > a:hover {
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover {
   color: @grayLight;
 }
 // Nuke hover effects
-.dropdown-menu .disabled > a:hover {
+.dropdown-menu > .disabled > a:hover {
   text-decoration: none;
   background-color: transparent;
   background-image: none; // Remove CSS gradient
-- 
cgit v1.2.3


From 26b999b76ac564b89f21e6f80cc3052f57b60aa2 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 19 Dec 2012 19:46:44 -0800
Subject: no need for margin-top on .typeahead, it's set on .dropdown-menu

---
 less/dropdowns.less | 1 -
 1 file changed, 1 deletion(-)

(limited to 'less/dropdowns.less')

diff --git a/less/dropdowns.less b/less/dropdowns.less
index 922baf02d..33f58497e 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -216,5 +216,4 @@
 // ---------
 .typeahead {
   z-index: 1051;
-  margin-top: 2px; // give it some space to breathe
 }
-- 
cgit v1.2.3


From 7449e2e5a18d3f5d3c0ef76b0960f70b77fb47e8 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 19 Dec 2012 22:02:57 -0800
Subject: Remove @black and just use #000

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

(limited to 'less/dropdowns.less')

diff --git a/less/dropdowns.less b/less/dropdowns.less
index 33f58497e..81f8c735c 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -20,7 +20,7 @@
   width: 0;
   height: 0;
   vertical-align: top;
-  border-top:   4px solid @black;
+  border-top:   4px solid #000;
   border-right: 4px solid transparent;
   border-left:  4px solid transparent;
   content: "";
@@ -135,7 +135,7 @@
   // Reverse the caret
   .caret {
     border-top: 0;
-    border-bottom: 4px solid @black;
+    border-bottom: 4px solid #000;
     content: "";
   }
   // Different positioning for bottom up menu
-- 
cgit v1.2.3


From cc6974b74e34bd3b0a69fb8b6334fd8a328ca949 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 20 Dec 2012 00:27:05 -0800
Subject: Remove dropdown submenu CSS

---
 less/dropdowns.less | 61 +----------------------------------------------------
 1 file changed, 1 insertion(+), 60 deletions(-)

(limited to 'less/dropdowns.less')

diff --git a/less/dropdowns.less b/less/dropdowns.less
index 81f8c735c..93fb5e11c 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -78,8 +78,7 @@
 // Hover state
 // -----------
 .dropdown-menu li > a:hover,
-.dropdown-menu li > a:focus,
-.dropdown-submenu:hover > a {
+.dropdown-menu li > a:focus {
   text-decoration: none;
   color: @dropdown-link-color-hover;
   #gradient > .vertical(@dropdown-link-background-hover, darken(@dropdown-link-background-hover, 5%));
@@ -146,64 +145,6 @@
   }
 }
 
-// Sub menus
-// ---------------------------
-.dropdown-submenu {
-  position: relative;
-}
-// Default dropdowns
-.dropdown-submenu > .dropdown-menu {
-  top: 0;
-  left: 100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  border-radius: 0 4px 4px 4px;
-}
-.dropdown-submenu:hover > .dropdown-menu {
-  display: block;
-}
-
-// Dropups
-.dropup .dropdown-submenu > .dropdown-menu {
-  top: auto;
-  bottom: 0;
-  margin-top: 0;
-  margin-bottom: -2px;
-  border-radius: 4px 4px 4px 0;
-}
-
-// Caret to indicate there is a submenu
-.dropdown-submenu > a:after {
-  display: block;
-  content: " ";
-  float: right;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-  border-width: 5px 0 5px 5px;
-  border-left-color: darken(@dropdown-background, 20%);
-  margin-top: 5px;
-  margin-right: -10px;
-}
-.dropdown-submenu:hover > a:after {
-  border-left-color: @dropdown-link-color-hover;
-}
-
-// Left aligned submenus
-.dropdown-submenu.pull-left {
-  // Undo the float
-  // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere.
-  float: none;
-
-  // Positioning the submenu
-  > .dropdown-menu {
-    left: -100%;
-    margin-left: 10px;
-    border-radius: 4px 0 4px 4px;
-  }
-}
-
 // Tweak nav headers
 // -----------------
 // Increase padding from 15px to 20px on sides
-- 
cgit v1.2.3