]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fix right aligned dropdowns
authorMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 04:06:38 +0000 (20:06 -0800)
committerMark Otto <markotto@twitter.com>
Sun, 19 Feb 2012 04:06:38 +0000 (20:06 -0800)
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
less/dropdowns.less
less/navbar.less

index 04d93735d041f2d6ed49ebfade82f2ea0a2df1ed..011a9e8a3f06ebe991ef2884d111043c5a0f646d 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index 33ab32b09a4f74bd0f3cb654c1cc35c66e55d931..71ab7a9d4e24a08e9185127812cdfc59b43bb2ee 100644 (file)
@@ -1641,6 +1641,10 @@ table .span12 {
 .dropdown.open .dropdown-menu {
   display: block;
 }
+.pull-right .dropdown-menu {
+  left: auto;
+  right: 0;
+}
 .typeahead {
   margin-top: 2px;
   -webkit-border-radius: 4px;
@@ -2709,10 +2713,6 @@ button.btn.small, input[type="submit"].btn.small {
 .navbar .nav .active > .dropdown-toggle:hover {
   color: #ffffff;
 }
-.navbar .nav.pull-right .dropdown-menu {
-  left: auto;
-  right: 0;
-}
 .navbar .nav.pull-right .dropdown-menu:before {
   left: auto;
   right: 12px;
index 1ec06b04ade2cb8442d65e76c044a997a36dba65..1b445844c79d82a4f604a1e540b901c204c438f1 100644 (file)
   }
 }
 
+// Right aligned dropdowns
+.pull-right .dropdown-menu {
+  left: auto;
+  right: 0;
+}
+
 // Typeahead
 .typeahead {
   margin-top: 2px; // give it some space to breathe
index 16553c1ff320cc1fa70a2d3278fb40d4a501f68a..b656cba48cbeaae16290f80fdd96e0c8d51962c9 100644 (file)
 
 // Right aligned menus need alt position
 .navbar .nav.pull-right .dropdown-menu {
-  left: auto;
-  right: 0;
   &:before {
     left: auto;
     right: 12px;