mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-11 08:04:59 +02:00
Code Issues Releases Wiki Activity

fixes #10495 by forcing .navbar-brand height to prevent it's inner content from increasing navbar height

Browse Source
This commit is contained in:
Alan Hamlett
2014-01-25 21:40:56 -08:00
parent 3157a37775
commit e38fd138ce
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dist/css/bootstrap.css vendored
View File

@@ -3739,16 +3739,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
padding: 15px 15px; padding: 15px 15px;
font-size: 18px; font-size: 18px;
line-height: 20px; line-height: 20px;
height: 20px;
} }
.navbar-brand:hover, .navbar-brand:hover,
.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 {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
less/navbar.less
View File

@@ -155,19 +155,13 @@
padding: @navbar-padding-vertical @navbar-padding-horizontal; padding: @navbar-padding-vertical @navbar-padding-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
line-height: @line-height-computed; line-height: @line-height-computed;
height: @line-height-computed;
&:hover, &:hover,
&:focus { &:focus {
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 & {