diff options
| author | Jacob Thornton <[email protected]> | 2012-06-01 10:53:47 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-06-01 10:53:47 -0700 |
| commit | 5657ab46c5351d5a5718eff3e8f7acf5cb43f752 (patch) | |
| tree | ef81c0025662070b5a0e265f5c30155189f74e6f /docs/javascript.html | |
| parent | a85c8fe74e2bea9c99ad405dd667035b5307e31e (diff) | |
| parent | 4eaeea81fd909e6711f57049fc4372f4045fa5aa (diff) | |
| download | bootstrap-5657ab46c5351d5a5718eff3e8f7acf5cb43f752.tar.xz bootstrap-5657ab46c5351d5a5718eff3e8f7acf5cb43f752.zip | |
Merge branch '2.0.4-wip'
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 97 |
1 files changed, 37 insertions, 60 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 7ad42ae81..6d06ff6d1 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -24,6 +24,7 @@ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> + </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> @@ -34,11 +35,11 @@ <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> - <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> - </a> + </button> <a class="brand" href="./index.html">Bootstrap</a> <div class="nav-collapse collapse"> <ul class="nav"> @@ -107,82 +108,58 @@ </div> <div class="row"> <div class="span3"> - <label> - <h3><a href="./javascript.html#modals">Modals</a></h3> - <p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p> - </label> + <h3><a href="./javascript.html#modals">Modals</a></h3> + <p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p> </div> <div class="span3"> - <label> - <h3><a href="./javascript.html#dropdowns">Dropdowns</a></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> + <h3><a href="./javascript.html#dropdowns">Dropdowns</a></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> </div> <div class="span3"> - <label> - <h3><a href="./javascript.html#scrollspy">Scrollspy</a></h3> - <p>Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.</p> - </label> + <h3><a href="./javascript.html#scrollspy">Scrollspy</a></h3> + <p>Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.</p> </div> <div class="span3"> - <label> - <h3><a href="./javascript.html#tabs">Togglable tabs</a></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> + <h3><a href="./javascript.html#tabs">Togglable tabs</a></h3> + <p>Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.</p> </div> </div> <!-- /row --> <div class="row"> <div class="span3"> - <label> - <h3><a href="./javascript.html#tooltips">Tooltips</a></h3> - <p>A new take on the jQuery Tipsy plugin, Tooltips don't rely on images—they use CSS3 for animations and data-attributes for local title storage.</p> - </label> + <h3><a href="./javascript.html#tooltips">Tooltips</a></h3> + <p>A new take on the jQuery Tipsy plugin, Tooltips don't rely on images—they use CSS3 for animations and data-attributes for local title storage.</p> </div> <div class="span3"> - <label> - <h3><a href="./javascript.html#popovers">Popovers</a> <small class="muted">*</small></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> + <h3><a href="./javascript.html#popovers">Popovers</a> <small class="muted">*</small></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> </div> <div class="span3"> - <label> - <h3><a href="./javascript.html#alerts">Alert messages</a></h3> - <p>The alert plugin is a tiny class for adding close functionality to alerts.</p> - </label> + <h3><a href="./javascript.html#alerts">Alert messages</a></h3> + <p>The alert plugin is a tiny class for adding close functionality to alerts.</p> </div> <div class="span3"> - <label> - <h3><a href="./javascript.html#buttons">Buttons</a></h3> - <p>Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p> - </label> + <h3><a href="./javascript.html#buttons">Buttons</a></h3> + <p>Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p> </div> </div> <!-- /row --> <div class="row" style="margin-bottom: 9px;"> <div class="span3"> - <label> - <h3><a href="./javascript.html#collapse">Collapse</a></h3> - <p>Get base styles and flexible support for collapsible components like accordions and navigation.</p> - </label> + <h3><a href="./javascript.html#collapse">Collapse</a></h3> + <p>Get base styles and flexible support for collapsible components like accordions and navigation.</p> </div> <div class="span3"> - <label> - <h3><a href="./javascript.html#carousel">Carousel</a></h3> - <p>Create a merry-go-round of any content you wish to provide an interactive slideshow of content.</p> - </label> + <h3><a href="./javascript.html#carousel">Carousel</a></h3> + <p>Create a merry-go-round of any content you wish to provide an interactive slideshow of content.</p> </div> <div class="span3"> - <label> - <h3><a href="./javascript.html#typeahead">Typeahead</a></h3> - <p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p> - </label> + <h3><a href="./javascript.html#typeahead">Typeahead</a></h3> + <p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p> </div> <div class="span3"> - <label> - <h3>Transitions <small class="muted">*</small></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> + <h3>Transitions <small class="muted">*</small></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> </div> </div> <!-- /row --> <div class="alert alert-info"><strong>Heads up!</strong> All javascript plugins require the latest version of jQuery.</div> @@ -208,7 +185,7 @@ <div class="well modal-example" style="background-color: #888; border: none;"> <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1; max-width: 100%;"> <div class="modal-header"> - <button class="close" data-dismiss="modal">×</button> + <button type="button" class="close" data-dismiss="modal">×</button> <h3>Modal header</h3> </div> <div class="modal-body"> @@ -226,7 +203,7 @@ <!-- sample modal content --> <div id="myModal" class="modal hide fade"> <div class="modal-header"> - <button class="close" data-dismiss="modal">×</button> + <button type="button" class="close" data-dismiss="modal">×</button> <h3>Modal Heading</h3> </div> <div class="modal-body"> @@ -301,16 +278,16 @@ </pre> <pre class="prettyprint linenums"> -<div class="modal" id="myModal"> +<div class="modal hide" id="myModal"> <div class="modal-header"> - <button class="close" data-dismiss="modal">×</button> + <button type="button" class="close" data-dismiss="modal">×</button> <h3>Modal header</h3> </div> <div class="modal-body"> <p>One fine body…</p> </div> <div class="modal-footer"> - <a href="#" class="btn">Close</a> + <a href="#" class="btn" data-dismiss="modal">Close</a> <a href="#" class="btn btn-primary">Save changes</a> </div> </div> @@ -978,11 +955,11 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <h2>Example alerts</h2> <p>The alerts plugin works on regular alert messages, and block messages.</p> <div class="alert fade in"> - <button class="close" data-dismiss="alert">×</button> + <button type="button" class="close" data-dismiss="alert">×</button> <strong>Holy guacamole!</strong> Best check yo self, you're not looking too good. </div> <div class="alert alert-block alert-error fade in"> - <button class="close" data-dismiss="alert">×</button> + <button type="button" class="close" data-dismiss="alert">×</button> <h4 class="alert-heading">Oh snap! You got an error!</h4> <p>Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p> <p> @@ -1371,7 +1348,7 @@ $('#myCollapsible').on('hidden', function () { <h3>Markup</h3> <p>Data attributes are used for the previous and next conrols. Check out the example markup below.</p> <pre class="prettyprint linenums"> -<div id="myCarousel" class="carousel"> +<div id="myCarousel" class="carousel slide"> <!-- Carousel items --> <div class="carousel-inner"> <div class="active item">…</div> |