From f837e39b8a923beeffc83350b777bf35f005aee6 Mon Sep 17 00:00:00 2001
From: Emily Plummer <emplums@github.com>
Date: Sat, 14 Mar 2020 19:14:47 -0700
Subject: [PATCH 1/3] remove z-index

---
 src/ButtonStyles.js                          |  5 -----
 src/__tests__/__snapshots__/Button.js.snap   | 20 --------------------
 src/__tests__/__snapshots__/Dropdown.js.snap | 10 ----------
 3 files changed, 35 deletions(-)

diff --git a/src/ButtonStyles.js b/src/ButtonStyles.js
index 98db3f21b70..d0133010ca1 100644
--- a/src/ButtonStyles.js
+++ b/src/ButtonStyles.js
@@ -24,11 +24,6 @@ export default css`
     outline: none;
   }
 
-  &:focus,
-  &:active {
-    z-index: 1;
-  }
-
   &:disabled {
     cursor: default;
   }
diff --git a/src/__tests__/__snapshots__/Button.js.snap b/src/__tests__/__snapshots__/Button.js.snap
index 5e05be29c2c..32fcd30db9a 100644
--- a/src/__tests__/__snapshots__/Button.js.snap
+++ b/src/__tests__/__snapshots__/Button.js.snap
@@ -36,11 +36,6 @@ exports[`Button respects the "disabled" prop 1`] = `
   outline: none;
 }
 
-.c0:focus,
-.c0:active {
-  z-index: 1;
-}
-
 .c0:disabled {
   cursor: default;
 }
@@ -109,11 +104,6 @@ exports[`ButtonDanger renders correct disabled styles 1`] = `
   outline: none;
 }
 
-.c0:focus,
-.c0:active {
-  z-index: 1;
-}
-
 .c0:disabled {
   cursor: default;
 }
@@ -185,11 +175,6 @@ exports[`ButtonOutline renders correct disabled styles 1`] = `
   outline: none;
 }
 
-.c0:focus,
-.c0:active {
-  z-index: 1;
-}
-
 .c0:disabled {
   cursor: default;
 }
@@ -261,11 +246,6 @@ exports[`ButtonPrimary renders correct disabled styles 1`] = `
   outline: none;
 }
 
-.c0:focus,
-.c0:active {
-  z-index: 1;
-}
-
 .c0:disabled {
   cursor: default;
 }
diff --git a/src/__tests__/__snapshots__/Dropdown.js.snap b/src/__tests__/__snapshots__/Dropdown.js.snap
index d4659409279..b21fa7442f7 100644
--- a/src/__tests__/__snapshots__/Dropdown.js.snap
+++ b/src/__tests__/__snapshots__/Dropdown.js.snap
@@ -36,11 +36,6 @@ exports[`Dropdown matches the snapshots 1`] = `
   outline: none;
 }
 
-.c2:focus,
-.c2:active {
-  z-index: 1;
-}
-
 .c2:disabled {
   cursor: default;
 }
@@ -145,11 +140,6 @@ exports[`Dropdown matches the snapshots 2`] = `
   outline: none;
 }
 
-.c2:focus,
-.c2:active {
-  z-index: 1;
-}
-
 .c2:disabled {
   cursor: default;
 }

From cfde7b529d711a2fc674fce3f28b40eb5914277c Mon Sep 17 00:00:00 2001
From: Emily Plummer <emplums@github.com>
Date: Sat, 14 Mar 2020 19:31:37 -0700
Subject: [PATCH 2/3] test removing zindex from button group

---
 src/ButtonGroup.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/ButtonGroup.js b/src/ButtonGroup.js
index 1ac188c8f32..b1a4eab8d1f 100644
--- a/src/ButtonGroup.js
+++ b/src/ButtonGroup.js
@@ -35,11 +35,6 @@ const ButtonGroup = styled(Box)`
         border-left-width: 0;
       }
     }
-
-    :focus,
-    :active {
-      z-index: 1;
-    }
   }
 `
 ButtonGroup.defaultProps = {

From 428b4ee814cd668f3e8d3a4f2b30d32d26a6fcd1 Mon Sep 17 00:00:00 2001
From: Emily Plummer <emplums@github.com>
Date: Mon, 16 Mar 2020 16:30:58 -0700
Subject: [PATCH 3/3] Revert "test removing zindex from button group"

This reverts commit cfde7b529d711a2fc674fce3f28b40eb5914277c.
---
 src/ButtonGroup.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ButtonGroup.js b/src/ButtonGroup.js
index b1a4eab8d1f..1ac188c8f32 100644
--- a/src/ButtonGroup.js
+++ b/src/ButtonGroup.js
@@ -35,6 +35,11 @@ const ButtonGroup = styled(Box)`
         border-left-width: 0;
       }
     }
+
+    :focus,
+    :active {
+      z-index: 1;
+    }
   }
 `
 ButtonGroup.defaultProps = {