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/customize.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/customize.html')
| -rw-r--r-- | docs/customize.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/customize.html b/docs/customize.html index 0a6c65da9..4673189fc 100644 --- a/docs/customize.html +++ b/docs/customize.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="active"> <a href="./customize.html">Customize</a> @@ -74,7 +74,7 @@ <header class="jumbotron subhead" id="overview"> <div class="container"> <h1>Customize and download</h1> - <p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download Bootstrap</a> or customize variables, components, javascript plugins, and more.</p> + <p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download Bootstrap</a> or customize variables, components, JavaScript plugins, and more.</p> </div> </header> @@ -143,6 +143,7 @@ </div><!-- /span --> <div class="span3"> <h3>Miscellaneous</h3> + <label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> Media object</label> <label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> Wells</label> <label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> Close icon</label> <label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label> |