mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-28 20:52:21 +01:00
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts: docs/assets/css/bootstrap.css
This commit is contained in:
Mark Otto
commit
335a8686da
2
docs/assets/css/bootstrap.css
vendored
2
docs/assets/css/bootstrap.css
vendored
@ -6,7 +6,7 @@
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
||||
* Date: Fri Jan 27 13:38:50 PST 2012
|
||||
* Date: Fri Jan 27 13:43:19 PST 2012
|
||||
*/
|
||||
article,
|
||||
aside,
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
<a href="./less.html">Using LESS</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./download.html">Download</a>
|
||||
<a href="./download.html">Customize</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
<a href="./less.html">Using LESS</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./download.html">Download</a>
|
||||
<a href="./download.html">Customize</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
<a href="./less.html">Using LESS</a>
|
||||
</li>
|
||||
<li class="active">
|
||||
<a href="./download.html">Download</a>
|
||||
<a href="./download.html">Customize</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
<a href="./less.html">Using LESS</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./download.html">Download</a>
|
||||
<a href="./download.html">Customize</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
<a href="./less.html">Using LESS</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./download.html">Download</a>
|
||||
<a href="./download.html">Customize</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@ -73,7 +73,7 @@
|
||||
<p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
|
||||
<p class="download-info">
|
||||
<a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">View project on GitHub</a>
|
||||
<a href="./download.html" class="btn btn-large">Customize and Download</a>
|
||||
<a href="http://bootstrap.herokuapp.com/bootstrap.zip" class="btn btn-large">Download Bootstrap</a>
|
||||
</p>
|
||||
<div class="benefits">
|
||||
<h4>Feature highlights</h4>
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
<a href="./less.html">Using LESS</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./download.html">Download</a>
|
||||
<a href="./download.html">Customize</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
<a href="./less.html">Using LESS</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./download.html">Download</a>
|
||||
<a href="./download.html">Customize</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
<a href="./less.html">Using LESS</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./download.html">Download</a>
|
||||
<a href="./download.html">Customize</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
22
docs/templates/layout.mustache
vendored
22
docs/templates/layout.mustache
vendored
@ -36,25 +36,25 @@
|
||||
<a class="brand" href="./index.html">Bootstrap</a>
|
||||
<ul class="nav">
|
||||
<li class="{{index}}">
|
||||
<a href="./index.html">Overview</a>
|
||||
<a href="./index.html">{{_i}}Overview{{/i}}</a>
|
||||
</li>
|
||||
<li class="{{scaffolding}}">
|
||||
<a href="./scaffolding.html">Scaffolding</a>
|
||||
<a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a>
|
||||
</li>
|
||||
<li class="{{base-css}}">
|
||||
<a href="./base-css.html">Base CSS</a>
|
||||
<a href="./base-css.html">{{_i}}Base CSS{{/i}}</a>
|
||||
</li>
|
||||
<li class="{{components}}">
|
||||
<a href="./components.html">Components</a>
|
||||
<a href="./components.html">{{_i}}Components{{/i}}</a>
|
||||
</li>
|
||||
<li class="{{javascript}}">
|
||||
<a href="./javascript.html">Javascript plugins</a>
|
||||
<a href="./javascript.html">{{_i}}Javascript plugins{{/i}}</a>
|
||||
</li>
|
||||
<li class="{{less}}">
|
||||
<a href="./less.html">Using LESS</a>
|
||||
<a href="./less.html">{{_i}}Using LESS{{/i}}</a>
|
||||
</li>
|
||||
<li class="{{download}}">
|
||||
<a href="./download.html">Download</a>
|
||||
<a href="./download.html">{{_i}}Customize{{/i}}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@ -69,10 +69,10 @@
|
||||
<!-- Footer
|
||||
================================================== -->
|
||||
<footer class="footer">
|
||||
<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 class="pull-right"><a href="#">{{_i}}Back to top{{/i}}</a></p>
|
||||
<p>{{_i}}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>.{{/i}}</p>
|
||||
<p>{{_i}}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>.{{/i}}</p>
|
||||
<p>{{_i}}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>.{{/i}}</p>
|
||||
</footer>
|
||||
|
||||
</div><!-- /container -->
|
||||
|
||||
2
docs/templates/pages/index.mustache
vendored
2
docs/templates/pages/index.mustache
vendored
@ -8,7 +8,7 @@
|
||||
<p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
|
||||
<p class="download-info">
|
||||
<a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}View project on GitHub{{/i}}</a>
|
||||
<a href="./download.html" class="btn btn-large">{{_i}}Customize and Download{{/i}}</a>
|
||||
<a href="http://bootstrap.herokuapp.com/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap{{/i}}</a>
|
||||
</p>
|
||||
<div class="benefits">
|
||||
<h4>{{_i}}Feature highlights{{/i}}</h4>
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
<a href="./less.html">Using LESS</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./download.html">Download</a>
|
||||
<a href="./download.html">Customize</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user