diff options
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 110 |
1 files changed, 25 insertions, 85 deletions
diff --git a/docs/components.html b/docs/components.html index ee14526e5..4a1e4fc6f 100644 --- a/docs/components.html +++ b/docs/components.html @@ -27,82 +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 class=""> + <a href="./index.html">Overview</a> </li> - <li class="dropdown "> - <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><a href="./index.html">Overview</a></li> - <li> + <li class=""> <a href="./scaffolding.html">Scaffolding</a> </li> - <li> + <li class=""> <a href="./base-css.html">Base CSS</a> ->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 </li> <li class="active"> <a href="./components.html">Components</a> </li> -<<<<<<< HEAD - <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="./javascript.html">Javascript plugins</a> </li> - <li> + <li class=""> <a href="./less.html">Using LESS</a> ->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 </li> </ul> </div> @@ -111,33 +59,24 @@ <div class="container"> -<<<<<<< HEAD -<!-- Masthead -================================================== --> -<header class="jumbotron subhead" id="overview"> - <h1>Components</h1> - <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p> -</header> -======= - <!-- Masthead - ================================================== --> - <header class="jumbotron subhead" id="overview"> - <h1>Components</h1> - <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p> - <ul class="nav pills"> - <li><a href="./components.html#buttonGroups">Button groups</a></li> - <li><a href="./components.html#buttonDropdowns">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">Alerts</a></li> - <li><a href="./components.html#progress">Progress bars</a></li> - </ul> - </header> + <!-- Masthead + ================================================== --> + <header class="jumbotron subhead" id="overview"> + <h1>Components</h1> + <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p> + <ul class="nav pills"> + <li><a href="./components.html#buttonGroups">Button groups</a></li> + <li><a href="./components.html#buttonDropdowns">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">Alerts</a></li> + <li><a href="./components.html#progress">Progress bars</a></li> + </ul> + </header> ->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 <!-- Button Groups @@ -1308,7 +1247,8 @@ </div> </section> - <!-- Footer + + <!-- Footer ================================================== --> <footer class="footer"> <p class="pull-right"><a href="#">Back to top</a></p> |