mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-20 12:21:35 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jacob Thornton
2011-09-12 11:14:35 -07:00
parent 1645b57efe 72ce695cfd
commit 7396cb8c51
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/index.html
View File

@@ -138,11 +138,11 @@
<h3>What's included</h3>
<p>Bootstrap comes complete with compiled CSS, uncompiled, and example templates.</p>
<ul>
<li><span class="label">New in 1.3</span> Javascript plugins</li>
<li><span class="label">New in 1.3</span> <a href="./javascript.html">Javascript plugins</a></li>
<li>All original .less files</li>
<li>Fully compiled and minified CSS</li>
<li>Fully <a href="../bootstrap-1.3.0.css">compiled</a> and <a href="../bootstrap-1.3.0.min.css">minified</a> CSS</li>
<li>Complete styleguide documentation</li>
<li>Three example pages with different Bootstrap layouts</li>
<li>Three example pages with different layouts</li>
</ul>
</div>
</div><!-- /row -->
@@ -1566,8 +1566,8 @@
<p>One fine body…</p>
</div>
<div class="modal-footer">
<a href="#" class="btn secondary">Secondary</a>
<a href="#" class="btn primary">Primary</a>
<a href="#" class="btn secondary">Secondary</a>
</div>
</div>
</div>