rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

Follow up commit: fix collapse clearing and navbar brand/nav spacing

Browse Source
This commit is contained in:
Mark Otto 2013-08-11 19:19:44 -07:00
parent ba8026e00f
commit 85ec6e741d
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/css/bootstrap.css vendored
View File

@ -2926,6 +2926,7 @@ button.close {
float: left; float: left;
padding-top: 15px; padding-top: 15px;
padding-bottom: 15px; padding-bottom: 15px;
margin-right: 15px;
font-size: 18px; font-size: 18px;
line-height: 20px; line-height: 20px;
color: #777777; color: #777777;
@ -3113,6 +3114,9 @@ button.close {
} }
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
.nav-collapse {
clear: none;
}
.navbar-nav { .navbar-nav {
float: left; float: left;
margin-top: 0; margin-top: 0;

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

File diff suppressed because one or more lines are too long

6
less/navbar.less
View File

@ -128,6 +128,7 @@
// Brand/project name // Brand/project name
.navbar-brand { .navbar-brand {
float: left; float: left;
margin-right: 15px;
padding-top: @navbar-padding-vertical; padding-top: @navbar-padding-vertical;
padding-bottom: @navbar-padding-vertical; padding-bottom: @navbar-padding-vertical;
font-size: @font-size-large; font-size: @font-size-large;
@ -322,6 +323,11 @@
@media screen and (min-width: @grid-float-breakpoint) { @media screen and (min-width: @grid-float-breakpoint) {
// Undo clearing to keep nav and brand horizontal
.nav-collapse {
clear: none;
}
.navbar-nav { .navbar-nav {
float: left; float: left;
// undo margin to make nav extend full height of navbar // undo margin to make nav extend full height of navbar