mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-07 22:26:57 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.1.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
This commit is contained in:
Mark Otto
2012-09-30 22:45:39 -07:00
parent ad96435d27 da43c7c27c
commit bbd543db53
14 changed files with 437 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
docs/index.html
View File

@@ -71,11 +71,22 @@
<div class="container">
<h1>Bootstrap</h1>
<p>Sleek, intuitive, and powerful front-end framework for faster and easier web development.</p>
<p><a href="assets/bootstrap.zip" class="btn btn-primary btn-large" >Download Bootstrap</a></p>
<p>
<a href="assets/bootstrap.zip" class="btn btn-primary btn-large" >Download Bootstrap</a>
</p>
<ul class="masthead-links">
<li><a href="http://github.com/twitter/bootstrap" >GitHub project</a></li>
<li><a href="./extend.html" >Extend</a></li>
<li>Version 2.1.2</li>
<li>
<a href="http://github.com/twitter/bootstrap" >GitHub project</a>
</li>
<li>
<a href="./getting-started.html#examples" >Examples</a>
</li>
<li>
<a href="./extend.html" >Extend</a>
</li>
<li>
Version 2.1.2
</li>
</ul>
</div>
</div>