Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext

Conflicts: dist/css/bootstrap.min.css

Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext
Conflicts: dist/css/bootstrap.min.css
a3be713f · Mark Otto · e8145ac9 · 7cfcfdfe · a3be713f · a3be713f
Commit a3be713f authored Aug 02, 2013 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

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

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

less/navbar.less less/navbar.less +2 -0

No files found.
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3083,6 +3083,8 @@ button.close {
 }

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

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

 .navbar-text {
+  float: left;
+  padding: 0 @navbar-padding-horizontal;
  .navbar-vertical-align(@line-height-computed);
 }