tweak navbar styles for static version to not cause problems on responsive layouts

3a476063 · Mark Otto · be926a04 · 3a476063 · 3a476063 · 3a476063
Commit 3a476063 authored 13 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 70 additions and 74 deletions
+70 -74
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sun Oct 16 03:07:49 PDT 2011
+ * Date: Sun Oct 16 03:14:23 PDT 2011
 */
 /* Reset.less
 * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -1165,8 +1165,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
  margin-bottom: 18px;
 }
 .navbar-static .navbar-inner {
-  margin-left: -20px;
-  margin-right: -20px;
  padding-left: 20px;
  padding-right: 20px;
  -webkit-border-radius: 4px;

--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -194,7 +194,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0
 .navbar-search .search-query:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);}
 .navbar-static{margin-bottom:18px;}
-.navbar-static .navbar-inner{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.navbar-static .navbar-inner{padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .navbar-fixed{position:fixed;top:0;left:0;right:0;z-index:10000;}
 .nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.nav>li{display:block;float:left;}
 .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#ffffff;text-decoration:none;}

--- a/docs/index.html
+++ b/docs/index.html
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -111,8 +111,6 @@
  margin-bottom: @baseLineHeight;
 }
 .navbar-static .navbar-inner {
-  margin-left:  -20px;
-  margin-right: -20px;
  padding-left:  20px;
  padding-right: 20px;
  .border-radius(4px);