diff options
| author | Mark Otto <[email protected]> | 2012-09-30 22:45:39 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-30 22:45:39 -0700 |
| commit | bbd543db53cd8c5d295db67af2bc2517d5c11f1c (patch) | |
| tree | 15b9e94bfb14becdb0fb24e95436816fe7ff6606 /docs/getting-started.html | |
| parent | ad96435d27de7661a158552ad088fd800fe66fe9 (diff) | |
| parent | da43c7c27cb08a76775ad64b5caa210630d0c2cd (diff) | |
| download | bootstrap-bbd543db53cd8c5d295db67af2bc2517d5c11f1c.tar.xz bootstrap-bbd543db53cd8c5d295db67af2bc2517d5c11f1c.zip | |
Merge branch '2.1.2-wip' into exploratory
Conflicts:
docs/getting-started.html
docs/templates/pages/getting-started.mustache
Diffstat (limited to 'docs/getting-started.html')
| -rw-r--r-- | docs/getting-started.html | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/docs/getting-started.html b/docs/getting-started.html index 0c1378995..c37c037bd 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -239,21 +239,21 @@ </div> <p class="lead">Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.</p> <div class="row bootstrap-examples"> - <div class="span3"> + <div class="span4"> <a class="thumbnail" href="examples/hero.html"> <img src="assets/img/examples/bootstrap-example-hero.jpg" alt=""> </a> <h4>Basic marketing site</h4> <p>Featuring a hero unit for a primary message and three supporting elements.</p> </div> - <div class="span3"> + <div class="span4"> <a class="thumbnail" href="examples/fluid.html"> <img src="assets/img/examples/bootstrap-example-fluid.jpg" alt=""> </a> <h4>Fluid layout</h4> <p>Uses our new responsive, fluid grid system to create a seamless liquid layout.</p> </div> - <div class="span3"> + <div class="span4"> <a class="thumbnail" href="examples/starter-template.html"> <img src="assets/img/examples/bootstrap-example-starter.jpg" alt=""> </a> @@ -261,28 +261,39 @@ <p>A barebones HTML document with all the Bootstrap CSS and JavaScript included.</p> </div> - <div class="span3"> + <div class="span4"> <a class="thumbnail" href="examples/marketing-narrow.html"> <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt=""> </a> <h4>Narrow marketing</h4> <p>Slim, lightweight marketing template for small projects or teams.</p> </div> - <div class="span3"> + <div class="span4"> <a class="thumbnail" href="examples/signin.html"> <img src="assets/img/examples/bootstrap-example-signin.png" alt=""> </a> <h4>Sign in</h4> <p>Barebones sign in form with custom, larger form controls and a flexible layout.</p> </div> - <div class="span3"> + <div class="span4"> + <a class="thumbnail" href="examples/sticky-footer.html"> + <img src="assets/img/examples/bootstrap-example-sticky-footer.png" alt=""> + </a> + <h4>Sticky footer</h4> + <p>Pin a fixed-height footer to the bottom of the user's viewport.</p> + </div> + +<!-- + <div class="span4"> <a class="thumbnail" href="examples/carousel.html"> <img src="assets/img/examples/bootstrap-example-carousel.png" alt=""> </a> <h4>Carousel jumbotron</h4> <p>A more interactive riff on the basic marketing site featuring a prominent carousel.</p> </div> +--> </div> + </section> |