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

Fix navbar on phone/tablet devices after navbar overhaul

Merge pull request #7713 from burnsra/3.0.0-wip-navs-overhaul
Fix navbar on phone/tablet devices after navbar overhaul
227c4639 · Mark Otto · 1a28d50b · 3326e1b2 · 227c4639 · 227c4639
Commit 227c4639 authored 11 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 10 deletions
+2 -10
--- 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;

--- 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;