Remove more fluid grid stuff

author Mark Otto <otto@github.com>

Sat, 1 Dec 2012 00:18:40 +0000 (16:18 -0800)

committer Mark Otto <otto@github.com>

Sat, 1 Dec 2012 00:18:40 +0000 (16:18 -0800)
author Mark Otto <otto@github.com>
Sat, 1 Dec 2012 00:18:40 +0000 (16:18 -0800)
committer Mark Otto <otto@github.com>
Sat, 1 Dec 2012 00:18:40 +0000 (16:18 -0800)
diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html

deleted file mode 100644 (file)

index 517e209..0000000
--- a/docs/examples/fluid.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="../assets/css/bootstrap.css" rel="stylesheet">
-    <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
-      }
-      .sidebar-nav {
-        padding: 9px 0;
-      }
-    </style>
-    <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Fav and touch icons -->
-    <link rel="shortcut icon" href="../assets/ico/favicon.ico">
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
-  </head>
-
-  <body>
-
-    <div class="navbar navbar-inverse navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container-fluid">
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </a>
-          <a class="brand" href="#">Project name</a>
-          <div class="nav-collapse collapse">
-            <p class="navbar-text pull-right">
-              Logged in as <a href="#" class="navbar-link">Username</a>
-            </p>
-            <ul class="nav">
-              <li class="active"><a href="#">Home</a></li>
-              <li><a href="#about">About</a></li>
-              <li><a href="#contact">Contact</a></li>
-            </ul>
-          </div><!--/.nav-collapse -->
-        </div>
-      </div>
-    </div>
-
-    <div class="container-fluid">
-      <div class="row-fluid">
-        <div class="span3">
-          <div class="well sidebar-nav">
-            <ul class="nav nav-list">
-              <li class="nav-header">Sidebar</li>
-              <li class="active"><a href="#">Link</a></li>
-              <li><a href="#">Link</a></li>
-              <li><a href="#">Link</a></li>
-              <li><a href="#">Link</a></li>
-              <li class="nav-header">Sidebar</li>
-              <li><a href="#">Link</a></li>
-              <li><a href="#">Link</a></li>
-              <li><a href="#">Link</a></li>
-              <li><a href="#">Link</a></li>
-              <li><a href="#">Link</a></li>
-              <li><a href="#">Link</a></li>
-              <li class="nav-header">Sidebar</li>
-              <li><a href="#">Link</a></li>
-              <li><a href="#">Link</a></li>
-              <li><a href="#">Link</a></li>
-            </ul>
-          </div><!--/.well -->
-        </div><!--/span-->
-        <div class="span9">
-          <div class="hero-unit">
-            <h1>Hello, world!</h1>
-            <p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
-            <p><a class="btn btn-primary btn-large">Learn more &raquo;</a></p>
-          </div>
-          <div class="row-fluid">
-            <div class="span4">
-              <h2>Heading</h2>
-              <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-              <p><a class="btn" href="#">View details &raquo;</a></p>
-            </div><!--/span-->
-            <div class="span4">
-              <h2>Heading</h2>
-              <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-              <p><a class="btn" href="#">View details &raquo;</a></p>
-            </div><!--/span-->
-            <div class="span4">
-              <h2>Heading</h2>
-              <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-              <p><a class="btn" href="#">View details &raquo;</a></p>
-            </div><!--/span-->
-          </div><!--/row-->
-          <div class="row-fluid">
-            <div class="span4">
-              <h2>Heading</h2>
-              <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-              <p><a class="btn" href="#">View details &raquo;</a></p>
-            </div><!--/span-->
-            <div class="span4">
-              <h2>Heading</h2>
-              <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-              <p><a class="btn" href="#">View details &raquo;</a></p>
-            </div><!--/span-->
-            <div class="span4">
-              <h2>Heading</h2>
-              <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-              <p><a class="btn" href="#">View details &raquo;</a></p>
-            </div><!--/span-->
-          </div><!--/row-->
-        </div><!--/span-->
-      </div><!--/row-->
-
-      <hr>
-
-      <footer>
-        <p>&copy; Company 2012</p>
-      </footer>
-
-    </div><!--/.fluid-container-->
-
-    <!-- Le javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../assets/js/jquery.js"></script>
-    <script src="../assets/js/bootstrap-transition.js"></script>
-    <script src="../assets/js/bootstrap-alert.js"></script>
-    <script src="../assets/js/bootstrap-modal.js"></script>
-    <script src="../assets/js/bootstrap-dropdown.js"></script>
-    <script src="../assets/js/bootstrap-scrollspy.js"></script>
-    <script src="../assets/js/bootstrap-tab.js"></script>
-    <script src="../assets/js/bootstrap-tooltip.js"></script>
-    <script src="../assets/js/bootstrap-popover.js"></script>
-    <script src="../assets/js/bootstrap-button.js"></script>
-    <script src="../assets/js/bootstrap-collapse.js"></script>
-    <script src="../assets/js/bootstrap-carousel.js"></script>
-    <script src="../assets/js/bootstrap-typeahead.js"></script>
-
-  </body>
-</html>
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache

index 7632a94cb6d8f0f7e768f2f2ef0b4a8057f28f86..00ac1df1cfe38b5b2f737e8c36968004b7cbfc0f 100644 (file)
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -184,13 +184,6 @@
                <h4>{{_i}}Basic marketing site{{/i}}</h4>
                <p>{{_i}}Featuring a hero unit for a primary message and three supporting elements.{{/i}}</p>
              </div>
-            <div class="span4">
-              <a class="thumbnail" href="examples/fluid.html">
-                <img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
-              </a>
-              <h4>{{_i}}Fluid layout{{/i}}</h4>
-              <p>{{_i}}Uses our new responsive, fluid grid system to create a seamless liquid layout.{{/i}}</p>
-            </div>
              <div class="span4">
                <a class="thumbnail" href="examples/marketing-narrow.html">
                  <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt="">
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache

index 127d09d25887718473b801563c1be28ff519c417..d8c668d335e6f4e78c9d700048ddac08f0b4e66e 100644 (file)
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -159,7 +159,7 @@
  
  
  
-        <!-- Layouts (Default and fluid)
+        <!-- Layouts
          ================================================== -->
          <section id="layouts">
            <div class="page-header">
@@ -177,25 +177,6 @@
      ...
    &lt;/div&gt;
  &lt;/body&gt;
-</pre>
-
-          <h2>{{_i}}Fluid layout{{/i}}</h2>
-          <p>{{_i}}Create a fluid, two-column page with <code>&lt;div class="container-fluid"&gt;</code>&mdash;great for applications and docs.{{/i}}</p>
-          <div class="mini-layout fluid">
-            <div class="mini-layout-sidebar"></div>
-            <div class="mini-layout-body"></div>
-          </div>
-<pre class="prettyprint linenums">
-&lt;div class="container-fluid"&gt;
-  &lt;div class="row"&gt;
-    &lt;div class="span2"&gt;
-      &lt;!--{{_i}}Sidebar content{{/i}}--&gt;
-    &lt;/div&gt;
-    &lt;div class="span10"&gt;
-      &lt;!--{{_i}}Body content{{/i}}--&gt;
-    &lt;/div&gt;
-  &lt;/div&gt;
-&lt;/div&gt;
  </pre>
          </section>
  
diff --git a/less/grid.less b/less/grid.less

index b401d4b6dd09352d7397dba00b618531192d3a2a..15017b7cb560b29a1f691df37e91cb76cc11a0d9 100644 (file)
--- a/less/grid.less
+++ b/less/grid.less
@@ -5,6 +5,7 @@
  
  // Set the container width, and override it for fixed navbars in media queries
  .container {
+  .container-fixed();
    max-width: 940px;
  }
  
diff --git a/less/layouts.less b/less/layouts.less

deleted file mode 100644 (file)

index 7a65d65..0000000
--- a/less/layouts.less
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Layouts
-// --------------------------------------------------
-
-
-// Container (centered, fixed-width layouts)
-.container {
-  .container-fixed();
-}
-
-// Fluid layouts (left aligned, with sidebar, min- & max-width content)
-.container-fluid {
-  padding-right: @grid-gutter-width;
-  padding-left: @grid-gutter-width;
-  .clearfix();
-}
-\ No newline at end of file
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less

index 1d88ddf949c2b14fa35a76f057b18276e1627e1b..0a2ff6ef927967863f936ff01665a03c7358667c 100644 (file)
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -17,10 +17,6 @@
      margin-left: -20px;
      margin-right: -20px;
    }
-  // Remove padding on container given explicit padding set on body
-  .container-fluid {
-    padding: 0;
-  }
  
    // TYPOGRAPHY
    // ----------
diff --git a/less/tables.less b/less/tables.less

index 30ef9c9bb4f0961e8f6de22b0bdc53825d3b7949..eaa494e5b1c9967a7ab3b31c5e1bdbc8e4b45f33 100644 (file)
--- a/less/tables.less
+++ b/less/tables.less
@@ -169,9 +169,7 @@ table {
  
  // Reset default grid behavior
  table td[class*="span"],
-table th[class*="span"],
-.row-fluid table td[class*="span"],
-.row-fluid table th[class*="span"] {
+table th[class*="span"] {
    display: table-cell;
    float: none; // undo default grid column styles
    margin-left: 0; // undo default grid column styles
diff --git a/less/tests/forms-responsive.html b/less/tests/forms-responsive.html

index 846d5b43d5a5c8968985b7f1313553bfb38aa478..7a8f8925f068f1517b5bebc574265b4472425eb7 100644 (file)
--- a/less/tests/forms-responsive.html
+++ b/less/tests/forms-responsive.html
@@ -54,17 +54,6 @@
          <span class="uneditable-input span2">span2</span>
        </div>
  
-
-      <div class="page-header">
-        <h1>Fluid grid</h1>
-      </div>
-
-      <div class="row-fluid">
-        <input type="text" class="span2" placeholder="span2">
-        <select class="span2"><option>span2</option></select>
-        <span class="uneditable-input span2">span1</span>
-      </div>
-
      </form> <!-- /container -->
  
    </body>
author	Mark Otto <otto@github.com>
	Sat, 1 Dec 2012 00:18:40 +0000 (16:18 -0800)
committer	Mark Otto <otto@github.com>
	Sat, 1 Dec 2012 00:18:40 +0000 (16:18 -0800)
docs/examples/fluid.html	[deleted file]	patch \| blob \| blame \| history
docs/templates/pages/getting-started.mustache		patch \| blob \| blame \| history
docs/templates/pages/scaffolding.mustache		patch \| blob \| blame \| history
less/grid.less		patch \| blob \| blame \| history
less/layouts.less	[deleted file]	patch \| blob \| blame \| history
less/responsive-767px-max.less		patch \| blob \| blame \| history
less/tables.less		patch \| blob \| blame \| history
less/tests/forms-responsive.html		patch \| blob \| blame \| history