aboutsummaryrefslogtreecommitdiff
path: root/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-08 17:19:45 -0800
committerMark Otto <[email protected]>2013-12-08 17:19:45 -0800
commitb98d6ed12b1d2d04339b1559afc412e4a7409f0c (patch)
treed665d1a2937e2865236a26c1dddaf142c481ad7f /javascript.html
parente1247e3edc35ff8419af3ab984bda69529aa4da1 (diff)
parent1f35b6ec5c3ff4801048e8a8c051d8af618e71de (diff)
downloadbootstrap-b98d6ed12b1d2d04339b1559afc412e4a7409f0c.tar.xz
bootstrap-b98d6ed12b1d2d04339b1559afc412e4a7409f0c.zip
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'javascript.html')
-rw-r--r--javascript.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/javascript.html b/javascript.html
index 71bbf6823..2ebb503e2 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1433,14 +1433,14 @@ $('.btn').button()
<p>You can enable auto toggling of a button by using the <code>data-toggle</code> attribute.</p>
</div>
{% highlight html %}
-<button type="button" class="btn" data-toggle="button">...</button>
+<button type="button" class="btn btn-primary" data-toggle="button">...</button>
{% endhighlight %}
<h4>$().button('loading')</h4>
<p>Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute <code>data-loading-text</code>.
</p>
{% highlight html %}
-<button type="button" class="btn" data-loading-text="loading stuff...">...</button>
+<button type="button" class="btn btn-primary" data-loading-text="loading stuff...">...</button>
{% endhighlight %}
<div class="bs-callout bs-callout-danger">
@@ -1454,7 +1454,7 @@ $('.btn').button()
<h4>$().button(string)</h4>
<p>Resets button state - swaps text to any data defined text state.</p>
{% highlight html %}
-<button type="button" class="btn" data-complete-text="finished!" >...</button>
+<button type="button" class="btn btn-primary" data-complete-text="finished!" >...</button>
<script>
$('.btn').button('complete')
</script>