From: Mark Otto <markotto@twitter.com>
Date: Sun, 12 Feb 2012 01:25:47 +0000 (-0800)
Subject: update buttons docs for .disabled class per #1774
X-Git-Tag: v2.0.1~1^2~17^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a84092d2257ba8e000e2c656e6cb1b8415d0d9ac;p=thirdparty%2Fbootstrap.git

update buttons docs for .disabled class per #1774
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index dc3849f1d4..9055e367ec 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 2ee0f2d295..46cf982c64 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1310,15 +1310,19 @@ For example, &lt;code&gt;section&lt;/code&gt; 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>&lt;button&gt;</code> elements.</p>
+      <p>For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code>&lt;button&gt;</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 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>