mirror of
https://github.com/twbs/bootstrap.git
synced 2025-09-25 12:59:05 +02:00
rebuild with new templates
This commit is contained in:
Jacob Thornton
@@ -27,86 +27,30 @@
|
||||
|
||||
<body>
|
||||
|
||||
<!-- Navbar
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
<div class="navbar navbar-fixed">
|
||||
<div class="navbar-inner">
|
||||
<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">
|
||||
Scaffolding
|
||||
<b class="caret"></b>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<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>
|
||||
=======
|
||||
<li><a href="./index.html">Overview</a></li>
|
||||
<li>
|
||||
<li class="">
|
||||
<a href="./index.html">Overview</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./scaffolding.html">Scaffolding</a>
|
||||
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
|
||||
</li>
|
||||
<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
|
||||
<b class="caret"></b>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="./components.html#buttonGroups">Button groups</a></li>
|
||||
<li><a href="./components.html#buttonDropdowns">Split button dropdowns</a></li>
|
||||
<li><a href="./components.html#navs">Nav, tabs, pills</a></li>
|
||||
<li><a href="./components.html#navbar">Navbar</a></li>
|
||||
<li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
|
||||
<li><a href="./components.html#pagination">Pagination</a></li>
|
||||
<li><a href="./components.html#thumbnails">Thumbnails</a></li>
|
||||
<li><a href="./components.html#alerts">Alert messages</a></li>
|
||||
<li><a href="./components.html#progress">Progress bars</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="dropdown ">
|
||||
<a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
|
||||
Javascript plugins
|
||||
<b class="caret"></b>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="./javascript.html#javascript">Overview</a></li>
|
||||
<li><a href="./javascript.html#modals">Modal</a></li>
|
||||
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
|
||||
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
|
||||
<li><a href="./javascript.html#tabs">Tab</a></li>
|
||||
<li><a href="./javascript.html#tooltips">Tooltip</a></li>
|
||||
<li><a href="./javascript.html#popovers">Popover</a></li>
|
||||
<li><a href="./javascript.html#alerts">Alert</a></li>
|
||||
<li><a href="./javascript.html#buttons">Button</a></li>
|
||||
<li><a href="./javascript.html#collapse">Collapse</a></li>
|
||||
<li><a href="./javascript.html#carousel">Carousel</a></li>
|
||||
<li><a href="./javascript.html#typeahead">Typeahead</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./less.html">
|
||||
Using LESS
|
||||
</a>
|
||||
=======
|
||||
<li>
|
||||
<a href="./components.html">Components</a>
|
||||
</li>
|
||||
<li>
|
||||
<li class="">
|
||||
<a href="./javascript.html">Javascript plugins</a>
|
||||
</li>
|
||||
<li>
|
||||
<li class="">
|
||||
<a href="./less.html">Using LESS</a>
|
||||
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -115,28 +59,19 @@
|
||||
|
||||
<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>
|
||||
<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>
|
||||
=======
|
||||
<!-- 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
|
||||
@@ -1558,7 +1493,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<!-- Footer
|
||||
<!-- Footer
|
||||
================================================== -->
|
||||
<footer class="footer">
|
||||
<p class="pull-right"><a href="#">Back to top</a></p>
|
||||
|
||||
Reference in New Issue
Block a user