mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 21:49:09 +01:00
Code Issues Releases Wiki Activity

Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	docs/templates/pages/index.mustache
This commit is contained in:
Jacob Thornton 2012-01-24 14:31:10 -08:00
commit fbc1ab14cc
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/index.html
View File

@ -135,8 +135,7 @@
</a>
</li>
</ul>
<h1Designed for everyone, everywhere.</h1>
<h1>Designed for everyone, everywhere.</h1>
<p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
<div class="row">
<div class="span4">

23
docs/templates/pages/index.mustache vendored
View File

@ -14,13 +14,13 @@
<div class="benefits">
<h4>{{_i}}Feature highlights{{/i}}</h4>
<ul>
<li>{{_i}}<span>&times;</span> Built on LESS{{/i}}</li>
<li>{{_i}}<span>&times;</span> Complete styleguide docs{{/i}}</li>
<li>{{_i}}<span>&times;</span> Fully responsive design{{/i}}</li>
<li>{{_i}}<span>&times;</span> Small footprint (7kb gzipped){{/i}}</li>
<li>{{_i}}<span>&times;</span> Support for IE7 and up{{/i}}</li>
<li>{{_i}}<span>&times;</span> Custom jQuery plugins{{/i}}</li>
<li>{{_i}}<span>&times;</span> Dozens of components{{/i}}</li>
<li><span>&times;</span> {{_i}}Built on LESS{{/i}}</li>
<li><span>&times;</span> {{_i}}Complete styleguide docs{{/i}}</li>
<li><span>&times;</span> {{_i}}Fully responsive design{{/i}}</li>
<li><span>&times;</span> {{_i}}Small footprint (7kb gzipped){{/i}}</li>
<li><span>&times;</span> {{_i}}Support for IE7 and up{{/i}}</li>
<li><span>&times;</span> {{_i}}Custom jQuery plugins{{/i}}</li>
<li><span>&times;</span> {{_i}}Dozens of components{{/i}}</li>
</ul>
</div>
</div>
@ -40,14 +40,14 @@
<iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
</li>
<!--
<li><strong>Authors</strong></li>
<li><strong>{{_i}}Authors{{/i}}</strong></li>
<li><a href="http://twitter.com/mdo">@mdo</a></li>
<li><a href="http://twitter.com/fat">@fat</a></li>
-->
<li class="divider">&middot;</li>
<li class="follow-btn">
<a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">Follow @twbootstrap</a>
<a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">{{_i}}Follow @twbootstrap{{/i}}</a>
</li>
<li class="tweet-btn">
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
@ -75,8 +75,7 @@
</a>
</li>
</ul>
<h1{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
<h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
<p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
<div class="row">
<div class="span4">
@ -179,7 +178,7 @@
<h3>{{_i}}Fork on GitHub{{/i}}</h3>
<p>{{_i}}Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.{{/i}}</p>
<p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">{{_i}}Bootstrap on GitHub &raquo;{{/i}}</a></p>
<p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
<p class="current-version">{{_i}}Currently{{/i}} <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
</td>
</tr>
</tbody>