Simplify button selectors.

24 files changed, 457 insertions, 415 deletions

diff --git a/fork-versions/default/_normalize.scss b/fork-versions/default/_normalize.scss
index 7a45bb5..cf14a9e 100644
--- a/fork-versions/default/_normalize.scss
+++ b/fork-versions/default/_normalize.scss
@@ -490,27 +490,27 @@ html [type="button"], /* 1 */
   -webkit-appearance: button; /* 2 */
 }
 
-/**
- * Remove the inner border and padding in Firefox.
- */
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
 
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0;
-}
+  /**
+   * Remove the inner border and padding in Firefox.
+   */
 
-/**
- * Restore the focus styles unset by the previous rule.
- */
+  &::-moz-focus-inner {
+    border-style: none;
+    padding: 0;
+  }
 
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText;
+  /**
+   * Restore the focus styles unset by the previous rule.
+   */
+
+  &:-moz-focusring {
+    outline: 1px dotted ButtonText;
+  }
 }
 
 /**
diff --git a/fork-versions/ruby-sass-compass/_normalize.scss b/fork-versions/ruby-sass-compass/_normalize.scss
index e5abc6c..d80b9ef 100644
--- a/fork-versions/ruby-sass-compass/_normalize.scss
+++ b/fork-versions/ruby-sass-compass/_normalize.scss
@@ -491,27 +491,27 @@ html [type="button"], /* 1 */
   -webkit-appearance: button; /* 2 */
 }
 
-/**
- * Remove the inner border and padding in Firefox.
- */
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
 
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0;
-}
+  /**
+   * Remove the inner border and padding in Firefox.
+   */
 
-/**
- * Restore the focus styles unset by the previous rule.
- */
+  &::-moz-focus-inner {
+    border-style: none;
+    padding: 0;
+  }
 
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText;
+  /**
+   * Restore the focus styles unset by the previous rule.
+   */
+
+  &:-moz-focusring {
+    outline: 1px dotted ButtonText;
+  }
 }
 
 /**
diff --git a/fork-versions/typey-chroma-kss/base/forms/_forms.scss b/fork-versions/typey-chroma-kss/base/forms/_forms.scss
index 6dfb644..0ad6ec0 100644
--- a/fork-versions/typey-chroma-kss/base/forms/_forms.scss
+++ b/fork-versions/typey-chroma-kss/base/forms/_forms.scss
@@ -15,9 +15,9 @@
 // Style guide: forms.base
 
 //
-// The following 8 rules are from normalize.css and help to fix inconsistencies
+// The following rules are from normalize.css and help to fix inconsistencies
 // across various browsers. You should probably leave these rules as is and jump
-// to the "Buttons" rule on line 95 before you start editing this file.
+// to the "Buttons" rule on line 105 before you start editing this file.
 //
 
 button,
@@ -61,23 +61,6 @@ html [type='button'], // 1
   -webkit-appearance: button; // 2
 }
 
-// Remove the inner border and padding in Firefox.
-button::-moz-focus-inner,
-[type='button']::-moz-focus-inner,
-[type='reset']::-moz-focus-inner,
-[type='submit']::-moz-focus-inner {
-  border-style: none;
-  padding: 0;
-}
-
-// Restore the focus styles unset by the previous rule.
-button:-moz-focusring,
-[type='button']:-moz-focusring,
-[type='reset']:-moz-focusring,
-[type='submit']:-moz-focusring {
-  outline: 1px dotted ButtonText;
-}
-
 // Show the overflow in Edge.
 input {
   overflow: visible;
diff --git a/fork-versions/typey-chroma-kss/components/button/_button.scss b/fork-versions/typey-chroma-kss/components/button/_button.scss
index ff762ec..eb8004e 100644
--- a/fork-versions/typey-chroma-kss/components/button/_button.scss
+++ b/fork-versions/typey-chroma-kss/components/button/_button.scss
@@ -14,9 +14,8 @@
 
 .button,
 %button {
-  // sass-lint:disable no-vendor-prefixes
-  -moz-appearance: button;
-  -webkit-appearance: button;
+  // Note that buttons also receive this property: -webkit-appearance: button
+  // @see base/forms/_form.scss
   // Some styles don't apply to <a> links since they are inline elements by default.
   display: inline-block;
   padding: 2px 6px;
@@ -29,6 +28,17 @@
   cursor: pointer;
   color: color(button);
 
+  // Remove the inner border and padding in Firefox.
+  &::-moz-focus-inner {
+    border-style: none;
+    padding: 0;
+  }
+
+  // Restore the focus styles unset by the previous rule.
+  &:-moz-focusring {
+    outline: 1px dotted ButtonText;
+  }
+
   &:hover,
   &:focus,
   &:active {
diff --git a/fork-versions/typey/_normalize.scss b/fork-versions/typey/_normalize.scss
index 908d38a..2b8d2b5 100644
--- a/fork-versions/typey/_normalize.scss
+++ b/fork-versions/typey/_normalize.scss
@@ -445,27 +445,27 @@ html [type="button"], /* 1 */
   -webkit-appearance: button; /* 2 */
 }
 
-/**
- * Remove the inner border and padding in Firefox.
- */
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
 
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0;
-}
+  /**
+   * Remove the inner border and padding in Firefox.
+   */
 
-/**
- * Restore the focus styles unset by the previous rule.
- */
+  &::-moz-focus-inner {
+    border-style: none;
+    padding: 0;
+  }
 
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText;
+  /**
+   * Restore the focus styles unset by the previous rule.
+   */
+
+  &:-moz-focusring {
+    outline: 1px dotted ButtonText;
+  }
 }
 
 /**
diff --git a/sass/normalize/_normalize-mixin.scss b/sass/normalize/_normalize-mixin.scss
index 0d7b83a..0f14ee5 100644
--- a/sass/normalize/_normalize-mixin.scss
+++ b/sass/normalize/_normalize-mixin.scss
@@ -524,27 +524,27 @@ $_normalize-exclude: ();
       -webkit-appearance: button; /* 2 */
     }
 
-    /**
-     * Remove the inner border and padding in Firefox.
-     */
+    button,
+    [type="button"],
+    [type="reset"],
+    [type="submit"] {
 
-    button::-moz-focus-inner,
-    [type="button"]::-moz-focus-inner,
-    [type="reset"]::-moz-focus-inner,
-    [type="submit"]::-moz-focus-inner {
-      border-style: none;
-      padding: 0;
-    }
+      /**
+       * Remove the inner border and padding in Firefox.
+       */
 
-    /**
-     * Restore the focus styles unset by the previous rule.
-     */
+      &::-moz-focus-inner {
+        border-style: none;
+        padding: 0;
+      }
 
-    button:-moz-focusring,
-    [type="button"]:-moz-focusring,
-    [type="reset"]:-moz-focusring,
-    [type="submit"]:-moz-focusring {
-      outline: 1px dotted ButtonText;
+      /**
+       * Restore the focus styles unset by the previous rule.
+       */
+
+      &:-moz-focusring {
+        outline: 1px dotted ButtonText;
+      }
     }
 
     /**
diff --git a/test/fixtures/fork-versions/default/output.css b/test/fixtures/fork-versions/default/output.css
index 4aa06f1..d2a4231 100644
--- a/test/fixtures/fork-versions/default/output.css
+++ b/test/fixtures/fork-versions/default/output.css
@@ -272,24 +272,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
- * Remove the inner border and padding in Firefox.
- */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
- * Restore the focus styles unset by the previous rule.
- */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+   * Remove the inner border and padding in Firefox.
+   */
+  /**
+   * Restore the focus styles unset by the previous rule.
+   */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
  * Show the overflow in Edge.
diff --git a/test/fixtures/fork-versions/ruby-sass-compass/output.css b/test/fixtures/fork-versions/ruby-sass-compass/output.css
index 2530f56..bbe671a 100644
--- a/test/fixtures/fork-versions/ruby-sass-compass/output.css
+++ b/test/fixtures/fork-versions/ruby-sass-compass/output.css
@@ -371,24 +371,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
- * Remove the inner border and padding in Firefox.
- */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
- * Restore the focus styles unset by the previous rule.
- */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+   * Remove the inner border and padding in Firefox.
+   */
+  /**
+   * Restore the focus styles unset by the previous rule.
+   */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
  * Show the overflow in Edge.
diff --git a/test/fixtures/fork-versions/typey-chroma-kss/output.css b/test/fixtures/fork-versions/typey-chroma-kss/output.css
index 793cd76..1e6fa2e 100644
--- a/test/fixtures/fork-versions/typey-chroma-kss/output.css
+++ b/test/fixtures/fork-versions/typey-chroma-kss/output.css
@@ -218,14 +218,25 @@ button,
 [type='button'],
 [type='reset'],
 [type='submit'] {
-  -moz-appearance: button;
-  -webkit-appearance: button;
   display: inline-block;
   padding: 2px 6px;
   line-height: inherit;
   text-decoration: none;
   cursor: pointer;
   color: #000; }
+  .button::-moz-focus-inner,
+  button::-moz-focus-inner,
+  [type='button']::-moz-focus-inner,
+  [type='reset']::-moz-focus-inner,
+  [type='submit']::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  .button:-moz-focusring,
+  button:-moz-focusring,
+  [type='button']:-moz-focusring,
+  [type='reset']:-moz-focusring,
+  [type='submit']:-moz-focusring {
+    outline: 1px dotted ButtonText; }
   .button:hover, .button:focus, .button:active,
   button:hover,
   [type='button']:hover,
@@ -286,19 +297,6 @@ html [type='button'],
 [type='submit'] {
   -webkit-appearance: button; }
 
-button::-moz-focus-inner,
-[type='button']::-moz-focus-inner,
-[type='reset']::-moz-focus-inner,
-[type='submit']::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-button:-moz-focusring,
-[type='button']:-moz-focusring,
-[type='reset']:-moz-focusring,
-[type='submit']:-moz-focusring {
-  outline: 1px dotted ButtonText; }
-
 input {
   overflow: visible; }
 
diff --git a/test/fixtures/fork-versions/typey/output.css b/test/fixtures/fork-versions/typey/output.css
index af0725c..2d034d6 100644
--- a/test/fixtures/fork-versions/typey/output.css
+++ b/test/fixtures/fork-versions/typey/output.css
@@ -345,24 +345,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
- * Remove the inner border and padding in Firefox.
- */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
- * Restore the focus styles unset by the previous rule.
- */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+   * Remove the inner border and padding in Firefox.
+   */
+  /**
+   * Restore the focus styles unset by the previous rule.
+   */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
  * Show the overflow in Edge.
diff --git a/test/fixtures/import-now/output.css b/test/fixtures/import-now/output.css
index c0b488c..0f75d8a 100644
--- a/test/fixtures/import-now/output.css
+++ b/test/fixtures/import-now/output.css
@@ -273,24 +273,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/normalize/exclude-multiple/output.css b/test/fixtures/normalize/exclude-multiple/output.css
index 9fd06a5..e4404c5 100644
--- a/test/fixtures/normalize/exclude-multiple/output.css
+++ b/test/fixtures/normalize/exclude-multiple/output.css
@@ -235,24 +235,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/normalize/exclude-string/output.css b/test/fixtures/normalize/exclude-string/output.css
index c0b488c..0f75d8a 100644
--- a/test/fixtures/normalize/exclude-string/output.css
+++ b/test/fixtures/normalize/exclude-string/output.css
@@ -273,24 +273,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/variables/default/output.css b/test/fixtures/variables/default/output.css
index c0b488c..0f75d8a 100644
--- a/test/fixtures/variables/default/output.css
+++ b/test/fixtures/variables/default/output.css
@@ -273,24 +273,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/variables/font/output.css b/test/fixtures/variables/font/output.css
index 92f24a7..b02ef72 100644
--- a/test/fixtures/variables/font/output.css
+++ b/test/fixtures/variables/font/output.css
@@ -365,24 +365,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/variables/indent-amount/output.css b/test/fixtures/variables/indent-amount/output.css
index 0df4d40..b12ea4b 100644
--- a/test/fixtures/variables/indent-amount/output.css
+++ b/test/fixtures/variables/indent-amount/output.css
@@ -343,24 +343,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/variables/support-for/firefox29/output.css b/test/fixtures/variables/support-for/firefox29/output.css
index 3df3b76..b2f5d0a 100644
--- a/test/fixtures/variables/support-for/firefox29/output.css
+++ b/test/fixtures/variables/support-for/firefox29/output.css
@@ -273,24 +273,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/variables/support-for/ie10/output.css b/test/fixtures/variables/support-for/ie10/output.css
index c0b488c..0f75d8a 100644
--- a/test/fixtures/variables/support-for/ie10/output.css
+++ b/test/fixtures/variables/support-for/ie10/output.css
@@ -273,24 +273,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/variables/support-for/ie11/output.css b/test/fixtures/variables/support-for/ie11/output.css
index c0b488c..0f75d8a 100644
--- a/test/fixtures/variables/support-for/ie11/output.css
+++ b/test/fixtures/variables/support-for/ie11/output.css
@@ -273,24 +273,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/variables/support-for/ie6/output.css b/test/fixtures/variables/support-for/ie6/output.css
index 9a5d478..a8cf119 100644
--- a/test/fixtures/variables/support-for/ie6/output.css
+++ b/test/fixtures/variables/support-for/ie6/output.css
@@ -351,24 +351,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/variables/support-for/ie7/output.css b/test/fixtures/variables/support-for/ie7/output.css
index 899696d..2030ee7 100644
--- a/test/fixtures/variables/support-for/ie7/output.css
+++ b/test/fixtures/variables/support-for/ie7/output.css
@@ -349,24 +349,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/variables/support-for/ie8/output.css b/test/fixtures/variables/support-for/ie8/output.css
index c0b488c..0f75d8a 100644
--- a/test/fixtures/variables/support-for/ie8/output.css
+++ b/test/fixtures/variables/support-for/ie8/output.css
@@ -273,24 +273,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/variables/support-for/ie9/output.css b/test/fixtures/variables/support-for/ie9/output.css
index c0b488c..0f75d8a 100644
--- a/test/fixtures/variables/support-for/ie9/output.css
+++ b/test/fixtures/variables/support-for/ie9/output.css
@@ -273,24 +273,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.
diff --git a/test/fixtures/variables/support-for/negative-value/output.css b/test/fixtures/variables/support-for/negative-value/output.css
index c0b488c..0f75d8a 100644
--- a/test/fixtures/variables/support-for/negative-value/output.css
+++ b/test/fixtures/variables/support-for/negative-value/output.css
@@ -273,24 +273,27 @@ html [type="button"],
   -webkit-appearance: button;
   /* 2 */ }
 
-/**
-     * Remove the inner border and padding in Firefox.
-     */
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-/**
-     * Restore the focus styles unset by the previous rule.
-     */
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText; }
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  /**
+       * Remove the inner border and padding in Firefox.
+       */
+  /**
+       * Restore the focus styles unset by the previous rule.
+       */ }
+  button::-moz-focus-inner,
+  [type="button"]::-moz-focus-inner,
+  [type="reset"]::-moz-focus-inner,
+  [type="submit"]::-moz-focus-inner {
+    border-style: none;
+    padding: 0; }
+  button:-moz-focusring,
+  [type="button"]:-moz-focusring,
+  [type="reset"]:-moz-focusring,
+  [type="submit"]:-moz-focusring {
+    outline: 1px dotted ButtonText; }
 
 /**
      * Show the overflow in Edge.