diff options
| author | Jacob Thornton <[email protected]> | 2011-12-22 19:15:09 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-12-22 19:15:09 -0800 |
| commit | 35fdbad24b908714ff1a1221945598527a641863 (patch) | |
| tree | 0a054ac3f3b913fb16f71731b4b04472311afc4a /docs/components.html | |
| parent | 87ac818253a26bcf09fa55f78ae3f55759c54e64 (diff) | |
| parent | 9fb380151d477f1741b7609ade7a9e7fd5450b2c (diff) | |
| download | bootstrap-35fdbad24b908714ff1a1221945598527a641863.tar.xz bootstrap-35fdbad24b908714ff1a1221945598527a641863.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
docs/assets/js/application.js
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
docs/upgrading.html
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 133 |
1 files changed, 106 insertions, 27 deletions
diff --git a/docs/components.html b/docs/components.html index 4d2c60823..26a657cb5 100644 --- a/docs/components.html +++ b/docs/components.html @@ -22,6 +22,18 @@ <link rel="apple-touch-icon" href="assets/ico/bootstrap-apple-57x57.png"> <link rel="apple-touch-icon" sizes="72x72" href="assets/ico/bootstrap-apple-72x72.png"> <link rel="apple-touch-icon" sizes="114x114" href="assets/ico/bootstrap-apple-114x114.png"> + + <!-- Le javascript --> + <!-- Placed at the end of the document so the pages load faster --> + <script src="http://code.jquery.com/jquery-1.7.min.js"></script> + <script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script> + <script src="assets/js/google-code-prettify/prettify.js"></script> + <script>$(function () { prettyPrint() })</script> + <script src="../js/bootstrap-transitions.js"></script> + <script src="../js/bootstrap-dropdown.js"></script> + <script src="../js/bootstrap-twipsy.js"></script> + <script src="../js/bootstrap-scrollspy.js"></script> + <script src="assets/js/application.js"></script> </head> <body> @@ -201,11 +213,33 @@ -<!-- Navigation +<!-- Autocomplete +================================================== --> +<section id="autocomplete"> + <div class="page-header"> + <h1>Autocomplete <small></small></h1> + </div> + +</section> + + + +<!-- Carousel ================================================== --> -<section id="navigation"> +<section id="carousel"> <div class="page-header"> - <h1>Navigation</h1> + <h1>Carousel <small></small></h1> + </div> + +</section> + + + +<!-- Navbar +================================================== --> +<section id="navbar"> + <div class="page-header"> + <h1>Navbar</h1> </div> <h2>Fixed navbar</h2> <div class="navbar navbar-static" > @@ -262,11 +296,19 @@ </div> <p><strong>Note:</strong> When using the navbar on any page, be sure to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code><body></code>.</p> - <br> +</section> + + + +<!-- Tabs & Pills +================================================== --> +<section id="tabsAndPills"> + <div class="page-header"> + <h1>Tabs and pills <small></small></h1> + </div> <div class="row"> <div class="span3"> - <h2>Tabs and pills</h2> <p>Create simple secondary navigation with a <code><ul></code>. Swap between tabs or pills by adding the appropriate class.</p> <p>Great for sub-sections of content like our account settings pages and user timelines for toggling between pages of like content. Available in tabbed or pill styles.</p> </div> @@ -428,10 +470,19 @@ </div> </div><!-- /row --> - <!-- Breadcrumbs --> +</section> + + + +<!-- Breadcrumbs +================================================== --> +<section id="breadcrumbs"> + <div class="page-header"> + <h1>Breadcrumbs <small></small></h1> + </div> + <div class="row"> <div class="span3"> - <h2>Breadcrumbs</h2> <p>Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation.</p> </div> <div class="span9"> @@ -464,10 +515,20 @@ </div> </div> +</section> + + + +<!-- Step nav +================================================== --> +<section id="stepNav"> + <div class="page-header"> + <h1>Step nav <small></small></h1> + </div> + <!-- Step nav --> <div class="row"> <div class="span3"> - <h2>Step nav</h2> <p>Placeholder for now!</p> </div> <div class="span9"> @@ -486,7 +547,17 @@ </div> </div> - <!-- Pagination --> +</section> + + + +<!-- Pagination +================================================== --> +<section id="carousel"> + <div class="page-header"> + <h1>Pagination <small></small></h1> + </div> + <div class="row"> <div class="span3"> <h2>Pagination</h2> @@ -644,11 +715,11 @@ </section> -<!-- Popovers +<!-- Modals ================================================== --> <section id="popovers"> <div class="page-header"> - <h1>Popovers <small>Components for displaying content in modals, tooltips, and popovers</small></h1> + <h1>Modals <small></small></h1> </div> <div class="row"> <div class="span3"> @@ -676,7 +747,17 @@ </div> </div><!-- /row --> - <!-- Tooltips --> +</section> + + + +<!-- Twipsies +================================================== --> +<section id="carousel"> + <div class="page-header"> + <h1>Twipsy tooltips <small></small></h1> + </div> + <div class="row"> <div class="span3"> <h2>Tooltips</h2> @@ -694,7 +775,17 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita </div> </div><!-- /row --> - <!-- Popovers --> +</section> + + + +<!-- Popovers +================================================== --> +<section id="popovers"> + <div class="page-header"> + <h1>Popovers <small></small></h1> + </div> + <div class="row"> <div class="span3"> <h2>Popovers</h2> @@ -721,6 +812,8 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita </section> + + <!-- Footer ================================================== --> <footer class="footer"> @@ -730,19 +823,5 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> </footer> </div><!-- /container --> - - <!-- Le javascript --> - <!-- Placed at the end of the document so the pages load faster --> - <!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> --> - <script src="../js/tests/vendor/jquery.js"></script> - - <script src="assets/js/google-code-prettify/prettify.js"></script> - - <script src="../js/bootstrap-transition.js"></script> - <script src="../js/bootstrap-twipsy.js"></script> - <script src="../js/bootstrap-dropdown.js"></script> - <script src="../js/bootstrap-tab.js"></script> - - <script src="assets/js/application.js"></script> </body> </html> |