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/extend.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/extend.html')
| -rw-r--r-- | docs/extend.html | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/docs/extend.html b/docs/extend.html index a81016e48..4c55a7220 100644 --- a/docs/extend.html +++ b/docs/extend.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> @@ -147,7 +147,7 @@ <pre>$ lessc ./less/bootstrap.less > bootstrap.css</pre> <p>Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!</p> - <h3>Javascript</h3> + <h3>JavaScript</h3> <p><a href="http://lesscss.org/">Download the latest Less.js</a> and include the path to it (and Bootstrap) in the <code><head></code>.</p> <pre class="prettyprint"> <link rel="stylesheet/less" href="/path/to/bootstrap.less"> @@ -180,18 +180,18 @@ <h3>Setup file structure</h3> <p>Download the latest compiled Bootstrap and place into your project. For example, you might have something like this:</p> -<pre class="prettyprint"> - app/ - ├── layouts/ - └── templates/ - public/ - ├── css/ - │ ├── bootstrap.min.css - ├── js/ - │ ├── bootstrap.min.js - └── img/ - ├── glyphicons-halflings.png - └── glyphicons-halflings-white.png +<pre> + <span class="icon-folder-open"></span> app/ + <span class="icon-folder-open"></span> layouts/ + <span class="icon-folder-open"></span> templates/ + <span class="icon-folder-open"></span> public/ + <span class="icon-folder-open"></span> css/ + <span class="icon-file"></span> bootstrap.min.css + <span class="icon-folder-open"></span> js/ + <span class="icon-file"></span> bootstrap.min.js + <span class="icon-folder-open"></span> img/ + <span class="icon-file"></span> glyphicons-halflings.png + <span class="icon-file"></span> glyphicons-halflings-white.png </pre> <h3>Utilize starter template</h3> |