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

Merge pull request #7713 from burnsra/3.0.0-wip-navs-overhaul

Browse Source 
Fix navbar on phone/tablet devices after navbar overhaul
This commit is contained in:
Mark Otto
2013-04-28 14:26:10 -07:00
parent 1a28d50b33 3326e1b21e
commit 227c4639e4
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/assets/css/bootstrap.css vendored
View File

@@ -3490,7 +3490,7 @@ button.close {
.navbar { .navbar {
position: relative; position: relative;
padding: 10px 15px; padding: 0 15px;
background-color: #eeeeee; background-color: #eeeeee;
border-radius: 4px; border-radius: 4px;
} }
@@ -3741,10 +3741,6 @@ button.close {
} }
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
.navbar {
padding-top: 0;
padding-bottom: 0;
}
.navbar-brand { .navbar-brand {
float: left; float: left;
margin-right: 5px; margin-right: 5px;

6
less/navbar.less
View File

@@ -5,7 +5,7 @@
// Wrapper and base class // Wrapper and base class
.navbar { .navbar {
position: relative; position: relative;
padding: 10px 15px; padding: 0px 15px;
background-color: @navbar-bg; background-color: @navbar-bg;
border-radius: @border-radius-base; border-radius: @border-radius-base;
// Prevent floats from breaking the navbar // Prevent floats from breaking the navbar
@@ -264,10 +264,6 @@
@media screen and (min-width: @screen-tablet) { @media screen and (min-width: @screen-tablet) {
.navbar {
padding-top: 0;
padding-bottom: 0;
}
.navbar-brand { .navbar-brand {
float: left; float: left;
margin-left: -5px; margin-left: -5px;