mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-17 09:52:29 +01:00
rebuild with new templates
This commit is contained in:
parent
9a68f115e7
commit
b4b1ef6839
2
bootstrap.css
vendored
2
bootstrap.css
vendored
@ -6,7 +6,7 @@
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* 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,
|
||||
aside,
|
||||
|
@ -24,6 +24,7 @@ $(function(){
|
||||
// table sort example
|
||||
if ($.fn.tableSorter) {
|
||||
$("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } )
|
||||
$(".tablesorter-example").tablesorter({ sortList: [[1,0]] })
|
||||
}
|
||||
|
||||
// add on logic
|
||||
|
@ -34,79 +34,23 @@
|
||||
<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,19 +59,11 @@
|
||||
|
||||
<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>
|
||||
@ -135,8 +71,7 @@
|
||||
<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
|
||||
</header>
|
||||
|
||||
|
||||
<!-- Typography
|
||||
|
@ -34,75 +34,23 @@
|
||||
<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,14 +59,6 @@
|
||||
|
||||
<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">
|
||||
@ -137,7 +77,6 @@
|
||||
</ul>
|
||||
</header>
|
||||
|
||||
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
|
||||
|
||||
|
||||
<!-- Button Groups
|
||||
@ -1308,6 +1247,7 @@
|
||||
</div>
|
||||
|
||||
</section>
|
||||
|
||||
<!-- Footer
|
||||
================================================== -->
|
||||
<footer class="footer">
|
||||
|
@ -34,89 +34,23 @@
|
||||
<div class="container">
|
||||
<a class="brand" href="./index.html">Bootstrap</a>
|
||||
<ul class="nav">
|
||||
<li class="active"><a href="./index.html">Overview</a></li>
|
||||
<<<<<<< HEAD
|
||||
<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 class="active">
|
||||
<a href="./index.html">Overview</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./less.html">
|
||||
Using LESS
|
||||
</a>
|
||||
=======
|
||||
<li>
|
||||
<a href="./scaffolding.html">Scaffolding</a>
|
||||
</li>
|
||||
<li>
|
||||
<li class="">
|
||||
<a href="./base-css.html">Base CSS</a>
|
||||
</li>
|
||||
<li>
|
||||
<li class="">
|
||||
<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>
|
||||
@ -125,7 +59,7 @@
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div id="overview">
|
||||
<div id="overview">
|
||||
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
@ -170,7 +104,7 @@
|
||||
<li><strong>Authors</strong></li>
|
||||
<li><a href="http://twitter.com/mdo">@mdo</a></li>
|
||||
<li><a href="http://twitter.com/fat">@fat</a></li>
|
||||
-->
|
||||
-->
|
||||
|
||||
<li class="divider">·</li>
|
||||
<li class="follow-btn">
|
||||
@ -299,7 +233,7 @@
|
||||
<p>A fan of using LESS? No problem, just clone the repo and add these lines:</p>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="2"><link rel="stylesheet/less" href="/path/to/bootstrap.less">
|
||||
<script src="/path/to/less.js"></script></textarea>
|
||||
<script src="/path/to/less.js"></script></textarea>
|
||||
</form>
|
||||
</td>
|
||||
<td class="quick-start">
|
||||
@ -312,7 +246,7 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div><!-- /.marketing -->
|
||||
</div><!-- /#overview -->
|
||||
</div><!-- /#overview -->
|
||||
<!-- Footer
|
||||
================================================== -->
|
||||
<footer class="footer">
|
||||
|
@ -34,72 +34,23 @@
|
||||
<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>
|
||||
<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><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>
|
||||
</li>
|
||||
<li>
|
||||
<li class="">
|
||||
<a href="./components.html">Components</a>
|
||||
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
|
||||
</li>
|
||||
<li class="active">
|
||||
<a href="./javascript.html">Javascript plugins</a>
|
||||
</li>
|
||||
<<<<<<< HEAD
|
||||
<li class="">
|
||||
<a href="./less.html">
|
||||
Using LESS
|
||||
</a>
|
||||
=======
|
||||
<li>
|
||||
<a href="./less.html">Using LESS</a>
|
||||
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@ -107,8 +58,7 @@
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
@ -129,14 +79,6 @@
|
||||
<li><a href="./javascript.html#typeahead">Typeahead</a></li>
|
||||
</ul>
|
||||
</header>
|
||||
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
|
||||
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<h1>Javascript for Bootstrap</h1>
|
||||
<p class="lead">Bring Bootstrap's components to life—now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
|
||||
</header>
|
||||
|
||||
|
||||
<!-- Using Javascript w/ Bootstrap
|
||||
@ -242,13 +184,13 @@
|
||||
<hr>
|
||||
<a id="selectAll" href="#" style="float:right">Select/Unselect All Plugins</a>
|
||||
<p class="muted"><span class="label warning">Note:</span> All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Modal
|
||||
================================================== -->
|
||||
<section id="modals">
|
||||
<!-- Modal
|
||||
================================================== -->
|
||||
<section id="modals">
|
||||
<div class="page-header">
|
||||
<h1>Modals <small>bootstrap-modal.js</small></h1>
|
||||
</div>
|
||||
@ -341,17 +283,17 @@
|
||||
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="modal">
|
||||
<div class="modal-header">
|
||||
<a href="#" class="close js-dismiss">×</a>
|
||||
<h3>Modal header</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>One fine body…</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<a href="#" class="btn primary">Save changes</a>
|
||||
<a href="#" class="btn">Close</a>
|
||||
</div>
|
||||
<div class="modal-header">
|
||||
<a href="#" class="close js-dismiss">×</a>
|
||||
<h3>Modal header</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>One fine body…</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<a href="#" class="btn primary">Save changes</a>
|
||||
<a href="#" class="btn">Close</a>
|
||||
</div>
|
||||
</div>
|
||||
</pre>
|
||||
<p><span class="label notice">Notice</span> If you want your modal to animate in and out, just add a <code>.fade</code> class to the <code>.modal</code> element (refer to the demo to see this in action).</p>
|
||||
@ -360,7 +302,7 @@
|
||||
<p>Activates your content as a modal. Accepts an optional options <code>object</code>.
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myModal').modal({
|
||||
keyboard: false
|
||||
keyboard: false
|
||||
})</pre>
|
||||
<h4>.modal('toggle')</h4>
|
||||
<p>Manually toggles a modal.</p>
|
||||
@ -402,17 +344,17 @@ keyboard: false
|
||||
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myModal').on('hidden', function () {
|
||||
// do something ...
|
||||
// do something ...
|
||||
})</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Dropdown
|
||||
================================================== -->
|
||||
<section id="dropdowns">
|
||||
<!-- Dropdown
|
||||
================================================== -->
|
||||
<section id="dropdowns">
|
||||
<div class="page-header">
|
||||
<h1>Dropdowns <small>bootstrap-dropdown.js</small></h1>
|
||||
</div>
|
||||
@ -512,21 +454,21 @@ $('#myModal').on('hidden', function () {
|
||||
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="nav pills">
|
||||
<li class="active"><a href="#">Regular link</a></li>
|
||||
<li class="dropdown" id="menu1">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
|
||||
<li class="active"><a href="#">Regular link</a></li>
|
||||
<li class="dropdown" id="menu1">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
|
||||
Dropdown
|
||||
<b class="caret"></b>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="#">Action</a></li>
|
||||
<li><a href="#">Another action</a></li>
|
||||
<li><a href="#">Something else here</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="#">Separated link</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
...
|
||||
</ul>
|
||||
</li>
|
||||
...
|
||||
</ul></pre>
|
||||
<h3>Methods</h3>
|
||||
<h4>$().dropdown()</h4>
|
||||
@ -535,13 +477,13 @@ $('#myModal').on('hidden', function () {
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- ScrollSpy
|
||||
================================================== -->
|
||||
<section id="scrollspy">
|
||||
<!-- ScrollSpy
|
||||
================================================== -->
|
||||
<section id="scrollspy">
|
||||
<div class="page-header">
|
||||
<h1>ScrollSpy <small>bootstrap-scrollspy.js</small></h1>
|
||||
</div>
|
||||
@ -626,13 +568,13 @@ $('#myModal').on('hidden', function () {
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Tabs
|
||||
================================================== -->
|
||||
<section id="tabs">
|
||||
<!-- Tabs
|
||||
================================================== -->
|
||||
<section id="tabs">
|
||||
<div class="page-header">
|
||||
<h1>Togglable tabs <small>bootstrap-tab.js</small></h1>
|
||||
</div>
|
||||
@ -677,10 +619,10 @@ $('#myModal').on('hidden', function () {
|
||||
<p>You can activate a tab or pill navigation without writing any javascript by simply specifying <code>data-toggle="tab"</code> or <code>data-toggle="pill"</code> on an element.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="tabs">
|
||||
<li><a href="#home" data-toggle="tab">Home</a></li>
|
||||
<li><a href="#profile" data-toggle="tab">Profile</a></li>
|
||||
<li><a href="#messages" data-toggle="tab">Messages</a></li>
|
||||
<li><a href="#ettings" data-toggle="tab">Settings</a></li>
|
||||
<li><a href="#home" data-toggle="tab">Home</a></li>
|
||||
<li><a href="#profile" data-toggle="tab">Profile</a></li>
|
||||
<li><a href="#messages" data-toggle="tab">Messages</a></li>
|
||||
<li><a href="#ettings" data-toggle="tab">Settings</a></li>
|
||||
</ul></pre>
|
||||
<h3>Methods</h3>
|
||||
<h4>$().tab</h4>
|
||||
@ -689,23 +631,23 @@ $('#myModal').on('hidden', function () {
|
||||
</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="tabs">
|
||||
<li class="active"><a href="#home">Home</a></li>
|
||||
<li><a href="#profile">Profile</a></li>
|
||||
<li><a href="#messages">Messages</a></li>
|
||||
<li><a href="#settings">Settings</a></li>
|
||||
<li class="active"><a href="#home">Home</a></li>
|
||||
<li><a href="#profile">Profile</a></li>
|
||||
<li><a href="#messages">Messages</a></li>
|
||||
<li><a href="#settings">Settings</a></li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div class="active" id="home">...</div>
|
||||
<div id="profile">...</div>
|
||||
<div id="messages">...</div>
|
||||
<div id="settings">...</div>
|
||||
<div class="active" id="home">...</div>
|
||||
<div id="profile">...</div>
|
||||
<div id="messages">...</div>
|
||||
<div id="settings">...</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
$(function () {
|
||||
$('.tabs a:last').tab('show')
|
||||
})
|
||||
$(function () {
|
||||
$('.tabs a:last').tab('show')
|
||||
})
|
||||
</script></pre>
|
||||
</p>
|
||||
<h3>Events</h3>
|
||||
@ -730,17 +672,17 @@ $('.tabs a:last').tab('show')
|
||||
|
||||
<pre class="prettyprint linenums">
|
||||
$('a[data-toggle="tab"]').on('shown', function (e) {
|
||||
e.target // activated tab
|
||||
e.relatedTarget // previous tab
|
||||
e.target // activated tab
|
||||
e.relatedTarget // previous tab
|
||||
})</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
<!-- Tooltips
|
||||
================================================== -->
|
||||
<section id="tooltips">
|
||||
<!-- Tooltips
|
||||
================================================== -->
|
||||
<section id="tooltips">
|
||||
<div class="page-header">
|
||||
<h1>Tooltips <small>bootstrap-tooltip.js</small></h1>
|
||||
</div>
|
||||
@ -828,13 +770,13 @@ e.relatedTarget // previous tab
|
||||
<pre class="prettyprint linenums">$('#element').tooltip('hide')</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Popovers
|
||||
================================================== -->
|
||||
<section id="popovers">
|
||||
<!-- Popovers
|
||||
================================================== -->
|
||||
<section id="popovers">
|
||||
<div class="page-header">
|
||||
<h1>Popovers <small>bootstrap-popover.js</small></h1>
|
||||
</div>
|
||||
@ -930,13 +872,13 @@ e.relatedTarget // previous tab
|
||||
<pre class="prettyprint linenums">$('#element').popover('hide')</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Alert
|
||||
================================================== -->
|
||||
<section id="alerts">
|
||||
<!-- Alert
|
||||
================================================== -->
|
||||
<section id="alerts">
|
||||
<div class="page-header">
|
||||
<h1>Alert messages <small>bootstrap-alert.js</small></h1>
|
||||
</div>
|
||||
@ -996,17 +938,17 @@ e.relatedTarget // previous tab
|
||||
</table>
|
||||
<pre class="prettyprint linenums">
|
||||
$('#my-alert').bind('closed', function () {
|
||||
// do something ...
|
||||
// do something ...
|
||||
})</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Buttons
|
||||
================================================== -->
|
||||
<section id="buttons">
|
||||
<!-- Buttons
|
||||
================================================== -->
|
||||
<section id="buttons">
|
||||
<div class="page-header">
|
||||
<h1>Buttons <small>bootstrap-button.js</small></h1>
|
||||
</div>
|
||||
@ -1069,16 +1011,16 @@ $('#my-alert').bind('closed', function () {
|
||||
|
||||
<!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group -->
|
||||
<div class="btn-group" data-toggle="buttons-checkbox">
|
||||
<button class="btn">Left</button>
|
||||
<button class="btn">Middle</button>
|
||||
<button class="btn">Right</button>
|
||||
<button class="btn">Left</button>
|
||||
<button class="btn">Middle</button>
|
||||
<button class="btn">Right</button>
|
||||
</div>
|
||||
|
||||
<!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group -->
|
||||
<div class="btn-group" data-toggle="buttons-radio">
|
||||
<button class="btn">Left</button>
|
||||
<button class="btn">Middle</button>
|
||||
<button class="btn">Right</button>
|
||||
<button class="btn">Left</button>
|
||||
<button class="btn">Middle</button>
|
||||
<button class="btn">Right</button>
|
||||
</div>
|
||||
</pre>
|
||||
<h3>Methods</h3>
|
||||
@ -1099,17 +1041,17 @@ $('#my-alert').bind('closed', function () {
|
||||
<p>Resets button state - swaps text to any data defined text state.</p>
|
||||
<pre class="prettyprint linenums"><button class="btn" data-complete-text="finished!" >...</button>
|
||||
<script>
|
||||
$('.btn').button('complete')
|
||||
$('.btn').button('complete')
|
||||
</script></pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Collapse
|
||||
================================================== -->
|
||||
<section id="collapse">
|
||||
<!-- Collapse
|
||||
================================================== -->
|
||||
<section id="collapse">
|
||||
<div class="page-header">
|
||||
<h1>Collapse <small>bootstrap-collapse.js</small></h1>
|
||||
</div>
|
||||
@ -1196,7 +1138,7 @@ $('.btn').button('complete')
|
||||
<p>Just add <code>data-toggle="collapse"</code> and a <code>data-target</code> to element to automatically assign control of a collapsible element. The <code>data-target</code> attribute accepts a css selector to apply the collapse to. Be sure to add the class <code>collapse</code> to the collapsible element. If you'd like it to default open, add the additional class <code>in</code>.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<button class="btn danger" data-toggle="collapse" data-target="#demo">
|
||||
simple collapsible
|
||||
simple collapsible
|
||||
</button>
|
||||
|
||||
<div id="demo" class="collapse in"> … </div></pre>
|
||||
@ -1206,7 +1148,7 @@ simple collapsible
|
||||
<p>Activates your content as a collapsible element. Accepts an optional options <code>object</code>.
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myCollapsible').collapse({
|
||||
toggle: false
|
||||
toggle: false
|
||||
})</pre>
|
||||
<h4>.collapse('toggle')</h4>
|
||||
<p>Toggles a collapsible element to shown or hidden.</p>
|
||||
@ -1249,17 +1191,17 @@ toggle: false
|
||||
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myCollapsible').on('hidden', function () {
|
||||
// do something ...
|
||||
// do something ...
|
||||
})</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Carousel
|
||||
================================================== -->
|
||||
<section id="carousel">
|
||||
================================================== -->
|
||||
<section id="carousel">
|
||||
<div class="page-header">
|
||||
<h1>Carousel <small>bootstrap-carousel.js</small></h1>
|
||||
</div>
|
||||
@ -1326,13 +1268,13 @@ $('#myCollapsible').on('hidden', function () {
|
||||
<p>Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="carousel">
|
||||
<!-- Carousel items -->
|
||||
<div class="carousel-inner">
|
||||
...
|
||||
</div>
|
||||
<!-- Carousel nav -->
|
||||
<a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
|
||||
<a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
|
||||
<!-- Carousel items -->
|
||||
<div class="carousel-inner">
|
||||
...
|
||||
</div>
|
||||
<!-- Carousel nav -->
|
||||
<a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
|
||||
<a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
|
||||
</div>
|
||||
</pre>
|
||||
<h3>Methods</h3>
|
||||
@ -1340,7 +1282,7 @@ $('#myCollapsible').on('hidden', function () {
|
||||
<p>Initializes the carousel with an optional options <code>object</code> and starts cycling through items.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
$('.myCarousel').carousel({
|
||||
interval: 2000
|
||||
interval: 2000
|
||||
})
|
||||
</pre>
|
||||
<h4>.carousel('cycle')</h4>
|
||||
@ -1376,13 +1318,13 @@ interval: 2000
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Typeahead
|
||||
================================================== -->
|
||||
<section id="typeahead">
|
||||
<!-- Typeahead
|
||||
================================================== -->
|
||||
<section id="typeahead">
|
||||
<div class="page-header">
|
||||
<h1>Typeahead <small>bootstrap-typeahead.js</small></h1>
|
||||
</div>
|
||||
@ -1429,7 +1371,7 @@ interval: 2000
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
<!-- Footer
|
||||
================================================== -->
|
||||
<footer class="footer">
|
||||
|
@ -34,82 +34,20 @@
|
||||
<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>
|
||||
<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><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>
|
||||
</li>
|
||||
<li>
|
||||
<li class="">
|
||||
<a href="./components.html">Components</a>
|
||||
</li>
|
||||
<li>
|
||||
<li class="">
|
||||
<a href="./javascript.html">Javascript plugins</a>
|
||||
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
|
||||
</li>
|
||||
<li class="active">
|
||||
<a href="./less.html">Using LESS</a>
|
||||
|
@ -34,90 +34,23 @@
|
||||
<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">
|
||||
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="">
|
||||
<a href="./less.html">
|
||||
Using LESS
|
||||
</a>
|
||||
=======
|
||||
<li><a href="./index.html">Overview</a></li>
|
||||
<a href="./index.html">Overview</a>
|
||||
</li>
|
||||
<li class="active">
|
||||
<a href="./scaffolding.html">Scaffolding</a>
|
||||
</li>
|
||||
<li>
|
||||
<li class="">
|
||||
<a href="./base-css.html">Base CSS</a>
|
||||
</li>
|
||||
<li>
|
||||
<li class="">
|
||||
<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>
|
||||
@ -126,15 +59,6 @@
|
||||
|
||||
<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
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
@ -146,7 +70,6 @@
|
||||
<li><a href="./scaffolding.html#responsive">Responsive design</a></li>
|
||||
</ul>
|
||||
</header>
|
||||
>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
|
||||
|
||||
|
||||
|
||||
|
75
docs/templates/layout.mustache
vendored
75
docs/templates/layout.mustache
vendored
@ -34,72 +34,23 @@
|
||||
<div class="container">
|
||||
<a class="brand" href="./index.html">Bootstrap</a>
|
||||
<ul class="nav">
|
||||
<li class="{{ index }}"><a href="./index.html">Overview</a></li>
|
||||
<li class="dropdown {{ scaffolding }}">
|
||||
<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="{{index}}">
|
||||
<a href="./index.html">Overview</a>
|
||||
</li>
|
||||
<li class="dropdown {{ base-css }}">
|
||||
<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="{{scaffolding}}">
|
||||
<a href="./scaffolding.html">Scaffolding</a>
|
||||
</li>
|
||||
<li class="dropdown {{ components }}">
|
||||
<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 class="{{base-css}}">
|
||||
<a href="./base-css.html">Base CSS</a>
|
||||
</li>
|
||||
<li class="dropdown {{ javascript }}">
|
||||
<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 class="{{components}}">
|
||||
<a href="./components.html">Components</a>
|
||||
</li>
|
||||
<li class="{{ less }}">
|
||||
<a href="./less.html">
|
||||
Using LESS
|
||||
</a>
|
||||
<li class="{{javascript}}">
|
||||
<a href="./javascript.html">Javascript plugins</a>
|
||||
</li>
|
||||
<li class="{{less}}">
|
||||
<a href="./less.html">Using LESS</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
7
docs/templates/pages/base-css.mustache
vendored
7
docs/templates/pages/base-css.mustache
vendored
@ -3,6 +3,13 @@
|
||||
<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>
|
||||
|
||||
|
||||
|
20
docs/templates/pages/components.mustache
vendored
20
docs/templates/pages/components.mustache
vendored
@ -1,9 +1,21 @@
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<!-- 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>
|
||||
<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
|
||||
|
8
docs/templates/pages/index.mustache
vendored
8
docs/templates/pages/index.mustache
vendored
@ -1,4 +1,4 @@
|
||||
<div id="overview">
|
||||
<div id="overview">
|
||||
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
@ -43,7 +43,7 @@
|
||||
<li><strong>Authors</strong></li>
|
||||
<li><a href="http://twitter.com/mdo">@mdo</a></li>
|
||||
<li><a href="http://twitter.com/fat">@fat</a></li>
|
||||
-->
|
||||
-->
|
||||
|
||||
<li class="divider">·</li>
|
||||
<li class="follow-btn">
|
||||
@ -172,7 +172,7 @@
|
||||
<p>A fan of using LESS? No problem, just clone the repo and add these lines:</p>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="2"><link rel="stylesheet/less" href="/path/to/bootstrap.less">
|
||||
<script src="/path/to/less.js"></script></textarea>
|
||||
<script src="/path/to/less.js"></script></textarea>
|
||||
</form>
|
||||
</td>
|
||||
<td class="quick-start">
|
||||
@ -185,4 +185,4 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div><!-- /.marketing -->
|
||||
</div><!-- /#overview -->
|
||||
</div><!-- /#overview -->
|
224
docs/templates/pages/javascript.mustache
vendored
224
docs/templates/pages/javascript.mustache
vendored
@ -1,9 +1,23 @@
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<h1>Javascript for Bootstrap</h1>
|
||||
<p class="lead">Bring Bootstrap's components to life—now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
|
||||
</header>
|
||||
<ul class="nav pills">
|
||||
<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>
|
||||
</header>
|
||||
|
||||
|
||||
<!-- Using Javascript w/ Bootstrap
|
||||
@ -109,13 +123,13 @@
|
||||
<hr>
|
||||
<a id="selectAll" href="#" style="float:right">Select/Unselect All Plugins</a>
|
||||
<p class="muted"><span class="label warning">Note:</span> All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Modal
|
||||
================================================== -->
|
||||
<section id="modals">
|
||||
<!-- Modal
|
||||
================================================== -->
|
||||
<section id="modals">
|
||||
<div class="page-header">
|
||||
<h1>Modals <small>bootstrap-modal.js</small></h1>
|
||||
</div>
|
||||
@ -208,17 +222,17 @@
|
||||
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="modal">
|
||||
<div class="modal-header">
|
||||
<a href="#" class="close js-dismiss">×</a>
|
||||
<h3>Modal header</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>One fine body…</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<a href="#" class="btn primary">Save changes</a>
|
||||
<a href="#" class="btn">Close</a>
|
||||
</div>
|
||||
<div class="modal-header">
|
||||
<a href="#" class="close js-dismiss">×</a>
|
||||
<h3>Modal header</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>One fine body…</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<a href="#" class="btn primary">Save changes</a>
|
||||
<a href="#" class="btn">Close</a>
|
||||
</div>
|
||||
</div>
|
||||
</pre>
|
||||
<p><span class="label notice">Notice</span> If you want your modal to animate in and out, just add a <code>.fade</code> class to the <code>.modal</code> element (refer to the demo to see this in action).</p>
|
||||
@ -227,7 +241,7 @@
|
||||
<p>Activates your content as a modal. Accepts an optional options <code>object</code>.
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myModal').modal({
|
||||
keyboard: false
|
||||
keyboard: false
|
||||
})</pre>
|
||||
<h4>.modal('toggle')</h4>
|
||||
<p>Manually toggles a modal.</p>
|
||||
@ -269,17 +283,17 @@ keyboard: false
|
||||
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myModal').on('hidden', function () {
|
||||
// do something ...
|
||||
// do something ...
|
||||
})</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Dropdown
|
||||
================================================== -->
|
||||
<section id="dropdowns">
|
||||
<!-- Dropdown
|
||||
================================================== -->
|
||||
<section id="dropdowns">
|
||||
<div class="page-header">
|
||||
<h1>Dropdowns <small>bootstrap-dropdown.js</small></h1>
|
||||
</div>
|
||||
@ -379,21 +393,21 @@ $('#myModal').on('hidden', function () {
|
||||
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="nav pills">
|
||||
<li class="active"><a href="#">Regular link</a></li>
|
||||
<li class="dropdown" id="menu1">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
|
||||
<li class="active"><a href="#">Regular link</a></li>
|
||||
<li class="dropdown" id="menu1">
|
||||
<a class="dropdown-toggle" data-toggle="dropdown" href="#menu1">
|
||||
Dropdown
|
||||
<b class="caret"></b>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="#">Action</a></li>
|
||||
<li><a href="#">Another action</a></li>
|
||||
<li><a href="#">Something else here</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="#">Separated link</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
...
|
||||
</ul>
|
||||
</li>
|
||||
...
|
||||
</ul></pre>
|
||||
<h3>Methods</h3>
|
||||
<h4>$().dropdown()</h4>
|
||||
@ -402,13 +416,13 @@ $('#myModal').on('hidden', function () {
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- ScrollSpy
|
||||
================================================== -->
|
||||
<section id="scrollspy">
|
||||
<!-- ScrollSpy
|
||||
================================================== -->
|
||||
<section id="scrollspy">
|
||||
<div class="page-header">
|
||||
<h1>ScrollSpy <small>bootstrap-scrollspy.js</small></h1>
|
||||
</div>
|
||||
@ -493,13 +507,13 @@ $('#myModal').on('hidden', function () {
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Tabs
|
||||
================================================== -->
|
||||
<section id="tabs">
|
||||
<!-- Tabs
|
||||
================================================== -->
|
||||
<section id="tabs">
|
||||
<div class="page-header">
|
||||
<h1>Togglable tabs <small>bootstrap-tab.js</small></h1>
|
||||
</div>
|
||||
@ -544,10 +558,10 @@ $('#myModal').on('hidden', function () {
|
||||
<p>You can activate a tab or pill navigation without writing any javascript by simply specifying <code>data-toggle="tab"</code> or <code>data-toggle="pill"</code> on an element.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="tabs">
|
||||
<li><a href="#home" data-toggle="tab">Home</a></li>
|
||||
<li><a href="#profile" data-toggle="tab">Profile</a></li>
|
||||
<li><a href="#messages" data-toggle="tab">Messages</a></li>
|
||||
<li><a href="#ettings" data-toggle="tab">Settings</a></li>
|
||||
<li><a href="#home" data-toggle="tab">Home</a></li>
|
||||
<li><a href="#profile" data-toggle="tab">Profile</a></li>
|
||||
<li><a href="#messages" data-toggle="tab">Messages</a></li>
|
||||
<li><a href="#ettings" data-toggle="tab">Settings</a></li>
|
||||
</ul></pre>
|
||||
<h3>Methods</h3>
|
||||
<h4>$().tab</h4>
|
||||
@ -556,23 +570,23 @@ $('#myModal').on('hidden', function () {
|
||||
</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="tabs">
|
||||
<li class="active"><a href="#home">Home</a></li>
|
||||
<li><a href="#profile">Profile</a></li>
|
||||
<li><a href="#messages">Messages</a></li>
|
||||
<li><a href="#settings">Settings</a></li>
|
||||
<li class="active"><a href="#home">Home</a></li>
|
||||
<li><a href="#profile">Profile</a></li>
|
||||
<li><a href="#messages">Messages</a></li>
|
||||
<li><a href="#settings">Settings</a></li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div class="active" id="home">...</div>
|
||||
<div id="profile">...</div>
|
||||
<div id="messages">...</div>
|
||||
<div id="settings">...</div>
|
||||
<div class="active" id="home">...</div>
|
||||
<div id="profile">...</div>
|
||||
<div id="messages">...</div>
|
||||
<div id="settings">...</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
$(function () {
|
||||
$('.tabs a:last').tab('show')
|
||||
})
|
||||
$(function () {
|
||||
$('.tabs a:last').tab('show')
|
||||
})
|
||||
</script></pre>
|
||||
</p>
|
||||
<h3>Events</h3>
|
||||
@ -597,17 +611,17 @@ $('.tabs a:last').tab('show')
|
||||
|
||||
<pre class="prettyprint linenums">
|
||||
$('a[data-toggle="tab"]').on('shown', function (e) {
|
||||
e.target // activated tab
|
||||
e.relatedTarget // previous tab
|
||||
e.target // activated tab
|
||||
e.relatedTarget // previous tab
|
||||
})</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
<!-- Tooltips
|
||||
================================================== -->
|
||||
<section id="tooltips">
|
||||
<!-- Tooltips
|
||||
================================================== -->
|
||||
<section id="tooltips">
|
||||
<div class="page-header">
|
||||
<h1>Tooltips <small>bootstrap-tooltip.js</small></h1>
|
||||
</div>
|
||||
@ -695,13 +709,13 @@ e.relatedTarget // previous tab
|
||||
<pre class="prettyprint linenums">$('#element').tooltip('hide')</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Popovers
|
||||
================================================== -->
|
||||
<section id="popovers">
|
||||
<!-- Popovers
|
||||
================================================== -->
|
||||
<section id="popovers">
|
||||
<div class="page-header">
|
||||
<h1>Popovers <small>bootstrap-popover.js</small></h1>
|
||||
</div>
|
||||
@ -797,13 +811,13 @@ e.relatedTarget // previous tab
|
||||
<pre class="prettyprint linenums">$('#element').popover('hide')</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Alert
|
||||
================================================== -->
|
||||
<section id="alerts">
|
||||
<!-- Alert
|
||||
================================================== -->
|
||||
<section id="alerts">
|
||||
<div class="page-header">
|
||||
<h1>Alert messages <small>bootstrap-alert.js</small></h1>
|
||||
</div>
|
||||
@ -863,17 +877,17 @@ e.relatedTarget // previous tab
|
||||
</table>
|
||||
<pre class="prettyprint linenums">
|
||||
$('#my-alert').bind('closed', function () {
|
||||
// do something ...
|
||||
// do something ...
|
||||
})</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Buttons
|
||||
================================================== -->
|
||||
<section id="buttons">
|
||||
<!-- Buttons
|
||||
================================================== -->
|
||||
<section id="buttons">
|
||||
<div class="page-header">
|
||||
<h1>Buttons <small>bootstrap-button.js</small></h1>
|
||||
</div>
|
||||
@ -936,16 +950,16 @@ $('#my-alert').bind('closed', function () {
|
||||
|
||||
<!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group -->
|
||||
<div class="btn-group" data-toggle="buttons-checkbox">
|
||||
<button class="btn">Left</button>
|
||||
<button class="btn">Middle</button>
|
||||
<button class="btn">Right</button>
|
||||
<button class="btn">Left</button>
|
||||
<button class="btn">Middle</button>
|
||||
<button class="btn">Right</button>
|
||||
</div>
|
||||
|
||||
<!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group -->
|
||||
<div class="btn-group" data-toggle="buttons-radio">
|
||||
<button class="btn">Left</button>
|
||||
<button class="btn">Middle</button>
|
||||
<button class="btn">Right</button>
|
||||
<button class="btn">Left</button>
|
||||
<button class="btn">Middle</button>
|
||||
<button class="btn">Right</button>
|
||||
</div>
|
||||
</pre>
|
||||
<h3>Methods</h3>
|
||||
@ -966,17 +980,17 @@ $('#my-alert').bind('closed', function () {
|
||||
<p>Resets button state - swaps text to any data defined text state.</p>
|
||||
<pre class="prettyprint linenums"><button class="btn" data-complete-text="finished!" >...</button>
|
||||
<script>
|
||||
$('.btn').button('complete')
|
||||
$('.btn').button('complete')
|
||||
</script></pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Collapse
|
||||
================================================== -->
|
||||
<section id="collapse">
|
||||
<!-- Collapse
|
||||
================================================== -->
|
||||
<section id="collapse">
|
||||
<div class="page-header">
|
||||
<h1>Collapse <small>bootstrap-collapse.js</small></h1>
|
||||
</div>
|
||||
@ -1063,7 +1077,7 @@ $('.btn').button('complete')
|
||||
<p>Just add <code>data-toggle="collapse"</code> and a <code>data-target</code> to element to automatically assign control of a collapsible element. The <code>data-target</code> attribute accepts a css selector to apply the collapse to. Be sure to add the class <code>collapse</code> to the collapsible element. If you'd like it to default open, add the additional class <code>in</code>.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<button class="btn danger" data-toggle="collapse" data-target="#demo">
|
||||
simple collapsible
|
||||
simple collapsible
|
||||
</button>
|
||||
|
||||
<div id="demo" class="collapse in"> … </div></pre>
|
||||
@ -1073,7 +1087,7 @@ simple collapsible
|
||||
<p>Activates your content as a collapsible element. Accepts an optional options <code>object</code>.
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myCollapsible').collapse({
|
||||
toggle: false
|
||||
toggle: false
|
||||
})</pre>
|
||||
<h4>.collapse('toggle')</h4>
|
||||
<p>Toggles a collapsible element to shown or hidden.</p>
|
||||
@ -1116,17 +1130,17 @@ toggle: false
|
||||
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myCollapsible').on('hidden', function () {
|
||||
// do something ...
|
||||
// do something ...
|
||||
})</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Carousel
|
||||
================================================== -->
|
||||
<section id="carousel">
|
||||
================================================== -->
|
||||
<section id="carousel">
|
||||
<div class="page-header">
|
||||
<h1>Carousel <small>bootstrap-carousel.js</small></h1>
|
||||
</div>
|
||||
@ -1193,13 +1207,13 @@ $('#myCollapsible').on('hidden', function () {
|
||||
<p>Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="carousel">
|
||||
<!-- Carousel items -->
|
||||
<div class="carousel-inner">
|
||||
...
|
||||
</div>
|
||||
<!-- Carousel nav -->
|
||||
<a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
|
||||
<a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
|
||||
<!-- Carousel items -->
|
||||
<div class="carousel-inner">
|
||||
...
|
||||
</div>
|
||||
<!-- Carousel nav -->
|
||||
<a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
|
||||
<a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
|
||||
</div>
|
||||
</pre>
|
||||
<h3>Methods</h3>
|
||||
@ -1207,7 +1221,7 @@ $('#myCollapsible').on('hidden', function () {
|
||||
<p>Initializes the carousel with an optional options <code>object</code> and starts cycling through items.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
$('.myCarousel').carousel({
|
||||
interval: 2000
|
||||
interval: 2000
|
||||
})
|
||||
</pre>
|
||||
<h4>.carousel('cycle')</h4>
|
||||
@ -1243,13 +1257,13 @@ interval: 2000
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Typeahead
|
||||
================================================== -->
|
||||
<section id="typeahead">
|
||||
<!-- Typeahead
|
||||
================================================== -->
|
||||
<section id="typeahead">
|
||||
<div class="page-header">
|
||||
<h1>Typeahead <small>bootstrap-typeahead.js</small></h1>
|
||||
</div>
|
||||
@ -1296,4 +1310,4 @@ interval: 2000
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
14
docs/templates/pages/scaffolding.mustache
vendored
14
docs/templates/pages/scaffolding.mustache
vendored
@ -1,10 +1,14 @@
|
||||
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<!-- 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>
|
||||
<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>
|
||||
|
||||
|
||||
|
||||
|
8
docs/templates/pages/upgrading.mustache
vendored
8
docs/templates/pages/upgrading.mustache
vendored
@ -1,9 +1,9 @@
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<h1>Upgrading to Bootstrap 2</h1>
|
||||
<p class="lead">Learn about significant changes and additions since v1.4 with this handy guide.</p>
|
||||
</header>
|
||||
</header>
|
||||
|
||||
|
||||
<h2>Rough outline</h2>
|
||||
|
@ -34,72 +34,23 @@
|
||||
<div class="container">
|
||||
<a class="brand" href="./index.html">Bootstrap</a>
|
||||
<ul class="nav">
|
||||
<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>
|
||||
<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 class="">
|
||||
<a href="./index.html">Overview</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./less.html">
|
||||
Using LESS
|
||||
</a>
|
||||
<a href="./scaffolding.html">Scaffolding</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./base-css.html">Base CSS</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./components.html">Components</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./javascript.html">Javascript plugins</a>
|
||||
</li>
|
||||
<li class="">
|
||||
<a href="./less.html">Using LESS</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@ -108,12 +59,12 @@
|
||||
|
||||
<div class="container">
|
||||
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<h1>Upgrading to Bootstrap 2</h1>
|
||||
<p class="lead">Learn about significant changes and additions since v1.4 with this handy guide.</p>
|
||||
</header>
|
||||
</header>
|
||||
|
||||
|
||||
<h2>Rough outline</h2>
|
||||
|
Loading…
x
Reference in New Issue
Block a user