1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-26 23:04:32 +02:00

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

Conflicts:
	docs/templates/pages/index.mustache
This commit is contained in:
Mark Otto
2012-01-24 14:28:14 -08:00
17 changed files with 583 additions and 583 deletions

View File

@@ -77,7 +77,7 @@
<li><span>&#10004;</span> Built on LESS</li>
<li><span>&#10004;</span> Complete style guide docs</li>
<li><span>&#10004;</span> Fully responsive design</li>
<li><span>&#10004;</span> Small CSS footprint (10kb gzipped)</li>
<li><span>&#10004;</span> Small footprint (10kb gzipped)</li>
<li><span>&#10004;</span> Support for IE7 and up</li>
<li><span>&#10004;</span> Custom jQuery plugins</li>
<li><span>&#10004;</span> Dozens of components</li>
@@ -136,7 +136,7 @@
</li>
</ul>
<h1>Designed for everyone, everywhere.</h1>
<h1Designed for everyone, everywhere.</h1>
<p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
<div class="row">
<div class="span4">
@@ -217,7 +217,6 @@
================================================== -->
<h1>Get started in no time.</h1>
<p class="marketing-byline">Quickly start using Bootstrap within your workflow and development process.</p>
<div class="getting-started">
<div class="row">
<div class="span4">
@@ -228,7 +227,7 @@
</form>
</div>
<div class="span4">
<h3>Use it with LESS.js</h3>
<h3>Use it with LESS</h3>
<p>A fan of using LESS? No problem, just download the repo and add these lines to your page:</p>
<form>
<textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;