Merge branch 'master' into chore/update-yarn-to-1.21.1

carbon-design-system · Dec 13, 2019 · ec8182b · ec8182b
2 parents 2683e27 + d364e9a
commit ec8182b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -6,11 +6,11 @@ daysUntilClose: 3
 exemptLabels:
   - 'type: a11y ♿'
   - 'type: bug 🐛'
-  - 'Severity 1 🚨'
-  - 'priority: high'
-  - 'v11'
+  - 'severity: 1 🚨'
+  - 'impact: 1'
+  - 'version: 11'
 # Label to use when marking an issue as stale
-staleLabel: inactive
+staleLabel: 'status: inactive'
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   We've marked this issue as stale because there hasn't been any activity for a couple of weeks.

diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -13082,8 +13082,7 @@ Button base styles
   text-align: left;
   text-decoration: none;
   transition: all $duration--fast-01 motion(entrance, productive);
-  outline: $button-outline-width solid transparent;
-  outline-offset: -4px;
+  outline: none;
   position: relative;
   max-width: rem(320px);
 
@@ -13136,7 +13135,7 @@ Button variant styles
 
   &:focus {
     border-color: $focus;
-    outline-color: $ui-02;
+    box-shadow: inset 0 0 0 $button-outline-width $ui-02;
   }
 
   &:disabled:hover,
@@ -13147,7 +13146,7 @@ Button variant styles
     background-color: $disabled-02;
     border-color: $disabled-02;
     text-decoration: none;
-    outline-color: $disabled-02;
+    box-shadow: none;
   }
 
   &:active {

diff --git a/packages/components/src/components/button/_mixins.scss b/packages/components/src/components/button/_mixins.scss
@@ -26,8 +26,7 @@
   text-align: left;
   text-decoration: none;
   transition: all $duration--fast-01 motion(entrance, productive);
-  outline: $button-outline-width solid transparent;
-  outline-offset: -4px;
+  outline: none;
   position: relative;
   max-width: rem(320px);
 
@@ -72,7 +71,7 @@
 
   &:focus {
     border-color: $focus;
-    outline-color: $ui-02;
+    box-shadow: inset 0 0 0 $button-outline-width $ui-02;
   }
 
   &:disabled:hover,
@@ -83,7 +82,7 @@
     background-color: $disabled-02;
     border-color: $disabled-02;
     text-decoration: none;
-    outline-color: $disabled-02;
+    box-shadow: none;
   }
 
   &:active {