Merge branch 'master' into remove-snippet-focus

carbon-design-system · Jan 29, 2020 · b19f406 · b19f406
2 parents a626391 + 2ce57b3
commit b19f406
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/packages/components/src/components/button/_mixins.scss b/packages/components/src/components/button/_mixins.scss
@@ -29,6 +29,8 @@
  outline: none;
  position: relative;
  max-width: rem(320px);
+ // Fix to remove added margins on buttons in safari (see #5155)
+ margin: 0;
 
  &:disabled,
  &.#{$prefix}--btn--disabled {

diff --git a/packages/components/src/globals/scss/_css--reset.scss b/packages/components/src/globals/scss/_css--reset.scss
@@ -190,6 +190,11 @@
  box-sizing: border-box;
  }
 
+ // Fix to remove added margins on buttons in safari (see #5155)
+ button {
+ margin: 0;
+ }
+
  @include carbon--type-reset;
  @include carbon--icons;
  }