mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

Fixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS

Browse Source
This commit is contained in:
Mark Otto
2013-12-13 23:06:04 -08:00
parent ce07ff84cd
commit 22820d7151
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+5
View File
@@ -3618,6 +3618,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-brand:focus { .navbar-brand:focus {
text-decoration: none; text-decoration: none;
} }
.navbar-brand > .glyphicon {
float: left;
margin-top: -2px;
margin-right: 5px;
}
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar > .container .navbar-brand, .navbar > .container .navbar-brand,
.navbar > .container-fluid .navbar-brand { .navbar > .container-fluid .navbar-brand {
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
less/navbar.less
+7
View File
@@ -161,6 +161,13 @@
text-decoration: none; text-decoration: none;
} }
// Prevent Glyphicons from increasing height of navbar
> .glyphicon {
float: left;
margin-top: -2px;
margin-right: 5px;
}
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
.navbar > .container &, .navbar > .container &,
.navbar > .container-fluid & { .navbar > .container-fluid & {