diff options
| author | Jacob Thornton <[email protected]> | 2012-01-23 15:06:56 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-23 15:06:56 -0800 |
| commit | 74521e835489066d58813c960bc98d1713ea6074 (patch) | |
| tree | 487e40dd09ab1120130dc64b4292eb3e57f0eec2 /docs/base-css.html | |
| parent | f764aee4b919c28974dba7b91edac9a04172ba25 (diff) | |
| parent | a074087034716804610637a5ad9cc0447a2cccb2 (diff) | |
| download | bootstrap-74521e835489066d58813c960bc98d1713ea6074.tar.xz bootstrap-74521e835489066d58813c960bc98d1713ea6074.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
Diffstat (limited to 'docs/base-css.html')
| -rw-r--r-- | docs/base-css.html | 47 |
1 files changed, 35 insertions, 12 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index a3e8cc85a..a869eecf8 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -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 "> <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown"> @@ -45,20 +46,16 @@ <li><a href="./scaffolding.html#layouts">Layouts</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li> </ul> +======= + <li><a href="./index.html">Overview</a></li> + <li> + <a href="./scaffolding.html">Scaffolding</a> +>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 </li> - <li class="dropdown active"> - <a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown"> - Base CSS - <b class="caret"></b> - </a> - <ul class="dropdown-menu"> - <li><a href="./base-css.html#typography">Typography</a></li> - <li><a href="./base-css.html#tables">Tables</a></li> - <li><a href="./base-css.html#forms">Forms</a></li> - <li><a href="./base-css.html#buttons">Buttons</a></li> - <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li> - </ul> + <li class="active"> + <a href="./base-css.html">Base CSS</a> </li> +<<<<<<< HEAD <li class="dropdown "> <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown"> Components @@ -100,6 +97,16 @@ <a href="./less.html"> Using LESS </a> +======= + <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,12 +115,28 @@ <div class="container"> +<<<<<<< HEAD <!-- Masthead ================================================== --> <header class="jumbotron subhead" id="overview"> <h1>Base CSS</h1> <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p> </header> +======= + <!-- Masthead + ================================================== --> + <header class="jumbotron subhead" id="overview"> + <h1>Base CSS</h1> + <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p> + <ul class="nav pills"> + <li><a href="./base-css.html#typography">Typography</a></li> + <li><a href="./base-css.html#tables">Tables</a></li> + <li><a href="./base-css.html#forms">Forms</a></li> + <li><a href="./base-css.html#buttons">Buttons</a></li> + <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li> + </ul> + </header> +>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 <!-- Typography |