Skip to content

Commit 8d2c8b6

Browse files
manucorporatbrandyscarney
authored andcommitted
fix(action-sheet): Improve Action Sheet styles across all the platforms (#8736)
fixes #8663
1 parent 299522f commit 8d2c8b6

File tree

2 files changed

+23
-27
lines changed

2 files changed

+23
-27
lines changed

src/components/action-sheet/action-sheet.md.scss

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $action-sheet-md-title-color: #757575 !default;
1919
$action-sheet-md-title-font-size: 1.6rem !default;
2020

2121
/// @prop - Padding of the action sheet title
22-
$action-sheet-md-title-padding: 19px 16px 17px !default;
22+
$action-sheet-md-title-padding: 11px 16px 17px !default;
2323

2424
/// @prop - Min height of the action sheet button
2525
$action-sheet-md-button-min-height: 4.8rem !default;
@@ -42,8 +42,8 @@ $action-sheet-md-button-background-activated: #f1f1f1 !default;
4242
/// @prop - Font size of the icon in the action sheet button
4343
$action-sheet-md-icon-font-size: 2.4rem !default;
4444

45-
/// @prop - Min width of the icon in the action sheet button
46-
$action-sheet-md-icon-min-width: 24px !default;
45+
/// @prop - Width of the icon in the action sheet button
46+
$action-sheet-md-icon-width: 2.3rem !default;
4747

4848
/// @prop - Text align of the icon in the action sheet button
4949
$action-sheet-md-icon-text-align: center !default;
@@ -52,8 +52,13 @@ $action-sheet-md-icon-text-align: center !default;
5252
$action-sheet-md-icon-vertical-align: middle !default;
5353

5454
/// @prop - Margin of the icon in the action sheet button
55-
$action-sheet-md-icon-margin: 0 28px 0 0 !default;
55+
$action-sheet-md-icon-margin: 0 32px 0 0 !default;
5656

57+
.action-sheet-md .action-sheet-container {
58+
padding: .8rem 0;
59+
60+
background: $action-sheet-md-background;
61+
}
5762

5863
.action-sheet-md .action-sheet-title {
5964
padding: $action-sheet-md-title-padding;
@@ -83,8 +88,9 @@ $action-sheet-md-icon-margin: 0 28px 0 0 !default;
8388

8489
.action-sheet-md .action-sheet-icon {
8590
margin: $action-sheet-md-icon-margin;
91+
padding: 0;
8692

87-
min-width: $action-sheet-md-icon-min-width;
93+
width: $action-sheet-md-icon-width;
8894

8995
font-size: $action-sheet-md-icon-font-size;
9096
text-align: $action-sheet-md-icon-text-align;
@@ -93,12 +99,6 @@ $action-sheet-md-icon-margin: 0 28px 0 0 !default;
9399

94100
.action-sheet-md .action-sheet-group {
95101
overflow: hidden;
96-
97-
background: $action-sheet-md-background;
98-
}
99-
100-
.action-sheet-md .action-sheet-group:last-child .action-sheet-button {
101-
margin-bottom: $action-sheet-md-group-margin-bottom;
102102
}
103103

104104
.action-sheet-md .action-sheet-group .button-inner {

src/components/action-sheet/action-sheet.wp.scss

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@ $action-sheet-wp-box-shadow-color: rgba(0, 0, 0, .2) !default;
1515
/// @prop - Box shadow of the action sheet
1616
$action-sheet-wp-box-shadow: 0 -1px 0 $action-sheet-wp-box-shadow-color !default;
1717

18-
/// @prop - Bottom margin of the action sheet button group
19-
$action-sheet-wp-group-margin-bottom: 8px !default;
20-
2118
/// @prop - Padding of the action sheet title
22-
$action-sheet-wp-title-padding: 19px 16px 17px !default;
19+
$action-sheet-wp-title-padding: 11px 16px 17px !default;
2320

2421
/// @prop - Font size of the action sheet title
2522
$action-sheet-wp-title-font-size: 2rem !default;
@@ -51,20 +48,20 @@ $action-sheet-wp-button-background: transparent !default;
5148
/// @prop - Background color of the action sheet activated button
5249
$action-sheet-wp-button-background-activated: $list-wp-activated-background-color !default;
5350

54-
/// @prop - Min width of the icon in the action sheet button
55-
$action-sheet-wp-icon-min-width: 24px !default;
51+
/// @prop - Font size of the icon in the action sheet button
52+
$action-sheet-wp-icon-font-size: 2.4rem !default;
53+
54+
/// @prop - Width of the icon in the action sheet button
55+
$action-sheet-wp-icon-width: 2.3rem !default;
5656

5757
/// @prop - Text align of the icon in the action sheet button
5858
$action-sheet-wp-icon-text-align: center !default;
5959

6060
/// @prop - Vertical align of the icon in the action sheet button
6161
$action-sheet-wp-icon-vertical-align: middle !default;
6262

63-
/// @prop - Font size of the icon in the action sheet button
64-
$action-sheet-wp-icon-font-size: 2.4rem !default;
65-
6663
/// @prop - Margin of the icon in the action sheet button
67-
$action-sheet-wp-icon-margin: 0 16px 0 0 !default;
64+
$action-sheet-wp-icon-margin: 0 20px 0 0 !default;
6865

6966

7067
.action-sheet-wp .action-sheet-wrapper {
@@ -96,20 +93,19 @@ $action-sheet-wp-icon-margin: 0 16px 0 0 !default;
9693

9794
.action-sheet-wp .action-sheet-icon {
9895
margin: $action-sheet-wp-icon-margin;
96+
padding: 0;
9997

100-
min-width: $action-sheet-wp-icon-min-width;
98+
width: $action-sheet-wp-icon-width;
10199

102100
font-size: $action-sheet-wp-icon-font-size;
103101
text-align: $action-sheet-wp-icon-text-align;
104102
vertical-align: $action-sheet-wp-icon-vertical-align;
105103
}
106104

107-
.action-sheet-wp .action-sheet-group {
108-
background: $action-sheet-wp-background;
109-
}
105+
.action-sheet-wp .action-sheet-container {
106+
padding: .8rem 0;
110107

111-
.action-sheet-wp .action-sheet-group:last-child .action-sheet-button {
112-
margin-bottom: $action-sheet-wp-group-margin-bottom;
108+
background: $action-sheet-wp-background;
113109
}
114110

115111
.action-sheet-wp .action-sheet-group .button-inner {

0 commit comments

Comments
 (0)