diff options
| author | Mark Otto <[email protected]> | 2012-09-25 22:00:41 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-25 22:00:41 -0700 |
| commit | ce19e63d5b068ba0698dee4e2d99c725f6799b0d (patch) | |
| tree | bda8377cdc83204780bdf624833725a127ded586 /docs/index.html | |
| parent | 527d01ce99a0cae8eae7868c0649dca60cda338c (diff) | |
| parent | f4d3d7da2e3ddbd751e053729935df1f3dd4c051 (diff) | |
| download | bootstrap-ce19e63d5b068ba0698dee4e2d99c725f6799b0d.tar.xz bootstrap-ce19e63d5b068ba0698dee4e2d99c725f6799b0d.zip | |
Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/base-css.html
docs/templates/pages/base-css.mustache
less/forms.less
less/mixins.less
Diffstat (limited to 'docs/index.html')
| -rw-r--r-- | docs/index.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/index.html b/docs/index.html index 57d5cd6e8..572a25925 100644 --- a/docs/index.html +++ b/docs/index.html @@ -58,7 +58,7 @@ <a href="./components.html">Components</a> </li> <li class=""> - <a href="./javascript.html">Javascript</a> + <a href="./javascript.html">JavaScript</a> </li> <li class=""> <a href="./customize.html">Customize</a> @@ -122,7 +122,7 @@ <div class="span4"> <img src="assets/img/bs-docs-bootstrap-features.png"> <h2>Packed with features.</h2> - <p>A 12-column responsive <a href="./scaffolding.html#grid">grid</a>, dozens of components, <a href="./javascript.html">javascript plugins</a>, typography, form controls, and even a <a href="./customize.html">web-based Customizer</a> to make Bootstrap your own.</p> + <p>A 12-column responsive <a href="./scaffolding.html#grid">grid</a>, dozens of components, <a href="./javascript.html">JavaScript plugins</a>, typography, form controls, and even a <a href="./customize.html">web-based Customizer</a> to make Bootstrap your own.</p> </div> </div> @@ -143,8 +143,8 @@ </a> </li> <li class="span3"> - <a class="thumbnail" href="http://www.fleetio.com/" target="_blank"> - <img src="assets/img/example-sites/fleetio.png" alt="Fleetio"> + <a class="thumbnail" href="http://www.gathercontent.com/" target="_blank"> + <img src="assets/img/example-sites/gathercontent.png" alt="Gather Content"> </a> </li> <li class="span3"> |