* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
++<<<<<<< HEAD
+ * Date: Mon Jan 23 14:12:25 PST 2012
++=======
+ * Date: Mon Jan 23 13:48:03 PST 2012
++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
*/
- html, body {
- margin: 0;
- padding: 0;
- }
- h1,
- h2,
- h3,
- h4,
- h5,
- h6,
- p,
- blockquote,
- pre,
- a,
- abbr,
- acronym,
- address,
- cite,
- code,
- del,
- dfn,
- em,
- img,
- q,
- s,
- samp,
- small,
- strike,
- strong,
- sub,
- sup,
- tt,
- var,
- dd,
- dl,
- dt,
- li,
- ol,
- ul,
- fieldset,
- form,
- label,
- legend,
- button,
- table,
- caption,
- tbody,
- tfoot,
- thead,
- tr,
- th,
- td {
- margin: 0;
- padding: 0;
- border: 0;
- font-weight: normal;
- font-style: normal;
- font-size: 100%;
- line-height: 1;
- font-family: inherit;
- }
- table {
- max-width: 100%;
- border-collapse: collapse;
- border-spacing: 0;
- }
- ol, ul {
- list-style: none;
- }
- q:before,
- q:after,
- blockquote:before,
- blockquote:after {
- content: "";
- }
- html {
- overflow-y: scroll;
- font-size: 100%;
- -webkit-text-size-adjust: 100%;
- -ms-text-size-adjust: 100%;
- }
- a:focus {
- outline: thin dotted;
- }
- a:hover, a:active {
- outline: 0;
- }
article,
aside,
details,
<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>
+ <a href="./scaffolding.html">Scaffolding</a>
++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li>
- <li class="dropdown active">
- <a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown">
- Base CSS
- <b class="caret"></b>
- </a>
- <ul class="dropdown-menu">
- <li><a href="./base-css.html#typography">Typography</a></li>
- <li><a href="./base-css.html#tables">Tables</a></li>
- <li><a href="./base-css.html#forms">Forms</a></li>
- <li><a href="./base-css.html#buttons">Buttons</a></li>
- <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
- </ul>
+ <li class="active">
+ <a href="./base-css.html">Base CSS</a>
</li>
++<<<<<<< HEAD
+ <li class="dropdown ">
+ <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
+ Components
+ <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>
+ <a href="./javascript.html">Javascript plugins</a>
+ </li>
+ <li>
+ <a href="./less.html">Using LESS</a>
++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li>
</ul>
</div>
<div class="container">
++<<<<<<< HEAD
+<!-- Masthead
+================================================== -->
+<header class="jumbotron subhead" id="overview">
+ <h1>Base CSS</h1>
+ <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
+</header>
++=======
+ <!-- Masthead
+ ================================================== -->
+ <header class="jumbotron subhead" id="overview">
+ <h1>Base CSS</h1>
+ <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
+ <ul class="nav pills">
+ <li><a href="./base-css.html#typography">Typography</a></li>
+ <li><a href="./base-css.html#tables">Tables</a></li>
+ <li><a href="./base-css.html#forms">Forms</a></li>
+ <li><a href="./base-css.html#buttons">Buttons</a></li>
+ <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+ </ul>
+ </header>
++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
<!-- Typography
<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>
+ <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>
+ <a href="./scaffolding.html">Scaffolding</a>
</li>
- <li class="dropdown active">
- <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="./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>
+ <a href="./less.html">Using LESS</a>
++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li>
</ul>
</div>
<div class="container">
++<<<<<<< HEAD
+<!-- Masthead
+================================================== -->
+<header class="jumbotron subhead" id="overview">
+ <h1>Components</h1>
+ <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
+</header>
++=======
+ <!-- Masthead
+ ================================================== -->
+ <header class="jumbotron subhead" id="overview">
+ <h1>Components</h1>
+ <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
+ <ul class="nav pills">
+ <li><a href="./components.html#buttonGroups">Button groups</a></li>
+ <li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
+ <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+ <li><a href="./components.html#navbar">Navbar</a></li>
+ <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+ <li><a href="./components.html#pagination">Pagination</a></li>
+ <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+ <li><a href="./components.html#alerts">Alerts</a></li>
+ <li><a href="./components.html#progress">Progress bars</a></li>
+ </ul>
+ </header>
+
++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
<!-- Button Groups
<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>
+ <li class="">
+ <a href="./less.html">
+ Using LESS
+ </a>
++=======
+ <li>
+ <a href="./scaffolding.html">Scaffolding</a>
+ </li>
+ <li>
+ <a href="./base-css.html">Base CSS</a>
+ </li>
+ <li>
+ <a href="./components.html">Components</a>
+ </li>
+ <li>
+ <a href="./javascript.html">Javascript plugins</a>
+ </li>
+ <li>
+ <a href="./less.html">Using LESS</a>
++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li>
</ul>
</div>
<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>
+ <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>
+ <a href="./scaffolding.html">Scaffolding</a>
</li>
- <li class="dropdown active">
- <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="./base-css.html">Base CSS</a>
+ </li>
+ <li>
+ <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>
</div>
<div class="container">
++<<<<<<< HEAD
++=======
+ <!-- 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.
+ <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>
++>>>>>>> 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
- ================================================== -->
- <section id="javascript">
- <div class="page-header">
- <h1>jQuery plugins <small>A dozen Bootstrap plugins to get you started</small></h1>
- </div>
- <div class="row">
- <div class="span3">
- <label>
- <h3><a href="./javascript.html#modals">Modals</a><input checked="true" value="bootstrap-modal.js" type="checkbox"></h3>
- <p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p>
- </label>
- </div>
- <div class="span3">
- <label>
- <h3><a href="./javascript.html#dropdowns">Dropdowns</a><input checked="true" value="bootstrap-dropdown.js" type="checkbox"></h3>
- <p>Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.</p>
- </label>
- </div>
- <div class="span3">
- <label>
- <h3><a href="./javascript.html#scrollspy">Scrollspy</a><input checked="true" value="bootstrap-scrollspy.js" type="checkbox"></h3>
- <p>Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.</p>
- </label>
- </div>
- <div class="span3">
- <label>
- <h3><a href="./javascript.html#tabs">Togglable tabs</a><input checked="true" value="bootstrap-tab.js" type="checkbox"></h3>
- <p>Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.</p>
- </label>
- </div>
- </div> <!-- /row -->
- <div class="row">
- <div class="span3">
- <label>
- <h3><a href="./javascript.html#tooltips">Tooltips</a><input checked="true" value="bootstrap-tooltip.js" type="checkbox"></h3>
- <p>A new take on the jQuery Tipsy plugin, Tooltips don't rely on images, uss CSS3 for animations, and data-attributes for local title storage.</p>
- </label>
- </div>
- <div class="span3">
- <label>
- <h3><a href="./javascript.html#popovers">Popovers</a> <small class="muted">*</small><input checked="true" value="bootstrap-popover.js" type="checkbox"></h3>
- <p>Add small overlays of content, like those on the iPad, to any element for housing secondary information.</p>
- <p class="muted"><strong>*</strong> Requires <a href="#tooltips">Tooltips</a> to be included</p>
- </label>
- </div>
- <div class="span3">
- <label>
- <h3><a href="./javascript.html#alerts">Alert messages</a><input checked="true" value="bootstrap-alert.js" type="checkbox"></h3>
- <p>The alert plugin is a tiny class for adding close functionality to alerts.</p>
- </label>
- </div>
- <div class="span3">
- <label>
- <h3><a href="./javascript.html#buttons">Buttons</a><input checked="true" value="bootstrap-button.js" type="checkbox"></h3>
- <p>Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p>
- </label>
- </div>
- </div> <!-- /row -->
- <div class="row">
- <div class="span3">
- <label>
- <h3><a href="./javascript.html#collapse">Collapse</a><input checked="true" value="bootstrap-collapse.js" type="checkbox"></h3>
- <p>Get base styles and flexible support for collapsible components like accordions and navigation.</p>
- </label>
- </div>
- <div class="span3">
- <label>
- <h3><a href="./javascript.html#carousel">Carousel</a><input checked="true" value="bootstrap-carousel.js" type="checkbox"></h3>
- <p>Create a merry-go-round of any content you wish to provide an interactive slideshow of content.</p>
- </label>
- </div>
- <div class="span3">
- <label>
- <h3><a href="./javascript.html#typeahead">Typeahead</a><input checked="true" value="bootstrap-typeahead.js" type="checkbox"></h3>
- <p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p>
- </label>
- </div>
- <div class="span3">
- <label>
- <h3><a href="./javascript.html#transitions">Transitions</a> <small class="muted">*</small><input value="bootstrap-transition.js" checked="true" type="checkbox"></h3>
- <p>For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.</p>
- <p class="muted"><strong>*</strong> Required for animation in plugins</p>
- </label>
- </div>
- </div> <!-- /row -->
- <div class="row">
- <div class="span5">
- <div class="btn-group" id="javascriptBuilder">
- <a id="javascriptBuild" class="btn primary large" href="#">Download Source</a>
- <a class="btn primary large dropdown-toggle" data-toggle="dropdown" href="#">
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu large">
- <li class="active"><a href="#">Compressed</a></li>
- <li><a href="#">Uncompressed</a></li>
- </ul>
+
+ <!-- Using Javascript w/ Bootstrap
+ ================================================== -->
+ <section id="javascript">
+ <div class="page-header">
+ <h1>jQuery plugins <small>A dozen Bootstrap plugins to get you started</small></h1>
+ </div>
+ <div class="row">
+ <div class="span3">
+ <label>
+ <h3><a href="./javascript.html#modals">Modals</a><input checked="true" value="bootstrap-modal.js" type="checkbox"></h3>
+ <p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p>
+ </label>
+ </div>
+ <div class="span3">
+ <label>
+ <h3><a href="./javascript.html#dropdowns">Dropdowns</a><input checked="true" value="bootstrap-dropdown.js" type="checkbox"></h3>
+ <p>Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.</p>
+ </label>
+ </div>
+ <div class="span3">
+ <label>
+ <h3><a href="./javascript.html#scrollspy">Scrollspy</a><input checked="true" value="bootstrap-scrollspy.js" type="checkbox"></h3>
+ <p>Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.</p>
+ </label>
+ </div>
+ <div class="span3">
+ <label>
+ <h3><a href="./javascript.html#tabs">Togglable tabs</a><input checked="true" value="bootstrap-tab.js" type="checkbox"></h3>
+ <p>Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.</p>
+ </label>
+ </div>
+ </div> <!-- /row -->
+ <div class="row">
+ <div class="span3">
+ <label>
+ <h3><a href="./javascript.html#tooltips">Tooltips</a><input checked="true" value="bootstrap-tooltip.js" type="checkbox"></h3>
+ <p>A new take on the jQuery Tipsy plugin, Tooltips don't rely on images, uss CSS3 for animations, and data-attributes for local title storage.</p>
+ </label>
+ </div>
+ <div class="span3">
+ <label>
+ <h3><a href="./javascript.html#popovers">Popovers</a> <small class="muted">*</small><input checked="true" value="bootstrap-popover.js" type="checkbox"></h3>
+ <p>Add small overlays of content, like those on the iPad, to any element for housing secondary information.</p>
+ <p class="muted"><strong>*</strong> Requires <a href="#tooltips">Tooltips</a> to be included</p>
+ </label>
+ </div>
+ <div class="span3">
+ <label>
+ <h3><a href="./javascript.html#alerts">Alert messages</a><input checked="true" value="bootstrap-alert.js" type="checkbox"></h3>
+ <p>The alert plugin is a tiny class for adding close functionality to alerts.</p>
+ </label>
+ </div>
+ <div class="span3">
+ <label>
+ <h3><a href="./javascript.html#buttons">Buttons</a><input checked="true" value="bootstrap-button.js" type="checkbox"></h3>
+ <p>Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p>
+ </label>
+ </div>
+ </div> <!-- /row -->
+ <div class="row">
+ <div class="span3">
+ <label>
+ <h3><a href="./javascript.html#collapse">Collapse</a><input checked="true" value="bootstrap-collapse.js" type="checkbox"></h3>
+ <p>Get base styles and flexible support for collapsible components like accordions and navigation.</p>
+ </label>
+ </div>
+ <div class="span3">
+ <label>
+ <h3><a href="./javascript.html#carousel">Carousel</a><input checked="true" value="bootstrap-carousel.js" type="checkbox"></h3>
+ <p>Create a merry-go-round of any content you wish to provide an interactive slideshow of content.</p>
+ </label>
+ </div>
+ <div class="span3">
+ <label>
+ <h3><a href="./javascript.html#typeahead">Typeahead</a><input checked="true" value="bootstrap-typeahead.js" type="checkbox"></h3>
+ <p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p>
+ </label>
+ </div>
+ <div class="span3">
+ <label>
+ <h3><a href="./javascript.html#transitions">Transitions</a> <small class="muted">*</small><input value="bootstrap-transition.js" checked="true" type="checkbox"></h3>
+ <p>For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.</p>
+ <p class="muted"><strong>*</strong> Required for animation in plugins</p>
+ </label>
+ </div>
+ </div> <!-- /row -->
+ <div class="row">
+ <div class="span5">
+ <div class="btn-group" id="javascriptBuilder">
+ <a id="javascriptBuild" class="btn primary large" href="#">Download Source</a>
+ <a class="btn primary large dropdown-toggle" data-toggle="dropdown" href="#">
+ <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu large">
+ <li class="active"><a href="#">Compressed</a></li>
+ <li><a href="#">Uncompressed</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <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>
+
+
+
+<!-- Modal
+================================================== -->
+<section id="modals">
+ <div class="page-header">
+ <h1>Modals <small>bootstrap-modal.js</small></h1>
+ </div>
+ <div class="row">
+ <div class="span3 columns">
+ <h3>About modals</h3>
+ <p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p>
+ <a href="../js/bootstrap-modal.js" target="_blank" class="btn">Download file</a>
+ </div>
+ <div class="span9 columns">
+ <h2>Static example</h2>
+ <p>Below is a statically rendered modal.</p>
+ <div class="well" style="background-color: #888; border: none;">
+ <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
+ <div class="modal-header">
+ <a href="#" class="close" data-dismiss="modal">×</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>
- </div>
- <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>
-
+ </div> <!-- /well -->
+
+ <h2>Live demo</h2>
+ <p>Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.</p>
+ <!-- sample modal content -->
+ <div id="myModal" class="modal hide fade">
+ <div class="modal-header">
+ <a href="#" class="close" data-dismiss="modal" >×</a>
+ <h3>Modal Heading</h3>
+ </div>
+ <div class="modal-body">
+ <h4>Text in a modal</h4>
+ <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.</p>
+ <h4>Popover in a modal</h4>
+ <p>This <a href="#" class="btn" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">button</a> should trigger a popover on hover.</p>
- <!-- Modal
- ================================================== -->
- <section id="modals">
- <div class="page-header">
- <h1>Modals <small>bootstrap-modal.js</small></h1>
- </div>
- <div class="row">
- <div class="span3 columns">
- <h3>About modals</h3>
- <p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p>
- <a href="../js/bootstrap-modal.js" target="_blank" class="btn">Download file</a>
+ <h4>Tooltips in a modal</h4>
+ <p><a href="#" class="tooltip-test" title="Tooltip">This link</a> and <a href="#" class="tooltip-test" title="Tooltip">that link</a> should have tooltips on hover.</p>
</div>
- <div class="span9 columns">
- <h2>Static example</h2>
- <p>Below is a statically rendered modal.</p>
- <div class="well" style="background-color: #888; border: none;">
- <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
- <div class="modal-header">
- <a href="#" class="close" data-dismiss="modal">×</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>
- </div> <!-- /well -->
-
- <h2>Live demo</h2>
- <p>Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.</p>
- <!-- sample modal content -->
- <div id="myModal" class="modal hide fade">
- <div class="modal-header">
- <a href="#" class="close" data-dismiss="modal" >×</a>
- <h3>Modal Heading</h3>
- </div>
- <div class="modal-body">
- <h4>Text in a modal</h4>
- <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.</p>
+ <div class="modal-footer">
+ <a href="#" class="btn primary">Save changes</a>
+ <a href="#" class="btn" data-dismiss="modal" >Close</a>
+ </div>
+ </div>
+ <a data-toggle="modal" href="#myModal" class="btn primary large">Launch demo modal</a>
- <h4>Popover in a modal</h4>
- <p>This <a href="#" class="btn" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">button</a> should trigger a popover on hover.</p>
+ <hr>
- <h4>Tooltips in a modal</h4>
- <p><a href="#" class="tooltip-test" title="Tooltip">This link</a> and <a href="#" class="tooltip-test" title="Tooltip">that link</a> should have tooltips on hover.</p>
- </div>
- <div class="modal-footer">
- <a href="#" class="btn primary">Save changes</a>
- <a href="#" class="btn" data-dismiss="modal" >Close</a>
- </div>
- </div>
- <a data-toggle="modal" href="#myModal" class="btn primary large">Launch demo modal</a>
-
- <hr>
-
- <h2>Using bootstrap-modal</h2>
- <p>Call the modal via javascript:</p>
- <pre class="prettyprint linenums">$('#myModal').modal(options)</pre>
- <h3>Options</h3>
- <table class="table table-bordered table-striped">
- <thead>
- <tr>
- <th style="width: 100px;">Name</th>
- <th style="width: 50px;">type</th>
- <th style="width: 50px;">default</th>
- <th>description</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>backdrop</td>
- <td>boolean</td>
- <td>true</td>
- <td>Includes a modal-backdrop element</td>
- </tr>
- <tr>
- <td>keyboard</td>
- <td>boolean</td>
- <td>true</td>
- <td>Closes the modal when escape key is pressed</td>
- </tr>
- </tbody>
- </table>
- <h3>Markup</h3>
- <p>You can activate modals on your page easily without having to write a single line of javascript. Just set <code>data-toggle="modal"</code> on a controller element with a <code>data-target="#foo"</code> or <code>href="#foo"</code> which corresponds to a modal element id, and when clicked, it will launch your modal.</p>
- <p>Also, to add options to your modal instance, just include them as additional data attributes on either the control element or the modal markup itself.</p>
+ <h2>Using bootstrap-modal</h2>
+ <p>Call the modal via javascript:</p>
+ <pre class="prettyprint linenums">$('#myModal').modal(options)</pre>
+ <h3>Options</h3>
+ <table class="table table-bordered table-striped">
+ <thead>
+ <tr>
+ <th style="width: 100px;">Name</th>
+ <th style="width: 50px;">type</th>
+ <th style="width: 50px;">default</th>
+ <th>description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>backdrop</td>
+ <td>boolean</td>
+ <td>true</td>
+ <td>Includes a modal-backdrop element</td>
+ </tr>
+ <tr>
+ <td>keyboard</td>
+ <td>boolean</td>
+ <td>true</td>
+ <td>Closes the modal when escape key is pressed</td>
+ </tr>
+ </tbody>
+ </table>
+ <h3>Markup</h3>
+ <p>You can activate modals on your page easily without having to write a single line of javascript. Just set <code>data-toggle="modal"</code> on a controller element with a <code>data-target="#foo"</code> or <code>href="#foo"</code> which corresponds to a modal element id, and when clicked, it will launch your modal.</p>
+ <p>Also, to add options to your modal instance, just include them as additional data attributes on either the control element or the modal markup itself.</p>
<pre class="prettyprint linenums">
<a class="btn" data-toggle="modal" href="#myModal" >Launch Modal</a>
</pre>
<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>
+ <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>
+ <a href="./scaffolding.html">Scaffolding</a>
+ </li>
+ <li>
+ <a href="./base-css.html">Base CSS</a>
+ </li>
+ <li>
+ <a href="./components.html">Components</a>
+ </li>
+ <li>
+ <a href="./javascript.html">Javascript plugins</a>
++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li>
<li class="active">
- <a href="./less.html">
- Using LESS
- </a>
+ <a href="./less.html">Using LESS</a>
</li>
</ul>
</div>
<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>
+ <li class="active">
+ <a href="./scaffolding.html">Scaffolding</a>
+ </li>
+ <li>
+ <a href="./base-css.html">Base CSS</a>
+ </li>
+ <li>
+ <a href="./components.html">Components</a>
+ </li>
+ <li>
+ <a href="./javascript.html">Javascript plugins</a>
+ </li>
+ <li>
+ <a href="./less.html">Using LESS</a>
++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
</li>
</ul>
</div>
<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">
+ <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>
+ <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>
++>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
projects / thirdparty / bootstrap.git / commitdiff
