diff options
| author | Jacob Thornton <[email protected]> | 2012-01-07 10:56:28 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-07 10:56:28 -0800 |
| commit | 402c4800970e179b5c804b4964c51661ed02603c (patch) | |
| tree | a63e809cb182b47a521f7a1c68601b3051f1fa8b /examples | |
| parent | fbb42ccbbbfcab985a2c588532511f4af324ebc1 (diff) | |
| parent | b6d50c892d6ae8ed42ff0bfbba4252c7dc47417e (diff) | |
| download | bootstrap-402c4800970e179b5c804b4964c51661ed02603c.tar.xz bootstrap-402c4800970e179b5c804b4964c51661ed02603c.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/container-app.html | 2 | ||||
| -rw-r--r-- | examples/fluid-reverse.html | 24 | ||||
| -rw-r--r-- | examples/fluid.html | 54 | ||||
| -rw-r--r-- | examples/hero.html | 10 |
4 files changed, 47 insertions, 43 deletions
diff --git a/examples/container-app.html b/examples/container-app.html index 28807bb05..778bceacf 100644 --- a/examples/container-app.html +++ b/examples/container-app.html @@ -75,7 +75,7 @@ <body> - <div class="navbar"> + <div class="navbar navbar-fixed"> <div class="navbar-inner"> <div class="container"> <a class="brand" href="#">Project name</a> diff --git a/examples/fluid-reverse.html b/examples/fluid-reverse.html index a32291d46..61aa08de9 100644 --- a/examples/fluid-reverse.html +++ b/examples/fluid-reverse.html @@ -28,7 +28,7 @@ <body> - <div class="navbar"> + <div class="navbar navbar-fixed"> <div class="navbar-inner"> <div class="fluid-container"> <a class="brand" href="#">Project name</a> @@ -42,8 +42,8 @@ </div> </div> - <div class="fluid-container reverse"> - <div class="fluid-sidebar-right"> + <div class="fluid-container sidebar-right"> + <div class="fluid-sidebar"> <div class="well"> <h5>Sidebar</h5> <ul> @@ -78,17 +78,17 @@ <!-- Example row of columns --> <div class="row"> - <div class="span6"> + <div class="span4"> <h2>Heading</h2> - <p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p> + <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> - <div class="span5"> + <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> - <div class="span5"> + <div class="span4"> <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 »</a></p> @@ -99,23 +99,25 @@ <!-- Example row of columns --> <div class="row"> - <div class="span6"> + <div class="span4"> <h2>Heading</h2> - <p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p> + <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> - <div class="span5"> + <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> - <div class="span5"> + <div class="span4"> <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 »</a></p> </div> </div> + <hr> + <footer> <p>© Company 2011</p> </footer> diff --git a/examples/fluid.html b/examples/fluid.html index 3b8bb46a8..bba78a329 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -28,7 +28,7 @@ <body> - <div class="navbar"> + <div class="navbar navbar-fixed"> <div class="navbar-inner"> <div class="fluid-container"> <a class="brand" href="#">Project name</a> @@ -42,29 +42,29 @@ </div> </div> - <div class="fluid-container"> - <div class="fluid-sidebar-left"> - <div class="well"> - <h5>Sidebar</h5> - <ul> - <li><a href="#">Link</a></li> - <li><a href="#">Link</a></li> - <li><a href="#">Link</a></li> - <li><a href="#">Link</a></li> + <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>Sidebar</h5> - <ul> - <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> + <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>Sidebar</h5> - <ul> - <li><a href="#">Link</a></li> - <li><a href="#">Link</a></li> + <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> @@ -78,9 +78,9 @@ <!-- Example row of columns --> <div class="row"> - <div class="span6"> + <div class="span4"> <h2>Heading</h2> - <p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p> + <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> <div class="span5"> @@ -99,9 +99,9 @@ <!-- Example row of columns --> <div class="row"> - <div class="span6"> + <div class="span4"> <h2>Heading</h2> - <p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p> + <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> <div class="span5"> @@ -116,6 +116,8 @@ </div> </div> + <hr> + <footer> <p>© Company 2011</p> </footer> diff --git a/examples/hero.html b/examples/hero.html index d84eb8843..3a7a53983 100644 --- a/examples/hero.html +++ b/examples/hero.html @@ -28,7 +28,7 @@ <body> - <div class="navbar"> + <div class="navbar navbar-fixed"> <div class="navbar-inner"> <div class="container"> <a class="brand" href="#">Project name</a> @@ -52,17 +52,17 @@ <!-- Example row of columns --> <div class="row"> - <div class="span6"> + <div class="span4"> <h2>Heading</h2> - <p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p> + <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> - <div class="span5"> + <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> - <div class="span5"> + <div class="span4"> <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 »</a></p> |