mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-14 17:44:15 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-02 19:30:03 -07:00
parent e8145ac939 7cfcfdfe64
commit a3be713f8f
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/css/bootstrap.css vendored
View File

@@ -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;
} }

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
less/navbar.less
View File

@@ -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);
} }