Merge pull request #9451 from Luis-TP/3.0.0-wip

Fix .navbar-right > .dropdown-menu alignment

Merge pull request #9451 from Luis-TP/3.0.0-wip
Fix .navbar-right > .dropdown-menu alignment
9d82a8ba · Mark Otto · 66122fa1 · c79fa6ad · 9d82a8ba · 9d82a8ba
Commit 9d82a8ba authored Aug 13, 2013 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

dist/css/bootstrap.css dist/css/bootstrap.css +4 -0

dist/css/bootstrap.min.css dist/css/bootstrap.min.css +1 -1

less/navbar.less less/navbar.less +6 -1

No files found.
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3354,6 +3354,10 @@ button.close {
  .navbar-right {
    float: right !important;
  }
+  .navbar-right .dropdown-menu {
+    right: 0;
+    left: auto;
+  }
 }

 .navbar-form {

--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -259,7 +259,12 @@

 @media (min-width: @grid-float-breakpoint) {
  .navbar-left  { .pull-left(); }
-  .navbar-right { .pull-right(); }
+  .navbar-right {
+    .pull-right();
+    .dropdown-menu {
+      .pull-right > .dropdown-menu();
+    }
+  }
 }