diff options
author | Mark Otto <otto@github.com> | 2012-10-30 09:01:58 +0400 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2012-10-30 09:01:58 +0400 |
commit | b5af762ef59e1fa97f4386f5feadb67aa5183fef (patch) | |
tree | 3bcd0841e6938379e8c8ae7259ee16f27a49ea41 /docs/extend.html | |
parent | 7426ced0fb288a9e86f18da1849ad74f652d219a (diff) | |
parent | 68cfedb34af198f178128f8c9bc8ea164e44304a (diff) |
Merge branch '2.1.2-wip'v2.2.0
Conflicts:
js/bootstrap-dropdown.js
Diffstat (limited to 'docs/extend.html')
-rw-r--r-- | docs/extend.html | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/docs/extend.html b/docs/extend.html index a81016e48d..f7d509f86a 100644 --- a/docs/extend.html +++ b/docs/extend.html @@ -2,7 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>Extend · Twitter Bootstrap</title> + <title>Extend · Bootstrap</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="description" content=""> <meta name="author" content=""> @@ -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> @@ -246,12 +246,14 @@ <footer class="footer"> <div class="container"> <p class="pull-right"><a href="#">Back to top</a></p> - <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> - <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> - <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> + <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> + <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> + <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <ul class="footer-links"> - <li><a href="http://blog.getbootstrap.com">Read the blog</a></li> - <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li> + <li><a href="http://blog.getbootstrap.com">Blog</a></li> + <li class="muted">·</li> + <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li> + <li class="muted">·</li> <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li> </ul> </div> |