From: Mark Otto Date: Sat, 1 Dec 2012 00:18:40 +0000 (-0800) Subject: Remove more fluid grid stuff X-Git-Tag: v3.0.0-rc1~861 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0fabca01dbd02c480cfb431d5abb0d6cd327622e;p=thirdparty%2Fbootstrap.git Remove more fluid grid stuff * No more fluid layout * No fluid grid overrides for tables.less * No more fluid example page --- diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html deleted file mode 100644 index 517e209b71..0000000000 --- a/docs/examples/fluid.html +++ /dev/null @@ -1,154 +0,0 @@ - - - - - Bootstrap, from Twitter - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - - - - - Project name -
-

- Logged in as Username -

- -
-
-
-
- -
-
-
-
- -
-
-
-
-

Hello, world!

-

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.

-

Learn more »

-
-
-
-

Heading

-

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.

-

View details »

-
-
-

Heading

-

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.

-

View details »

-
-
-

Heading

-

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.

-

View details »

-
-
-
-
-

Heading

-

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.

-

View details »

-
-
-

Heading

-

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.

-

View details »

-
-
-

Heading

-

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.

-

View details »

-
-
-
-
- -
- -
-

© Company 2012

-
- -
- - - - - - - - - - - - - - - - - - - diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index 7632a94cb6..00ac1df1cf 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -184,13 +184,6 @@

{{_i}}Basic marketing site{{/i}}

{{_i}}Featuring a hero unit for a primary message and three supporting elements.{{/i}}

-
- - - -

{{_i}}Fluid layout{{/i}}

-

{{_i}}Uses our new responsive, fluid grid system to create a seamless liquid layout.{{/i}}

-
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 127d09d258..d8c668d335 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -159,7 +159,7 @@ -
@@ -177,25 +177,6 @@ ... </div> </body> - - -

{{_i}}Fluid layout{{/i}}

-

{{_i}}Create a fluid, two-column page with <div class="container-fluid">—great for applications and docs.{{/i}}

-
-
-
-
-
-<div class="container-fluid">
-  <div class="row">
-    <div class="span2">
-      <!--{{_i}}Sidebar content{{/i}}-->
-    </div>
-    <div class="span10">
-      <!--{{_i}}Body content{{/i}}-->
-    </div>
-  </div>
-</div>
diff --git a/less/grid.less b/less/grid.less index b401d4b6dd..15017b7cb5 100644 --- 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 index 7a65d65d6b..0000000000 --- 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 1d88ddf949..0a2ff6ef92 100644 --- 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 30ef9c9bb4..eaa494e5b1 100644 --- 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 846d5b43d5..7a8f8925f0 100644 --- a/less/tests/forms-responsive.html +++ b/less/tests/forms-responsive.html @@ -54,17 +54,6 @@ span2
- -
-

Fluid grid

-
- -
- - - span1 -
-