Hopiu/bootstrap
1
0
Fork 0
mirror of https://github.com/Hopiu/bootstrap.git synced 2026-05-09 21:04:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11514 from twbs/navbar-text-float-breakpoint

Browse source 
Fix #11513: Don't always float navbar-text
This commit is contained in:
Julian Thilo 2013-11-18 14:02:17 -08:00
commit 84a3aa3e0c
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/css/bootstrap.css vendored
View file

@ -4665,13 +4665,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
} }
.navbar-text { .navbar-text {
float: left;
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-text { .navbar-text {
float: left;
margin-right: 15px; margin-right: 15px;
margin-left: 15px; margin-left: 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

@ -340,10 +340,10 @@
// 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;
.navbar-vertical-align(@line-height-computed); .navbar-vertical-align(@line-height-computed);
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
float: left;
margin-left: @navbar-padding-horizontal; margin-left: @navbar-padding-horizontal;
margin-right: @navbar-padding-horizontal; margin-right: @navbar-padding-horizontal;
} }