diff options
| author | Mark Otto <[email protected]> | 2013-04-28 14:26:10 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-04-28 14:26:10 -0700 |
| commit | 227c4639e4baef95c75ff82e849c5a3621980afa (patch) | |
| tree | 29e312c8b0a54ccdf20492e3233c84d2d3ab14bf | |
| parent | 1a28d50b33c8d24e25cc75887d5824de7e2d0efa (diff) | |
| parent | 3326e1b21e2368878a1c7f7bbd8d31d58fff5276 (diff) | |
| download | bootstrap-227c4639e4baef95c75ff82e849c5a3621980afa.tar.xz bootstrap-227c4639e4baef95c75ff82e849c5a3621980afa.zip | |
Merge pull request #7713 from burnsra/3.0.0-wip-navs-overhaul
Fix navbar on phone/tablet devices after navbar overhaul
| -rw-r--r-- | docs/assets/css/bootstrap.css | 6 | ||||
| -rw-r--r-- | less/navbar.less | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b4a3b5854..888730f7a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3490,7 +3490,7 @@ button.close { .navbar { position: relative; - padding: 10px 15px; + padding: 0 15px; background-color: #eeeeee; border-radius: 4px; } @@ -3741,10 +3741,6 @@ button.close { } @media screen and (min-width: 768px) { - .navbar { - padding-top: 0; - padding-bottom: 0; - } .navbar-brand { float: left; margin-right: 5px; diff --git a/less/navbar.less b/less/navbar.less index 587b69ca4..abbc6bb8c 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -5,7 +5,7 @@ // Wrapper and base class .navbar { position: relative; - padding: 10px 15px; + padding: 0px 15px; background-color: @navbar-bg; border-radius: @border-radius-base; // Prevent floats from breaking the navbar @@ -264,10 +264,6 @@ @media screen and (min-width: @screen-tablet) { - .navbar { - padding-top: 0; - padding-bottom: 0; - } .navbar-brand { float: left; margin-left: -5px; |