diff options
| author | Mark Otto <[email protected]> | 2012-11-22 22:04:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-22 22:04:21 -0800 |
| commit | 7e56e2265d67ae81ad8be52af4d56f189929207a (patch) | |
| tree | 8bede49f32e25f4acfe95a2a7cc86bd273805474 /docs/javascript.html | |
| parent | fa1c130552022520161a2b0c595e2ca431df0c97 (diff) | |
| parent | e0d0190803398ce12b2fe88e31e45993b35cf17e (diff) | |
| download | bootstrap-7e56e2265d67ae81ad8be52af4d56f189929207a.tar.xz bootstrap-7e56e2265d67ae81ad8be52af4d56f189929207a.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
less/button-groups.less
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 516759cc1..457ee776a 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1135,7 +1135,7 @@ $('#my-alert').bind('closed', function () { <div class="bs-docs-example" style="padding-bottom: 24px;"> <button type="button" class="btn btn-primary" data-toggle="button">Single Toggle</button> </div> - <pre class="prettyprint linenums"><button type="button" class="btn" data-toggle="button">Single Toggle</button></pre> + <pre class="prettyprint linenums"><button type="button" class="btn btn-primary" data-toggle="button">Single Toggle</button></pre> <h4>Checkbox</h4> <p>Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group.</p> @@ -1148,9 +1148,9 @@ $('#my-alert').bind('closed', function () { </div> <pre class="prettyprint linenums"> <div class="btn-group" data-toggle="buttons-checkbox"> - <button type="button" class="btn">Left</button> - <button type="button" class="btn">Middle</button> - <button type="button" class="btn">Right</button> + <button type="button" class="btn btn-primary">Left</button> + <button type="button" class="btn btn-primary">Middle</button> + <button type="button" class="btn btn-primary">Right</button> </div> </pre> @@ -1165,9 +1165,9 @@ $('#my-alert').bind('closed', function () { </div> <pre class="prettyprint linenums"> <div class="btn-group" data-toggle="buttons-radio"> - <button type="button" class="btn">Left</button> - <button type="button" class="btn">Middle</button> - <button type="button" class="btn">Right</button> + <button type="button" class="btn btn-primary">Left</button> + <button type="button" class="btn btn-primary">Middle</button> + <button type="button" class="btn btn-primary">Right</button> </div> </pre> @@ -1708,7 +1708,6 @@ $('[data-spy="affix"]').each(function () { ================================================== --> <footer class="footer"> <div class="container"> - <p class="pull-right"><a href="#">Back to top</a></p> <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> |