Refine containers and navbars

* Don't reset width on .container, .navbar-* .container, etc
* Instead, use max-width to ensure proper styling for all navbars

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 30512c734859e6e805be27eca1c9b40f4caff501..a227de6822412e9c83d989a80ea4f21ea1a48689 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -223,10 +223,8 @@ a:hover {
   border-radius: 500px;
 }
 
-.container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
+.container {
+  max-width: 940px;
 }
 
 .row {
@@ -5458,10 +5456,8 @@ a.badge:hover {
 }
 
 @media (min-width: 1200px) {
-  .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 1170px;
+  .container {
+    max-width: 1170px;
   }
   .row {
     margin-right: -15px;

diff --git a/less/grid.less b/less/grid.less
index 836e29a95ba239a91b27763f935dac2244e6e0bb..817ead2ee8e802bc1b0bc6128f84547321bb2b7f 100644 (file)
--- a/less/grid.less
+++ b/less/grid.less
@@ -4,9 +4,9 @@
 
 
 // Set the container width, and override it for fixed navbars in media queries
-.container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container { width: 940px; }
+.container {
+  max-width: 940px;
+}
 
 // Fixed (940px)
 #grid > .core(@gridColumnWidth, @gridGutterWidth, @gridRowWidth);

diff --git a/less/responsive-1200px-min.less b/less/responsive-1200px-min.less
index aa7d9b9d7859472057091adf5a818216d2592da0..130c65d0d266d8579c315cf9c4f3b9a3f41617fd 100644 (file)
--- a/less/responsive-1200px-min.less
+++ b/less/responsive-1200px-min.less
@@ -6,10 +6,8 @@
 @media (min-width: 1200px) {
 
   // Set the container width, and override it for fixed navbars in media queries
-  .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 1170px;
+  .container {
+    max-width: 1170px;
   }
 
   // Fixed grid

diff --git a/less/tests/navbar-fixed-top.html b/less/tests/navbar-fixed-top.html
index 46a59ec698cfb9f981d641e9655fabc6b2ad96f5..9acf367e1317f0c3c085a1a76a5aa58e4e46872b 100644 (file)
--- a/less/tests/navbar-fixed-top.html
+++ b/less/tests/navbar-fixed-top.html
@@ -75,7 +75,7 @@
         <h1>Navbar example</h1>
         <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
         <p>
-          <a class="btn btn-large btn-primary" href="../components.html#navbar">View navbar docs &raquo;</a>
+          <a class="btn btn-large btn-primary" href="../../docs/components.html#navbar">View navbar docs &raquo;</a>
         </p>
       </div>
 

diff --git a/less/tests/navbar-static-top.html b/less/tests/navbar-static-top.html
index 037f4e8214f2ba5d677c2b12bb410b1622c42a8f..52928e4649670138b9ac58b928b56a3372e99301 100644 (file)
--- a/less/tests/navbar-static-top.html
+++ b/less/tests/navbar-static-top.html
@@ -78,7 +78,7 @@
         <h1>Navbar example</h1>
         <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
         <p>
-          <a class="btn btn-large btn-primary" href="../components.html#navbar">View navbar docs &raquo;</a>
+          <a class="btn btn-large btn-primary" href="../../docs/components.html#navbar">View navbar docs &raquo;</a>
         </p>
       </div>
 

diff --git a/less/tests/navbar.html b/less/tests/navbar.html
index 5129a84f84240550666be0edca2fa5e434eecfdd..3240aff8fcf52d4c96d7ab6375d5354b905ae4a7 100644 (file)
--- a/less/tests/navbar.html
+++ b/less/tests/navbar.html
@@ -78,7 +78,7 @@
         <h1>Navbar example</h1>
         <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
         <p>
-          <a class="btn btn-large btn-primary" href="../components.html#navbar">View navbar docs &raquo;</a>
+          <a class="btn btn-large btn-primary" href="../../docs/components.html#navbar">View navbar docs &raquo;</a>
         </p>
       </div>