Skip to content

B
bootstrap
Commit b4b1ef68 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

rebuild with new templates

parent 9a68f115
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2868 additions and 3316 deletions
bootstrap.css
View file @ b4b1ef68
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Mon Jan 23 15:07:02 PST 2012 * Date: Mon Jan 23 15:15:08 PST 2012
*/ */
article, article,
aside, aside,
......
docs/assets/js/application.js
View file @ b4b1ef68
...@@ -24,6 +24,7 @@ $(function(){ ...@@ -24,6 +24,7 @@ $(function(){
// table sort example // table sort example
if ($.fn.tableSorter) { if ($.fn.tableSorter) {
$("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } )
$(".tablesorter-example").tablesorter({ sortList: [[1,0]] })
} }
// add on logic // add on logic
......
docs/base-css.html
View file @ b4b1ef68
...@@ -34,79 +34,23 @@ ...@@ -34,79 +34,23 @@
<div class="container"> <div class="container">
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<<<<<<< HEAD <li class="">
<li class=""><a href="./index.html">Overview</a></li> <a href="./index.html">Overview</a>
<li class="dropdown "> </li>
<a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown"> <li class="">
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>
<a href="./scaffolding.html">Scaffolding</a> <a href="./scaffolding.html">Scaffolding</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
<li class="active"> <li class="active">
<a href="./base-css.html">Base CSS</a> <a href="./base-css.html">Base CSS</a>
</li> </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=""> <li class="">
<a href="./less.html">
Using LESS
</a>
=======
<li>
<a href="./components.html">Components</a> <a href="./components.html">Components</a>
</li> </li>
<li> <li class="">
<a href="./javascript.html">Javascript plugins</a> <a href="./javascript.html">Javascript plugins</a>
</li> </li>
<li> <li class="">
<a href="./less.html">Using LESS</a> <a href="./less.html">Using LESS</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
</ul> </ul>
</div> </div>
...@@ -115,19 +59,11 @@ ...@@ -115,19 +59,11 @@
<div class="container"> <div class="container">
<<<<<<< HEAD
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Base CSS</h1> <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> <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"> <ul class="nav pills">
<li><a href="./base-css.html#typography">Typography</a></li> <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#tables">Tables</a></li>
...@@ -135,8 +71,7 @@ ...@@ -135,8 +71,7 @@
<li><a href="./base-css.html#buttons">Buttons</a></li> <li><a href="./base-css.html#buttons">Buttons</a></li>
<li><a href="./base-css.html#icons">Icons by Glyphicons</a></li> <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
</ul> </ul>
</header> </header>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
<!-- Typography <!-- Typography
......
docs/components.html
View file @ b4b1ef68
...@@ -34,75 +34,23 @@ ...@@ -34,75 +34,23 @@
<div class="container"> <div class="container">
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<<<<<<< HEAD <li class="">
<li class=""><a href="./index.html">Overview</a></li> <a href="./index.html">Overview</a>
<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> </li>
<li class="dropdown "> <li class="">
<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>
<a href="./scaffolding.html">Scaffolding</a> <a href="./scaffolding.html">Scaffolding</a>
</li> </li>
<li> <li class="">
<a href="./base-css.html">Base CSS</a> <a href="./base-css.html">Base CSS</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
<li class="active"> <li class="active">
<a href="./components.html">Components</a> <a href="./components.html">Components</a>
</li> </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=""> <li class="">
<a href="./less.html">
Using LESS
</a>
=======
<li>
<a href="./javascript.html">Javascript plugins</a> <a href="./javascript.html">Javascript plugins</a>
</li> </li>
<li> <li class="">
<a href="./less.html">Using LESS</a> <a href="./less.html">Using LESS</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
</ul> </ul>
</div> </div>
...@@ -111,14 +59,6 @@ ...@@ -111,14 +59,6 @@
<div class="container"> <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 <!-- Masthead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
...@@ -137,7 +77,6 @@ ...@@ -137,7 +77,6 @@
</ul> </ul>
</header> </header>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
<!-- Button Groups <!-- Button Groups
...@@ -1308,6 +1247,7 @@ ...@@ -1308,6 +1247,7 @@
</div> </div>
</section> </section>
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">
......
docs/index.html
View file @ b4b1ef68
...@@ -34,89 +34,23 @@ ...@@ -34,89 +34,23 @@
<div class="container"> <div class="container">
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<li class="active"><a href="./index.html">Overview</a></li> <li class="active">
<<<<<<< HEAD <a href="./index.html">Overview</a>
<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>
<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>
<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>
<li class=""> <li class="">
<a href="./less.html">
Using LESS
</a>
=======
<li>
<a href="./scaffolding.html">Scaffolding</a> <a href="./scaffolding.html">Scaffolding</a>
</li> </li>
<li> <li class="">
<a href="./base-css.html">Base CSS</a> <a href="./base-css.html">Base CSS</a>
</li> </li>
<li> <li class="">
<a href="./components.html">Components</a> <a href="./components.html">Components</a>
</li> </li>
<li> <li class="">
<a href="./javascript.html">Javascript plugins</a> <a href="./javascript.html">Javascript plugins</a>
</li> </li>
<li> <li class="">
<a href="./less.html">Using LESS</a> <a href="./less.html">Using LESS</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
</ul> </ul>
</div> </div>
...@@ -125,7 +59,7 @@ ...@@ -125,7 +59,7 @@
<div class="container"> <div class="container">
<div id="overview"> <div id="overview">
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
...@@ -170,7 +104,7 @@ ...@@ -170,7 +104,7 @@
<li><strong>Authors</strong></li> <li><strong>Authors</strong></li>
<li><a href="http://twitter.com/mdo">@mdo</a></li> <li><a href="http://twitter.com/mdo">@mdo</a></li>
<li><a href="http://twitter.com/fat">@fat</a></li> <li><a href="http://twitter.com/fat">@fat</a></li>
--> -->
<li class="divider">&middot;</li> <li class="divider">&middot;</li>
<li class="follow-btn"> <li class="follow-btn">
...@@ -299,7 +233,7 @@ ...@@ -299,7 +233,7 @@
<p>A fan of using LESS? No problem, just clone the repo and add these lines:</p> <p>A fan of using LESS? No problem, just clone the repo and add these lines:</p>
<form> <form>
<textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt; <textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
&lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea> &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
</form> </form>
</td> </td>
<td class="quick-start"> <td class="quick-start">
...@@ -312,7 +246,7 @@ ...@@ -312,7 +246,7 @@
</tbody> </tbody>
</table> </table>
</div><!-- /.marketing --> </div><!-- /.marketing -->
</div><!-- /#overview --> </div><!-- /#overview -->
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">
......
docs/javascript.html
View file @ b4b1ef68
This diff is collapsed.
docs/less.html
View file @ b4b1ef68
...@@ -34,82 +34,20 @@ ...@@ -34,82 +34,20 @@
<div class="container"> <div class="container">
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<<<<<<< HEAD <li class="">
<li class=""><a href="./index.html">Overview</a></li> <a href="./index.html">Overview</a>
<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>
<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> </li>
<li class="dropdown "> <li class="">
<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><a href="./index.html">Overview</a></li>
<li>
<a href="./scaffolding.html">Scaffolding</a> <a href="./scaffolding.html">Scaffolding</a>
</li> </li>
<li> <li class="">
<a href="./base-css.html">Base CSS</a> <a href="./base-css.html">Base CSS</a>
</li> </li>
<li> <li class="">
<a href="./components.html">Components</a> <a href="./components.html">Components</a>
</li> </li>
<li> <li class="">
<a href="./javascript.html">Javascript plugins</a> <a href="./javascript.html">Javascript plugins</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
<li class="active"> <li class="active">
<a href="./less.html">Using LESS</a> <a href="./less.html">Using LESS</a>
......
docs/scaffolding.html
View file @ b4b1ef68
...@@ -34,90 +34,23 @@ ...@@ -34,90 +34,23 @@
<div class="container"> <div class="container">
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <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">
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>
<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>
<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=""> <li class="">
<a href="./less.html"> <a href="./index.html">Overview</a>
Using LESS </li>
</a>
=======
<li><a href="./index.html">Overview</a></li>
<li class="active"> <li class="active">
<a href="./scaffolding.html">Scaffolding</a> <a href="./scaffolding.html">Scaffolding</a>
</li> </li>
<li> <li class="">
<a href="./base-css.html">Base CSS</a> <a href="./base-css.html">Base CSS</a>
</li> </li>
<li> <li class="">
<a href="./components.html">Components</a> <a href="./components.html">Components</a>
</li> </li>
<li> <li class="">
<a href="./javascript.html">Javascript plugins</a> <a href="./javascript.html">Javascript plugins</a>
</li> </li>
<li> <li class="">
<a href="./less.html">Using LESS</a> <a href="./less.html">Using LESS</a>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li> </li>
</ul> </ul>
</div> </div>
...@@ -126,15 +59,6 @@ ...@@ -126,15 +59,6 @@
<div class="container"> <div class="container">
<<<<<<< HEAD
<!-- 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>
</header>
=======
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
...@@ -146,7 +70,6 @@ ...@@ -146,7 +70,6 @@
<li><a href="./scaffolding.html#responsive">Responsive design</a></li> <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
</ul> </ul>
</header> </header>
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
......
docs/templates/layout.mustache
View file @ b4b1ef68
...@@ -34,72 +34,23 @@ ...@@ -34,72 +34,23 @@
<div class="container"> <div class="container">
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<li class="{{ index }}"><a href="./index.html">Overview</a></li> <li class="{{index}}">
<li class="dropdown {{ scaffolding }}"> <a href="./index.html">Overview</a>
<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> </li>
<li class="dropdown {{ base-css }}"> <li class="{{scaffolding}}">
<a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./scaffolding.html">Scaffolding</a>
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> </li>
<li class="dropdown {{ components }}"> <li class="{{base-css}}">
<a href="./components.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./base-css.html">Base CSS</a>
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>
<li class="dropdown {{ javascript }}"> <li class="{{components}}">
<a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./components.html">Components</a>
Javascript plugins </li>
<b class="caret"></b> <li class="{{javascript}}">
</a> <a href="./javascript.html">Javascript plugins</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>
<li class="{{ less }}"> <li class="{{less}}">
<a href="./less.html"> <a href="./less.html">Using LESS</a>
Using LESS
</a>
</li> </li>
</ul> </ul>
</div> </div>
......
docs/templates/pages/base-css.mustache
View file @ b4b1ef68
...@@ -3,6 +3,13 @@ ...@@ -3,6 +3,13 @@
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Base CSS</h1> <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> <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> </header>
......
docs/templates/pages/components.mustache
View file @ b4b1ef68
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Components</h1> <h1>Components</h1>
<p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p> <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
</header> <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>
<!-- Button Groups <!-- Button Groups
......
docs/templates/pages/index.mustache
View file @ b4b1ef68
<div id="overview"> <div id="overview">
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<li><strong>Authors</strong></li> <li><strong>Authors</strong></li>
<li><a href="http://twitter.com/mdo">@mdo</a></li> <li><a href="http://twitter.com/mdo">@mdo</a></li>
<li><a href="http://twitter.com/fat">@fat</a></li> <li><a href="http://twitter.com/fat">@fat</a></li>
--> -->
<li class="divider">&middot;</li> <li class="divider">&middot;</li>
<li class="follow-btn"> <li class="follow-btn">
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<p>A fan of using LESS? No problem, just clone the repo and add these lines:</p> <p>A fan of using LESS? No problem, just clone the repo and add these lines:</p>
<form> <form>
<textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt; <textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
&lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea> &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
</form> </form>
</td> </td>
<td class="quick-start"> <td class="quick-start">
...@@ -185,4 +185,4 @@ ...@@ -185,4 +185,4 @@
</tbody> </tbody>
</table> </table>
</div><!-- /.marketing --> </div><!-- /.marketing -->
</div><!-- /#overview --> </div><!-- /#overview -->
\ No newline at end of file \ No newline at end of file
docs/templates/pages/javascript.mustache
View file @ b4b1ef68
This diff is collapsed.
docs/templates/pages/scaffolding.mustache
View file @ b4b1ef68
<!-- Masthead
<!-- Masthead ================================================== -->
================================================== --> <header class="jumbotron subhead" id="overview">
<header class="jumbotron subhead" id="overview">
<h1>Scaffolding</h1> <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> <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> <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>
......
docs/templates/pages/upgrading.mustache
View file @ b4b1ef68
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Upgrading to Bootstrap 2</h1> <h1>Upgrading to Bootstrap 2</h1>
<p class="lead">Learn about significant changes and additions since v1.4 with this handy guide.</p> <p class="lead">Learn about significant changes and additions since v1.4 with this handy guide.</p>
</header> </header>
<h2>Rough outline</h2> <h2>Rough outline</h2>
......
docs/upgrading.html
View file @ b4b1ef68
...@@ -34,72 +34,23 @@ ...@@ -34,72 +34,23 @@
<div class="container"> <div class="container">
<a class="brand" href="./index.html">Bootstrap</a> <a class="brand" href="./index.html">Bootstrap</a>
<ul class="nav"> <ul class="nav">
<li class=""><a href="./index.html">Overview</a></li> <li class="">
<li class="dropdown "> <a href="./index.html">Overview</a>
<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> </li>
<li class="dropdown "> <li class="">
<a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./scaffolding.html">Scaffolding</a>
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> </li>
<li class="dropdown "> <li class="">
<a href="./components.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./base-css.html">Base CSS</a>
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>
<li class="dropdown "> <li class="">
<a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown"> <a href="./components.html">Components</a>
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>
<li class=""> <li class="">
<a href="./less.html"> <a href="./javascript.html">Javascript plugins</a>
Using LESS </li>
</a> <li class="">
<a href="./less.html">Using LESS</a>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -108,12 +59,12 @@ ...@@ -108,12 +59,12 @@
<div class="container"> <div class="container">
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Upgrading to Bootstrap 2</h1> <h1>Upgrading to Bootstrap 2</h1>
<p class="lead">Learn about significant changes and additions since v1.4 with this handy guide.</p> <p class="lead">Learn about significant changes and additions since v1.4 with this handy guide.</p>
</header> </header>
<h2>Rough outline</h2> <h2>Rough outline</h2>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment