diff options
| author | Chris Rebert <[email protected]> | 2014-06-30 21:11:21 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-06-30 21:11:21 -0700 |
| commit | 6d3086b7720814bcd50e37c2126ae9d7b7cb0ade (patch) | |
| tree | 2e2ff6a88c3b72e35a41df53fcf6ecc091dd4a3e /javascript | |
| parent | 709ae8ef611d23e7cc5b997e2be9c0f90d4a6261 (diff) | |
| download | bootstrap-6d3086b7720814bcd50e37c2126ae9d7b7cb0ade.tar.xz bootstrap-6d3086b7720814bcd50e37c2126ae9d7b7cb0ade.zip | |
regenerate with fixes applied
Diffstat (limited to 'javascript')
| -rw-r--r-- | javascript/index.html | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/javascript/index.html b/javascript/index.html index f06068a81..21429d6f9 100644 --- a/javascript/index.html +++ b/javascript/index.html @@ -241,7 +241,7 @@ <div class="modal-header"> <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> - <h4 class="modal-title" id="myModalLabel">Modal Heading</h4> + <h4 class="modal-title" id="myModalLabel">Modal title</h4> </div> <div class="modal-body"> <h4>Text in a modal</h4> @@ -988,16 +988,16 @@ <h4>Multiple-line links</h4> <p>Sometimes you want to add a tooltip to a hyperlink that wraps multiple lines. The default behavior of the tooltip plugin is to center it horizontally and vertically. Add <code>white-space: nowrap;</code> to your anchors to avoid this.</p> </div> -<div class="highlight"><pre><code class="html"><span class="lineno"> 1</span> <span class="c"><!-- HTML to write --></span> -<span class="lineno"> 2</span> <span class="nt"><a</span> <span class="na">href=</span><span class="s">"#"</span> <span class="na">data-toggle=</span><span class="s">"tooltip"</span> <span class="na">title=</span><span class="s">"Some tooltip text!"</span><span class="nt">></span>Hover over me<span class="nt"></a></span> -<span class="lineno"> 3</span> -<span class="lineno"> 4</span> <span class="c"><!-- Generated markup by the plugin --></span> -<span class="lineno"> 5</span> <span class="nt"><div</span> <span class="na">class=</span><span class="s">"tooltip top"</span> <span class="na">role=</span><span class="s">"tooltip"</span><span class="nt">></span> -<span class="lineno"> 6</span> <span class="nt"><div</span> <span class="na">class=</span><span class="s">"tooltip-arrow"</span><span class="nt">></div></span> -<span class="lineno"> 7</span> <span class="nt"><div</span> <span class="na">class=</span><span class="s">"tooltip-inner"</span><span class="nt">></span> -<span class="lineno"> 8</span> Some tooltip text! -<span class="lineno"> 9</span> <span class="nt"></div></span> -<span class="lineno">10</span> <span class="nt"></div></span></code></pre></div> +<div class="highlight"><pre><code class="html"><span class="c"><!-- HTML to write --></span> +<span class="nt"><a</span> <span class="na">href=</span><span class="s">"#"</span> <span class="na">data-toggle=</span><span class="s">"tooltip"</span> <span class="na">title=</span><span class="s">"Some tooltip text!"</span><span class="nt">></span>Hover over me<span class="nt"></a></span> + +<span class="c"><!-- Generated markup by the plugin --></span> +<span class="nt"><div</span> <span class="na">class=</span><span class="s">"tooltip top"</span> <span class="na">role=</span><span class="s">"tooltip"</span><span class="nt">></span> + <span class="nt"><div</span> <span class="na">class=</span><span class="s">"tooltip-arrow"</span><span class="nt">></div></span> + <span class="nt"><div</span> <span class="na">class=</span><span class="s">"tooltip-inner"</span><span class="nt">></span> + Some tooltip text! + <span class="nt"></div></span> +<span class="nt"></div></span></code></pre></div> <h3>Options</h3> <p>Options can be passed via data attributes or JavaScript. For data attributes, append the option name to <code>data-</code>, as in <code>data-animation=""</code>.</p> @@ -1990,7 +1990,7 @@ <h3>Via data attributes</h3> <p>Use data attributes to easily control the position of the carousel. <code>data-slide</code> accepts the keywords <code>prev</code> or <code>next</code>, which alters the slide position relative to its current position. Alternatively, use <code>data-slide-to</code> to pass a raw slide index to the carousel <code>data-slide-to="2"</code>, which shifts the slide position to a particular index beginning with <code>0</code>.</p> - <p>The <code>data-ride="carousel"</code> attribute is used to mark a carousel as animating starting at page load.</p> + <p>The <code>data-ride="carousel"</code> attribute is used to mark a carousel as animating starting at page load. <strong class="text-danger">It cannot be used in combination with (redundant and unnecessary) explicit JavaScript initialization of the same carousel.</strong></p> <h3>Via JavaScript</h3> <p>Call carousel manually with:</p> |