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

Conflicts: dist/css/bootstrap.min.css
2026-06-14 18:42:30 +03:00 · 2013-08-02 19:30:03 -07:00
parent e8145ac939 7cfcfdfe64
commit a3be713f8f
3 changed files with 5 additions and 1 deletions
@@ -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);
 }