diff options
| author | Mark Otto <[email protected]> | 2012-02-11 17:25:47 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-11 17:25:47 -0800 |
| commit | a84092d2257ba8e000e2c656e6cb1b8415d0d9ac (patch) | |
| tree | 5a7f7e65c8879c5f8433849bf27c758e2b037511 /docs | |
| parent | c16ccf64f1f51bca4e4564d23211274e3d995e16 (diff) | |
| download | bootstrap-a84092d2257ba8e000e2c656e6cb1b8415d0d9ac.tar.xz bootstrap-a84092d2257ba8e000e2c656e6cb1b8415d0d9ac.zip | |
update buttons docs for .disabled class per #1774
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 52683 -> 52683 bytes | |||
| -rw-r--r-- | docs/base-css.html | 8 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex dc3849f1d..9055e367e 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/base-css.html b/docs/base-css.html index 2ee0f2d29..46cf982c6 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1310,15 +1310,19 @@ For example, <code>section</code> should be wrapped as inline. </p> <br> <h3>Disabled state</h3> - <p>For disabled buttons, use <code>.btn-disabled</code> for links and <code>:disabled</code> for <code><button></code> elements.</p> + <p>For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code><button></code> elements.</p> <p> <a href="#" class="btn btn-large btn-primary disabled">Primary link</a> <a href="#" class="btn btn-large disabled">Link</a> </p> - <p> + <p style="margin-bottom: 18px;"> <button class="btn btn-large btn-primary disabled" disabled="disabled">Primary button</button> <button class="btn btn-large" disabled>Button</button> </p> + <p> + <span class="label label-info">Heads up!</span> + We use <code>.disabled</code> as a utility class here, similar to the common <code>.active</code> class, so no prefix is required. + </p> </div> <div class="span4"> <h3>One class, multiple tags</h3> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 01b79c7a5..e56f45ca0 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><button></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><button></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> |