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

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

Browse Source 
Conflicts:
	bootstrap.css
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
This commit is contained in:
Jacob Thornton
2012-01-23 15:06:56 -08:00
parent f764aee4b9 a074087034
commit 74521e8354
17 changed files with 381 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
docs/index.html
View File

@@ -35,6 +35,7 @@
<a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav">
<li class="active"><a href="./index.html">Overview</a></li>
<<<<<<< HEAD
<li class="dropdown ">
<a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
Scaffolding
@@ -100,6 +101,22 @@
<a href="./less.html">
Using LESS
</a>
=======
<li>
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li>
<a href="./base-css.html">Base CSS</a>
</li>
<li>
<a href="./components.html">Components</a>
</li>
<li>
<a href="./javascript.html">Javascript plugins</a>
</li>
<li>
<a href="./less.html">Using LESS</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li>
</ul>
</div>