Skip to content

B
bootstrap
Commit a3be713f authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

Conflicts:
	dist/css/bootstrap.min.css
parents e8145ac9 7cfcfdfe
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
dist/css/bootstrap.css
View file @ a3be713f
...@@ -3083,6 +3083,8 @@ button.close { ...@@ -3083,6 +3083,8 @@ button.close {
} }
.navbar-text { .navbar-text {
float: left;
padding: 0 15px;
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
} }
......
dist/css/bootstrap.min.css
View file @ a3be713f
This source diff could not be displayed because it is too large. You can view the blob instead.
less/navbar.less
View file @ a3be713f
...@@ -354,6 +354,8 @@ ...@@ -354,6 +354,8 @@
// Add a class to make any element properly align itself vertically within the navbars. // Add a class to make any element properly align itself vertically within the navbars.
.navbar-text { .navbar-text {
float: left;
padding: 0 @navbar-padding-horizontal;
.navbar-vertical-align(@line-height-computed); .navbar-vertical-align(@line-height-computed);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment