diff options
| author | Mark Otto <[email protected]> | 2013-12-18 13:40:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 13:40:29 -0800 |
| commit | 1d0aa6e45c5ee09ee72f54f2bbdaa2f186bb9ea2 (patch) | |
| tree | a391f789f84d3e4fe2941f2fdc69e2c5fd5f0a4c | |
| parent | d87e70fd49761daee24e894cf299c40af1eb80d5 (diff) | |
| download | bootstrap-1d0aa6e45c5ee09ee72f54f2bbdaa2f186bb9ea2.tar.xz bootstrap-1d0aa6e45c5ee09ee72f54f2bbdaa2f186bb9ea2.zip | |
more docs
| -rw-r--r-- | _includes/nav-css.html | 1 | ||||
| -rw-r--r-- | _includes/nav-getting-started.html | 6 | ||||
| -rw-r--r-- | css.html | 4 | ||||
| -rw-r--r-- | docs-assets/css/docs.css | 3 | ||||
| -rw-r--r-- | getting-started.html | 105 |
5 files changed, 71 insertions, 48 deletions
diff --git a/_includes/nav-css.html b/_includes/nav-css.html index f0279c61b..02ac821bd 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -112,6 +112,7 @@ <li> <a href="#less">Using LESS</a> <ul class="nav"> + <li><a href="#less-bootstrap">Compiling Bootstrap</a></li> <li><a href="#less-variables">Variables</a></li> <li><a href="#less-mixins-vendor">Vendor mixins</a></li> <li><a href="#less-mixins-utility">Utility mixins</a></li> diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html index 96e175dd2..4a8a2f836 100644 --- a/_includes/nav-getting-started.html +++ b/_includes/nav-getting-started.html @@ -18,6 +18,12 @@ </li> <li> <a href="#examples">Examples</a> + <ul class="nav"> + <li><a href="#examples-framework">Using the framework</a></li> + <li><a href="#examples-navbars">Navbars in action</a></li> + <li><a href="#examples-custom">Custom components</a></li> + <li><a href="#examples-experiments">Experiments</a></li> + </ul> </li> <li> <a href="#disable-responsive">Disabling responsiveness</a> @@ -2824,6 +2824,10 @@ For example, <code><section></code> should be wrapped as inline. <p>Grid variables and mixins are covered <a href="{{ page.base_url }}css/#grid-less">within the Grid system section</a>.</p> + <h2 id="less-bootstrap">Compiling Bootstrap</h2> + <p>Bootstrap can be used in at least two ways: with the compiled CSS or with the source LESS files. To compile the LESS files, <a href="https://github.com/twbs/bootstrap#compiling-css-and-javascript">visit the README</a> for how to setup your development environment to run the necessary commands.</p> + <p>Third party compilation tools may work with Bootstrap, but they are not supported by our core team.</p> + <h2 id="less-variables">Variables</h2> <p>Variables are used throughout the entire project as a way to centralize and share commonly used values like colors, spacing, or font stacks. For a complete breakdown, please see <a href="{{ page.base_url }}customize/#less-variables-section">the Customizer</a>.</p> diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index 952271ad9..6a2332616 100644 --- a/docs-assets/css/docs.css +++ b/docs-assets/css/docs.css @@ -1289,6 +1289,9 @@ h1[id] { } /* Examples gallery: space out content better */ +.bs-examples .thumbnail { + margin-bottom: 10px; +} .bs-examples h4 { margin-bottom: 5px; } diff --git a/getting-started.html b/getting-started.html index 286058ba4..1dc60d424 100644 --- a/getting-started.html +++ b/getting-started.html @@ -157,6 +157,7 @@ bootstrap/ </div> <p class="lead">Build on the basic template above with Bootstrap's many components. See also <a href="#customizing">Customizing Bootstrap</a> for tips on maintaining your own Bootstrap variants.</p> + <h3 id="examples-framework">Using the framework</h3> <div class="row bs-examples"> <div class="col-xs-6 col-md-4"> <a class="thumbnail" href="../examples/starter-template/"> @@ -166,14 +167,21 @@ bootstrap/ <p>Nothing but the basics: compiled CSS and JavaScript along with a container.</p> </div> <div class="col-xs-6 col-md-4"> + <a class="thumbnail" href="../examples/theme/"> + <img src="../examples/screenshots/theme.jpg" alt=""> + </a> + <h4>Bootstrap theme</h4> + <p>Load the optional Bootstrap theme for a visually enhanced experience.</p> + </div> + <div class="clearfix visible-xs"></div> + + <div class="col-xs-6 col-md-4"> <a class="thumbnail" href="../examples/grid/"> <img src="../examples/screenshots/grid.jpg" alt=""> </a> <h4>Grids</h4> <p>Multiple examples of grid layouts with all four tiers, nesting, and more.</p> </div> - <div class="clearfix visible-xs"></div> - <div class="col-xs-6 col-md-4"> <a class="thumbnail" href="../examples/jumbotron/"> <img src="../examples/screenshots/jumbotron.jpg" alt=""> @@ -181,6 +189,8 @@ bootstrap/ <h4>Jumbotron</h4> <p>Build around the jumbotron with a navbar and some basic grid columns.</p> </div> + <div class="clearfix visible-xs"></div> + <div class="col-xs-6 col-md-4"> <a class="thumbnail" href="../examples/jumbotron-narrow/"> <img src="../examples/screenshots/jumbotron-narrow.jpg" alt=""> @@ -188,8 +198,10 @@ bootstrap/ <h4>Narrow jumbotron</h4> <p>Build a more custom page by narrowing the default container and jumbotron.</p> </div> - <div class="clearfix visible-xs"></div> + </div> + <h3 id="examples-navbars">Navbars in action</h3> + <div class="row bs-examples"> <div class="col-xs-6 col-md-4"> <a class="thumbnail" href="../examples/navbar/"> <img src="../examples/screenshots/navbar.jpg" alt=""> @@ -213,79 +225,76 @@ bootstrap/ <h4>Fixed navbar</h4> <p>Super basic template with a fixed top navbar along with some additional content.</p> </div> - <div class="col-xs-6 col-md-4"> - <a class="thumbnail" href="../examples/signin/"> - <img src="../examples/screenshots/sign-in.jpg" alt=""> - </a> - <h4>Sign-in page</h4> - <p>Custom form layout and design for a simple sign in form.</p> - </div> - <div class="clearfix visible-xs"></div> + </div> + <h3 id="examples-custom">Custom components</h3> + <div class="row bs-examples"> <div class="col-xs-6 col-md-4"> - <a class="thumbnail" href="../examples/sticky-footer/"> - <img src="../examples/screenshots/sticky-footer.jpg" alt=""> + <a class="thumbnail" href="../examples/cover/"> + <img src="../examples/screenshots/cover.jpg" alt=""> </a> - <h4>Sticky footer</h4> - <p>Attach a footer to the bottom of the viewport when the content is shorter than it.</p> + <h4>Cover</h4> + <p>A one-page template for building simple and beautiful home pages.</p> </div> <div class="col-xs-6 col-md-4"> - <a class="thumbnail" href="../examples/sticky-footer-navbar/"> - <img src="../examples/screenshots/sticky-footer-navbar.jpg" alt=""> + <a class="thumbnail" href="../examples/carousel/"> + <img src="../examples/screenshots/carousel.jpg" alt=""> </a> - <h4>Sticky footer with navbar</h4> - <p>Attach a footer to the bottom of the viewport with a fixed navbar at the top.</p> + <h4>Carousel</h4> + <p>Customize the navbar and carousel, then add some new components.</p> </div> <div class="clearfix visible-xs"></div> <div class="col-xs-6 col-md-4"> - <a class="thumbnail" href="../examples/justified-nav/"> - <img src="../examples/screenshots/justified-nav.jpg" alt=""> + <a class="thumbnail" href="../examples/blog/"> + <img src="../examples/screenshots/blog.jpg" alt=""> </a> - <h4>Justified nav</h4> - <p>Create a custom navbar with justified links. Heads up! <a href="../components/#nav-justified">Not too WebKit friendly.</a></p> + <h4>Blog</h4> + <p>Simple two-column blog layout with custom navigation, header, and type.</p> </div> <div class="col-xs-6 col-md-4"> - <a class="thumbnail" href="../examples/offcanvas/"> - <img src="../examples/screenshots/offcanvas.jpg" alt=""> + <a class="thumbnail" href="../examples/dashboard/"> + <img src="../examples/screenshots/dashboard.jpg" alt=""> </a> - <h4>Offcanvas</h4> - <p>Build a toggleable off-canvas navigation menu for use with Bootstrap.</p> + <h4>Dashboard</h4> + <p>Basic structure for a admin dashboard with fixed sidebar and navbar.</p> </div> <div class="clearfix visible-xs"></div> <div class="col-xs-6 col-md-4"> - <a class="thumbnail" href="../examples/carousel/"> - <img src="../examples/screenshots/carousel.jpg" alt=""> + <a class="thumbnail" href="../examples/signin/"> + <img src="../examples/screenshots/sign-in.jpg" alt=""> </a> - <h4>Carousel</h4> - <p>Customize the navbar and carousel, then add some new components.</p> + <h4>Sign-in page</h4> + <p>Custom form layout and design for a simple sign in form.</p> </div> <div class="col-xs-6 col-md-4"> - <a class="thumbnail" href="../examples/cover/"> - <img src="../examples/screenshots/cover.jpg" alt=""> + <a class="thumbnail" href="../examples/justified-nav/"> + <img src="../examples/screenshots/justified-nav.jpg" alt=""> </a> - <h4>Cover</h4> - <p>A one-page template for building simple and beautiful home pages.</p> + <h4>Justified nav</h4> + <p>Create a custom navbar with justified links. Heads up! <a href="../components/#nav-justified">Not too WebKit friendly.</a></p> </div> <div class="clearfix visible-xs"></div> <div class="col-xs-6 col-md-4"> - <a class="thumbnail" href="../examples/dashboard/"> - <img src="../examples/screenshots/dashboard.jpg" alt=""> + <a class="thumbnail" href="../examples/sticky-footer/"> + <img src="../examples/screenshots/sticky-footer.jpg" alt=""> </a> - <h4>Dashboard</h4> - <p>Basic structure for a admin dashboard with fixed sidebar and navbar.</p> + <h4>Sticky footer</h4> + <p>Attach a footer to the bottom of the viewport when the content is shorter than it.</p> </div> <div class="col-xs-6 col-md-4"> - <a class="thumbnail" href="../examples/blog/"> - <img src="../examples/screenshots/blog.jpg" alt=""> + <a class="thumbnail" href="../examples/sticky-footer-navbar/"> + <img src="../examples/screenshots/sticky-footer-navbar.jpg" alt=""> </a> - <h4>Blog</h4> - <p>Simple two-column blog layout with custom navigation, header, and type.</p> + <h4>Sticky footer with navbar</h4> + <p>Attach a footer to the bottom of the viewport with a fixed navbar at the top.</p> </div> - <div class="clearfix visible-xs"></div> + </div> + <h3 id="examples-experiments">Experiments</h3> + <div class="row bs-examples"> <div class="col-xs-6 col-md-4"> <a class="thumbnail" href="../examples/non-responsive/"> <img src="../examples/screenshots/non-responsive.jpg" alt=""> @@ -294,11 +303,11 @@ bootstrap/ <p>Easily disable the responsiveness of Bootstrap <a href="../getting-started/#disable-responsive">per our docs</a>.</p> </div> <div class="col-xs-6 col-md-4"> - <a class="thumbnail" href="../examples/theme/"> - <img src="../examples/screenshots/theme.jpg" alt=""> + <a class="thumbnail" href="../examples/offcanvas/"> + <img src="../examples/screenshots/offcanvas.jpg" alt=""> </a> - <h4>Bootstrap theme</h4> - <p>Load the optional Bootstrap theme for a visually enhanced experience.</p> + <h4>Offcanvas</h4> + <p>Build a toggleable off-canvas navigation menu for use with Bootstrap.</p> </div> </div> |
