diff options
| author | Mark Otto <otto@github.com> | 2013-03-15 00:25:59 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2013-03-15 00:25:59 +0400 |
| commit | 00169b48bd69ee0e203cfb557de99887811b924e (patch) | |
| tree | 7e35a8d20e9c6502b4f9b6b66b9acc27e7e42588 /docs | |
| parent | d219b8b96479f3390f37a6d14f1ee3fc12192221 (diff) | |
| parent | 7bff231ea5263796bbe948da6aa996bac3a9136b (diff) | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
less/grid.less
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/css.html | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/css.html b/docs/css.html index 69b132ce0d..bbf90364a3 100644 --- a/docs/css.html +++ b/docs/css.html @@ -892,7 +892,7 @@ For example, <code><section></code> should be wrapped as inline. </div><!-- /example --> {% highlight html linenos %} ... -<tr class="sucess"> +<tr class="success"> <td>1</td> <td>TB - Monthly</td> <td>01/04/2012</td> diff --git a/docs/javascript.html b/docs/javascript.html index 3194ce8bcf..424ee24480 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1587,7 +1587,7 @@ $('#myCollapsible').on('hidden', function () { <h2>Usage</h2> <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 it's 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 jump's the slide position to a particular index beginning with <code>0</code>.</p> + <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> <h3>Via JavaScript</h3> <p>Call carousel manually with:</p> |