diff options
| author | Mark Otto <[email protected]> | 2013-01-13 04:26:52 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-01-13 04:26:52 -0800 |
| commit | 7d8d5c783815d83bddc6969052f1600c45246d57 (patch) | |
| tree | 68378feaf630e4b670118b85dc7fb57501fcca9d /docs/getting-started.html | |
| parent | 76ed6b0b2ced6a29c5cb7b6ea62d0c738dbbd90a (diff) | |
| parent | 4b34f4947aedc0e8539eee779e3921f44e0bca8b (diff) | |
| download | bootstrap-7d8d5c783815d83bddc6969052f1600c45246d57.tar.xz bootstrap-7d8d5c783815d83bddc6969052f1600c45246d57.zip | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json
Diffstat (limited to 'docs/getting-started.html')
| -rw-r--r-- | docs/getting-started.html | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/docs/getting-started.html b/docs/getting-started.html index 3bd33e8a5..99996c4f8 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -195,7 +195,7 @@ <div class="page-header"> <h1>4. Basic HTML template</h1> </div> - <p class="lead">With a brief intro into the contents out of the way, we can focus on putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.</p> + <p class="lead">With a brief intro into the contents out of the way, we can focus on putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="./getting-started.html#file-structure">File structure</a>.</p> <p>Now, here's a look at a <strong>typical HTML file</strong>:</p> <pre class="prettyprint linenums"> <!DOCTYPE html> @@ -240,14 +240,14 @@ <div class="row bootstrap-examples"> <div class="span4"> <a class="thumbnail" href="examples/starter-template.html"> - <img src="assets/img/examples/bootstrap-example-starter.jpg" alt=""> + <img src="assets/img/examples/bootstrap-example-starter.png" alt=""> </a> <h4>Starter template</h4> <p>A barebones HTML document with all the Bootstrap CSS and JavaScript included.</p> </div> <div class="span4"> <a class="thumbnail" href="examples/hero.html"> - <img src="assets/img/examples/bootstrap-example-hero.jpg" alt=""> + <img src="assets/img/examples/bootstrap-example-marketing.png" alt=""> </a> <h4>Basic marketing site</h4> <p>Featuring a hero unit for a primary message and three supporting elements.</p> @@ -260,6 +260,13 @@ <p>Slim, lightweight marketing template for small projects or teams.</p> </div> <div class="span4"> + <a class="thumbnail" href="examples/justified-nav.html"> + <img src="assets/img/examples/bootstrap-example-justified-nav.png" alt=""> + </a> + <h4>Justified nav</h4> + <p>Marketing page with equal-width navigation links in a modified navbar.</p> + </div> + <div class="span4"> <a class="thumbnail" href="examples/signin.html"> <img src="assets/img/examples/bootstrap-example-signin.png" alt=""> </a> |