Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markotto@twitter.com>2012-02-12 05:25:47 +0400
committerMark Otto <markotto@twitter.com>2012-02-12 05:25:47 +0400
commita84092d2257ba8e000e2c656e6cb1b8415d0d9ac (patch)
tree5a7f7e65c8879c5f8433849bf27c758e2b037511 /docs/templates/pages
parentc16ccf64f1f51bca4e4564d23211274e3d995e16 (diff)
update buttons docs for .disabled class per #1774
Diffstat (limited to 'docs/templates/pages')
-rw-r--r--docs/templates/pages/base-css.mustache8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 01b79c7a5b..e56f45ca05 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1234,15 +1234,19 @@
</p>
<br>
<h3>{{_i}}Disabled state{{/i}}</h3>
- <p>{{_i}}For disabled buttons, use <code>.btn-disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.{{/i}}</p>
+ <p>{{_i}}For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code>&lt;button&gt;</code> elements.{{/i}}</p>
<p>
<a href="#" class="btn btn-large btn-primary disabled">{{_i}}Primary link{{/i}}</a>
<a href="#" class="btn btn-large disabled">{{_i}}Link{{/i}}</a>
</p>
- <p>
+ <p style="margin-bottom: 18px;">
<button class="btn btn-large btn-primary disabled" disabled="disabled">{{_i}}Primary button{{/i}}</button>
<button class="btn btn-large" disabled>{{_i}}Button{{/i}}</button>
</p>
+ <p>
+ <span class="label label-info">{{_i}}Heads up!{{/i}}</span>
+ {{_i}}We use <code>.disabled</code> as a utility class here, similar to the common <code>.active</code> class, so no prefix is required.{{/i}}
+ </p>
</div>
<div class="span4">
<h3>{{_i}}One class, multiple tags{{/i}}</h3>