Merge pull request #11514 from twbs/navbar-text-float-breakpoint

Fix #11513: Don't always float navbar-text

Merge pull request #11514 from twbs/navbar-text-float-breakpoint
Fix #11513: Don't always float navbar-text
84a3aa3e · Julian Thilo · 7c9b9325 · 8aec5276 · 84a3aa3e · 84a3aa3e
Commit 84a3aa3e authored 11 years ago by Julian Thilo
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 3 deletions
+3 -3
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4665,13 +4665,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }

 .navbar-text {
-  float: left;
  margin-top: 15px;
  margin-bottom: 15px;
 }

 @media (min-width: 768px) {
  .navbar-text {
+    float: left;
    margin-right: 15px;
    margin-left: 15px;
  }

--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -340,10 +340,10 @@
 // Add a class to make any element properly align itself vertically within the navbars.

 .navbar-text {
-  float: left;
  .navbar-vertical-align(@line-height-computed);

  @media (min-width: @grid-float-breakpoint) {
+    float: left;
    margin-left: @navbar-padding-horizontal;
    margin-right: @navbar-padding-horizontal;
  }