Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext
Conflicts: dist/css/bootstrap.min.css
This commit is contained in:
commit
a3be713f8f
|
@ -3083,6 +3083,8 @@ button.close {
|
|||
}
|
||||
|
||||
.navbar-text {
|
||||
float: left;
|
||||
padding: 0 15px;
|
||||
margin-top: 15px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue