]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fixes #4396: pull right dropdown menus no longer overlaid by submenus
authorMark Otto <markotto@twitter.com>
Tue, 14 Aug 2012 21:32:03 +0000 (14:32 -0700)
committerMark Otto <markotto@twitter.com>
Tue, 14 Aug 2012 21:32:03 +0000 (14:32 -0700)
docs/assets/css/bootstrap.css
less/navbar.less

index c7fbc3e965959b8035e646153bbb8be8c6b4f160..ec63378c58f2ed6d012644744b3fae314a04f88c 100644 (file)
@@ -4360,6 +4360,17 @@ input[type="submit"].btn.btn-mini {
   left: auto;
 }
 
+.navbar .pull-right .dropdown-menu .dropdown-menu,
+.navbar .dropdown-menu.pull-right .dropdown-menu {
+  right: 100%;
+  left: auto;
+  margin-right: -1px;
+  margin-left: 0;
+  -webkit-border-radius: 6px 0 6px 6px;
+     -moz-border-radius: 6px 0 6px 6px;
+          border-radius: 6px 0 6px 6px;
+}
+
 .navbar-inverse {
   color: #999999;
 }
index 423ff4c728e13ef09099feaedfcdf25ca3760317..435bf2f286229136c3249b0d07f515d17cbe8f28 100644 (file)
     left: auto;
     right: 13px;
   }
+  .dropdown-menu {
+    left: auto;
+    right: 100%;
+    margin-left: 0;
+    margin-right: -1px;
+    .border-radius(6px 0 6px 6px);
+  }
 }