update spacing

Shopify · Nov 26, 2019 · 12714f4 · 12714f4
1 parent f122b39
commit 12714f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/components/Button/Button.scss b/src/components/Button/Button.scss
@@ -528,10 +528,11 @@ $partial-button-filled-pressed-box-shadow: inset 0 0 0 0 transparent,
   .Icon:last-child {
     margin-right: rem(-4px);
   }
-
+  // stylelint-disable selector-max-class, selector-max-combinators, selector-max-specificity
   .Icon + .Icon:last-child {
     margin-left: 0;
   }
+  // stylelint-enable selector-max-class, selector-max-combinators, selector-max-specificity
 
   .Icon:only-child {
     margin-right: 0;

diff --git a/src/components/ButtonGroup/ButtonGroup.scss b/src/components/ButtonGroup/ButtonGroup.scss
@@ -12,20 +12,18 @@ $item-spacing: spacing(tight);
   display: flex;
   flex-wrap: wrap;
   align-items: center;
-  margin-top: calc(#{var(--p-button-group-item-spacing, $item-spacing)} * -1);
-  margin-left: calc(#{var(--p-button-group-item-spacing, $item-spacing)} * -1);
+  margin-top: (-1 * $item-spacing);
+  margin-left: (-1 * $item-spacing);
 }
 
 .Item {
-  margin-top: var(--p-button-group-item-spacing, $item-spacing);
-  margin-left: var(--p-button-group-item-spacing, $item-spacing);
+  margin-top: $item-spacing;
+  margin-left: $item-spacing;
 }
 
 .Item-plain {
   &:not(:first-child) {
-    margin-left: calc(
-      #{var(--p-button-group-item-spacing, $item-spacing)} + #{$plain-horizontal-spacing}
-    );
+    margin-left: $item-spacing + $plain-horizontal-spacing;
   }
 
   &:not(:last-child) {