diff options
| author | Mark Otto <[email protected]> | 2012-11-30 16:18:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-30 16:18:40 -0800 |
| commit | 0fabca01dbd02c480cfb431d5abb0d6cd327622e (patch) | |
| tree | 097d9d22c1dc04f62b552528e641e7eabdbaa692 /docs | |
| parent | adc2c779a06f1eea4fefddcf0d666a7131477d8c (diff) | |
| download | bootstrap-0fabca01dbd02c480cfb431d5abb0d6cd327622e.tar.xz bootstrap-0fabca01dbd02c480cfb431d5abb0d6cd327622e.zip | |
Remove more fluid grid stuff
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/examples/fluid.html | 154 | ||||
| -rw-r--r-- | docs/templates/pages/getting-started.mustache | 7 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 21 |
3 files changed, 1 insertions, 181 deletions
diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html deleted file mode 100644 index 517e209b7..000000000 --- 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 »</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 »</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 »</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 »</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 »</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 »</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 »</a></p> - </div><!--/span--> - </div><!--/row--> - </div><!--/span--> - </div><!--/row--> - - <hr> - - <footer> - <p>© 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 7632a94cb..00ac1df1c 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -185,13 +185,6 @@ <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=""> </a> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 127d09d25..d8c668d33 100644 --- 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"> @@ -178,25 +178,6 @@ </div> </body> </pre> - - <h2>{{_i}}Fluid layout{{/i}}</h2> - <p>{{_i}}Create a fluid, two-column page with <code><div class="container-fluid"></code>—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"> -<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> -</pre> </section> |