aboutsummaryrefslogtreecommitdiff
path: root/examples/fluid.html
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-29 13:16:02 -0800
committerJacob Thornton <[email protected]>2012-01-29 13:16:02 -0800
commit910e78d26ad476d11331e8bb9b0233e0b2ba21e3 (patch)
tree89c22731c23c1808bf92db1ceb670ca2cd3c7677 /examples/fluid.html
parent49d565a6da38359a776f83f31a1f1ccd658c88a7 (diff)
parent9fa8bde44d9bb6f26b16c7633a01bbe5ce7b20a4 (diff)
downloadbootstrap-910e78d26ad476d11331e8bb9b0233e0b2ba21e3.tar.xz
bootstrap-910e78d26ad476d11331e8bb9b0233e0b2ba21e3.zip
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Diffstat (limited to 'examples/fluid.html')
-rw-r--r--examples/fluid.html185
1 files changed, 99 insertions, 86 deletions
diff --git a/examples/fluid.html b/examples/fluid.html
index 1f7551562..1cdfd6568 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -16,8 +16,13 @@
<style type="text/css">
body {
padding-top: 60px;
+ padding-bottom: 40px;
+ }
+ .sidebar-nav {
+ padding: 9px 0;
}
</style>
+ <link href="../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico">
@@ -28,101 +33,109 @@
<body>
- <div class="navbar navbar-fixed">
+ <div class="navbar navbar-fixed-top">
<div class="navbar-inner">
- <div class="fluid-container">
+ <div class="container-fluid">
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <span class="i-bar"></span>
+ <span class="i-bar"></span>
+ <span class="i-bar"></span>
+ </a>
<a class="brand" href="#">Project name</a>
- <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>
- <p class="pull-right">Logged in as <a href="#">username</a></p>
+ <div class="nav-collapse">
+ <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>
+ <p class="navbar-text pull-right">Logged in as <a href="#">username</a></p>
+ </div><!--/.nav-collapse -->
</div>
</div>
</div>
- <div class="fluid-container sidebar-left">
- <div class="fluid-sidebar">
- <div class="well side-nav">
- <h5 class="nav-label">Sidebar</h5>
- <ul class="nav-group">
- <li class="active"><a class="nav-item" href="#">Link</a></li>
- <li><a class="nav-item" href="#">Link</a></li>
- <li><a class="nav-item" href="#">Link</a></li>
- <li><a class="nav-item" href="#">Link</a></li>
- </ul>
- <h5 class="nav-label">Sidebar</h5>
- <ul class="nav-group">
- <li><a class="nav-item" href="#">Link</a></li>
- <li><a class="nav-item" href="#">Link</a></li>
- <li><a class="nav-item" href="#">Link</a></li>
- <li><a class="nav-item" href="#">Link</a></li>
- <li><a class="nav-item" href="#">Link</a></li>
- <li><a class="nav-item" href="#">Link</a></li>
- </ul>
- <h5 class="nav-label">Sidebar</h5>
- <ul class="nav-group">
- <li><a class="nav-item" href="#">Link</a></li>
- <li><a class="nav-item" href="#">Link</a></li>
- </ul>
- </div>
- </div>
- <div class="fluid-content">
- <!-- Main hero unit for a primary marketing message or call to action -->
- <div class="hero-unit">
- <h1>Hello, world!</h1>
- <p>Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
- <p><a class="btn primary large">Learn more &raquo;</a></p>
- </div>
-
- <!-- Example row of columns -->
- <div class="row">
- <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>
- <div class="span5">
- <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>
- <div class="span5">
- <h2>Heading</h2>
- <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
- <p><a class="btn" href="#">View details &raquo;</a></p>
+ <div class="container-fluid">
+ <div class="row row-fluid">
+ <div class="span3">
+ <div class="well sidebar-nav">
+ <ul class="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 primary large">Learn more &raquo;</a></p>
</div>
- </div>
+ <div class="row 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 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>
+ <hr>
- <!-- Example row of columns -->
- <div class="row">
- <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>
- <div class="span5">
- <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>
- <div class="span5">
- <h2>Heading</h2>
- <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
- <p><a class="btn" href="#">View details &raquo;</a></p>
- </div>
- </div>
+ <footer>
+ <p>&copy; Company 2012</p>
+ </footer>
- <hr>
-
- <footer>
- <p>&copy; Company 2012</p>
- </footer>
- </div>
- </div>
+ </div><!--/.fluid-container-->
+
+
+ <!-- Le javascript
+ ================================================== -->
+ <!-- Placed at the end of the document so the pages load faster -->
+ <script src="../js/tests/vendor/jquery.js"></script>
+ <script src="../js/bootstrap-transition.js"></script>
+ <script src="../js/bootstrap-collapse.js"></script>
</body>
-</html> \ No newline at end of file
+</html>