diff --git a/src/button.scss b/src/button.scss index ab04f398fd..505c5532b2 100644 --- a/src/button.scss +++ b/src/button.scss @@ -51,6 +51,8 @@ $block: #{$fd-namespace}-button; @mixin iconSize($size) { &::before, &::after { + width: $size; + height: $size; font-size: $size; line-height: $size; } @@ -124,8 +126,8 @@ $block: #{$fd-namespace}-button; } @mixin menuCompact() { - $fd-button-menu-button-padding: 1.469rem; - $fd-menu-button-icon-position-horizontal: 0.125rem / 2; + $fd-button-menu-button-padding: 1.812rem; + $fd-menu-button-icon-position-horizontal: 0.438rem; padding-right: $fd-button-menu-button-padding; @@ -146,8 +148,8 @@ $block: #{$fd-namespace}-button; } @mixin menu() { - $fd-button-menu-button-padding: 1.594rem; - $fd-menu-button-icon-position-horizontal: 0.1875rem; + $fd-button-menu-button-padding: 1.937rem; + $fd-menu-button-icon-position-horizontal: 0.562rem; max-width: $fd-menu-button-max-width; position: relative; @@ -164,20 +166,8 @@ $block: #{$fd-namespace}-button; position: absolute; top: $fd-menu-button-icon-position-top; right: $fd-menu-button-icon-position-horizontal; - margin-right: $fd-button-icon-margin; - margin-left: $fd-button-icon-margin; - } - - &:empty { - &::before { - margin-right: 0; - margin-left: 0; - } - - &::after { - margin-right: $fd-button-icon-margin; - margin-left: $fd-button-icon-margin; - } + margin-right: 0; + margin-left: 0; } @include fd-rtl() { @@ -187,8 +177,6 @@ $block: #{$fd-namespace}-button; &::after { left: $fd-menu-button-icon-position-horizontal; right: auto; - margin-right: $fd-button-icon-margin; - margin-left: $fd-button-icon-margin; } &:empty { diff --git a/test/visual-regression-tests/reference_images/FS_button_0_backstop_0_.png b/test/visual-regression-tests/reference_images/FS_button_0_backstop_0_.png index 1fce78add5..7b9e61ab55 100644 Binary files a/test/visual-regression-tests/reference_images/FS_button_0_backstop_0_.png and b/test/visual-regression-tests/reference_images/FS_button_0_backstop_0_.png differ diff --git a/test/visual-regression-tests/reference_images/FS_button_1_backstop__n1_0_.png b/test/visual-regression-tests/reference_images/FS_button_1_backstop__n1_0_.png index c12c212b32..b3795e07c9 100644 Binary files a/test/visual-regression-tests/reference_images/FS_button_1_backstop__n1_0_.png and b/test/visual-regression-tests/reference_images/FS_button_1_backstop__n1_0_.png differ diff --git a/test/visual-regression-tests/reference_images/FS_button_2_backstop__n2_0_.png b/test/visual-regression-tests/reference_images/FS_button_2_backstop__n2_0_.png index 1faf502fd8..647d23ec2c 100644 Binary files a/test/visual-regression-tests/reference_images/FS_button_2_backstop__n2_0_.png and b/test/visual-regression-tests/reference_images/FS_button_2_backstop__n2_0_.png differ diff --git a/test/visual-regression-tests/reference_images/FS_button_3_backstop__n3_0_.png b/test/visual-regression-tests/reference_images/FS_button_3_backstop__n3_0_.png index 192a3b6b0f..e2d45e97b0 100644 Binary files a/test/visual-regression-tests/reference_images/FS_button_3_backstop__n3_0_.png and b/test/visual-regression-tests/reference_images/FS_button_3_backstop__n3_0_.png differ diff --git a/test/visual-regression-tests/reference_images/FS_button_4_backstop__n4_0_.png b/test/visual-regression-tests/reference_images/FS_button_4_backstop__n4_0_.png index 156ebf1daf..73587a688e 100644 Binary files a/test/visual-regression-tests/reference_images/FS_button_4_backstop__n4_0_.png and b/test/visual-regression-tests/reference_images/FS_button_4_backstop__n4_0_.png differ diff --git a/test/visual-regression-tests/reference_images/FS_button_5_backstop__n5_0_.png b/test/visual-regression-tests/reference_images/FS_button_5_backstop__n5_0_.png index 411734dea8..623179d5f4 100644 Binary files a/test/visual-regression-tests/reference_images/FS_button_5_backstop__n5_0_.png and b/test/visual-regression-tests/reference_images/FS_button_5_backstop__n5_0_.png differ diff --git a/test/visual-regression-tests/reference_images/FS_button_6_backstop__n6_0_.png b/test/visual-regression-tests/reference_images/FS_button_6_backstop__n6_0_.png index 3855c97104..6da70ad0bf 100644 Binary files a/test/visual-regression-tests/reference_images/FS_button_6_backstop__n6_0_.png and b/test/visual-regression-tests/reference_images/FS_button_6_backstop__n6_0_.png differ