Merge branch 'phopkins-ie_buttons' into 2.0-wip

4 files changed, 22 insertions, 18 deletions

diff --git a/docs/base-css.html b/docs/base-css.html
index bbe7ecd88..ebc6285dc 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -432,10 +432,10 @@
       </tr>
       <tr>
         <td>
-          <span class="label notice">Notice</span>
+          <span class="label info">Info</span>
         </td>
         <td>
-          <code>&lt;span class="label notice"&gt;Notice&lt;/span&gt;</code>
+          <code>&lt;span class="label info"&gt;Info&lt;/span&gt;</code>
         </td>
       </tr>
     </tbody>
@@ -1210,6 +1210,8 @@
 
 
 
+<!-- Buttons
+================================================== -->
 <section id="buttons">
   <div class="page-header">
     <h1>Buttons</h1>
@@ -1278,9 +1280,9 @@
         <a href="#" class="btn small">Action</a>
       </p>
     </div>
-    <div class="span8">
+    <div class="span4">
       <h3>Disabled state</h3>
-      <p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.</p>
+      <p>For disabled buttons, use <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.</p>
       <p>
         <a href="#" class="btn large primary disabled">Primary action</a>
         <a href="#" class="btn large disabled">Action</a>
@@ -1290,6 +1292,11 @@
         <button class="btn large" disabled>Action</button>
       </p>
     </div>
+    <div class="span4">
+      <h3>Cross browser compatibility</h3>
+      <p>In IE9, we drop the gradient on all buttons in favor of rounded corners as IE9 doesn't crop background gradients to the corners.</p>
+      <p>Related, IE9 jankifies disabled <code>button</code> elements, rendering text gray with a nasty text-shadow&mdash;unfortunately we can't fix this.</p>
+    </div>
   </div>
 
   <br>
diff --git a/docs/less.html b/docs/less.html
index d2e083c2e..dc0e83443 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -468,11 +468,6 @@
         <td><code>@opacity: 100</code></td>
         <td>Set, in whole numbers, the opacity percentage (e.g., "50" or "75")</td>
       </tr>
-      <tr>
-        <td><code>.reset-filter()</code></td>
-        <td><em class="muted">none</em></td>
-        <td>Resets any IE filter</td>
-      </tr>
     </tbody>
   </table>
   <h3>Forms</h3>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 325883872..27386d47f 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -367,10 +367,10 @@
       </tr>
       <tr>
         <td>
-          <span class="label notice">{{_i}}Notice{{/i}}</span>
+          <span class="label info">{{_i}}Info{{/i}}</span>
         </td>
         <td>
-          <code>&lt;span class="label notice"&gt;{{_i}}Notice{{/i}}&lt;/span&gt;</code>
+          <code>&lt;span class="label info"&gt;{{_i}}Info{{/i}}&lt;/span&gt;</code>
         </td>
       </tr>
     </tbody>
@@ -1145,6 +1145,8 @@
 
 
 
+<!-- Buttons
+================================================== -->
 <section id="buttons">
   <div class="page-header">
     <h1>{{_i}}Buttons{{/i}}</h1>
@@ -1213,9 +1215,9 @@
         <a href="#" class="btn small">{{_i}}Action{{/i}}</a>
       </p>
     </div>
-    <div class="span8">
+    <div class="span4">
       <h3>{{_i}}Disabled state{{/i}}</h3>
-      <p>{{_i}}For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.{{/i}}</p>
+      <p>{{_i}}For disabled buttons, use <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.{{/i}}</p>
       <p>
         <a href="#" class="btn large primary disabled">{{_i}}Primary action{{/i}}</a>
         <a href="#" class="btn large disabled">{{_i}}Action{{/i}}</a>
@@ -1225,6 +1227,11 @@
         <button class="btn large" disabled>{{_i}}Action{{/i}}</button>
       </p>
     </div>
+    <div class="span4">
+      <h3>Cross browser compatibility</h3>
+      <p>In IE9, we drop the gradient on all buttons in favor of rounded corners as IE9 doesn't crop background gradients to the corners.</p>
+      <p>Related, IE9 jankifies disabled <code>button</code> elements, rendering text gray with a nasty text-shadow&mdash;unfortunately we can't fix this.</p>
+    </div>
   </div>
 
   <br>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 6478e3b2f..1aec06c2c 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -403,11 +403,6 @@
         <td><code>@opacity: 100</code></td>
         <td>{{_i}}Set, in whole numbers, the opacity percentage (e.g., "50" or "75"){{/i}}</td>
       </tr>
-      <tr>
-        <td><code>.reset-filter()</code></td>
-        <td><em class="muted">none</em></td>
-        <td>{{_i}}Resets any IE filter{{/i}}</td>
-      </tr>
     </tbody>
   </table>
   <h3>Forms</h3>