aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorJulian Thilo <[email protected]>2013-11-18 14:02:17 -0800
committerJulian Thilo <[email protected]>2013-11-18 14:02:17 -0800
commit84a3aa3e0cdac2d4e3167bfde6459147d1bbca14 (patch)
treeed1568dbdd9c9ca8b03c9b81242c5df41eaa7aa8 /less
parent7c9b93254b87294a2b9303aac9fb0e86304baf68 (diff)
parent8aec527614608085d6cf92480abf843fbf720fdf (diff)
downloadbootstrap-84a3aa3e0cdac2d4e3167bfde6459147d1bbca14.tar.xz
bootstrap-84a3aa3e0cdac2d4e3167bfde6459147d1bbca14.zip
Merge pull request #11514 from twbs/navbar-text-float-breakpoint
Fix #11513: Don't always float navbar-text
Diffstat (limited to 'less')
-rw-r--r--less/navbar.less2
1 files changed, 1 insertions, 1 deletions
diff --git a/less/navbar.less b/less/navbar.less
index 987cde6b0..21cffc250 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -340,10 +340,10 @@
// Add a class to make any element properly align itself vertically within the navbars.
.navbar-text {
- float: left;
.navbar-vertical-align(@line-height-computed);
@media (min-width: @grid-float-breakpoint) {
+ float: left;
margin-left: @navbar-padding-horizontal;
margin-right: @navbar-padding-horizontal;
}