mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code 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
docs/scaffolding.html
+32
View File
@@ -34,6 +34,7 @@
<div class="container">
<a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav">
<<<<<<< HEAD
<li class=""><a href="./index.html">Overview</a></li>
<li class="dropdown active">
<a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
@@ -100,6 +101,23 @@
<a href="./less.html">
Using LESS
</a>
=======
<li><a href="./index.html">Overview</a></li>
<li class="active">
<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>
@@ -108,6 +126,7 @@
<div class="container">
<<<<<<< HEAD
<!-- Masthead
================================================== -->
@@ -115,6 +134,19 @@
<h1>Scaffolding</h1>
<p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
</header>
=======
<!-- Masthead
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Scaffolding</h1>
<p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
<ul class="nav pills">
<li><a href="./scaffolding.html#grid-system">Grid system</a></li>
<li><a href="./scaffolding.html#layouts">Layouts</a></li>
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul>
</header>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2