Skip to content

B
bootstrap
Commit 84a3aa3e authored by Julian Thilo's avatar Julian Thilo
Browse files
Options

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

Fix #11513: Don't always float navbar-text
parents 7c9b9325 8aec5276
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dist/css/bootstrap.css
View file @ 84a3aa3e
...@@ -4665,13 +4665,13 @@ textarea.input-group-sm > .input-group-btn > .btn { ...@@ -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;
} }
......
dist/css/bootstrap.min.css
View file @ 84a3aa3e
This source diff could not be displayed because it is too large. You can view the blob instead.
less/navbar.less
View file @ 84a3aa3e
...@@ -340,10 +340,10 @@ ...@@ -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;
} }
......
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