Skip to content

Commit 138e876

Browse files
committed
feat(windows): clean up action sheet UI
references #5565
1 parent 6844425 commit 138e876

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,21 @@
44
// Windows Action Sheet
55
// --------------------------------------------------
66

7-
$action-sheet-wp-background-color: #fafafa !default;
7+
$action-sheet-wp-text-align: left !default;
8+
9+
$action-sheet-wp-background-color: #F2F2F2 !default;
810

9-
$action-sheet-wp-title-color: #757575 !default;
10-
$action-sheet-wp-title-font-size: 1.6rem !default;
1111
$action-sheet-wp-title-padding: 19px 16px 17px !default;
12+
$action-sheet-wp-title-font-size: 1.6rem !default;
13+
$action-sheet-wp-title-color: #4D4D4D !default;
14+
$action-sheet-wp-title-text-align: $action-sheet-wp-text-align !default;
1215

1316
$action-sheet-wp-button-height: 4.8rem !default;
14-
$action-sheet-wp-button-text-color: #222 !default;
17+
$action-sheet-wp-button-text-color: #4D4D4D !default;
1518
$action-sheet-wp-button-font-size: 1.6rem !default;
1619
$action-sheet-wp-button-padding: 0 16px !default;
17-
$action-sheet-wp-button-background-active-color: #f1f1f1 !default;
20+
$action-sheet-wp-button-text-align: $action-sheet-wp-text-align !default;
21+
$action-sheet-wp-button-background-active-color: $list-wp-activated-background-color !default;
1822

1923
$action-sheet-wp-icon-font-size: 2.4rem !default;
2024
$action-sheet-wp-icon-margin: 0 28px 0 0 !default;
@@ -24,7 +28,7 @@ $action-sheet-wp-icon-margin: 0 28px 0 0 !default;
2428
padding: $action-sheet-wp-title-padding;
2529
font-size: $action-sheet-wp-title-font-size;
2630
color: $action-sheet-wp-title-color;
27-
text-align: left;
31+
text-align: $action-sheet-wp-title-text-align;
2832
}
2933

3034
.action-sheet-button {
@@ -36,7 +40,7 @@ $action-sheet-wp-icon-margin: 0 28px 0 0 !default;
3640
font-weight: normal;
3741
color: $action-sheet-wp-button-text-color;
3842
background-color: transparent;
39-
text-align: left;
43+
text-align: $action-sheet-wp-button-text-align;
4044

4145
&.activated {
4246
background: $action-sheet-wp-button-background-active-color;

ionic/components/menu/menu.wp.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Windows Menu
44
// --------------------------------------------------
55

6-
$menu-wp-background: $background-wp-color !default;
6+
$menu-wp-background: #F2F2F2 !default;
77

88

99
ion-menu {

ionic/components/tabs/tabs.wp.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
$tabbar-wp-background: $toolbar-wp-background !default;
88
$tabbar-wp-item-padding: 12px 10px 5px 10px !default;
9-
$tabbar-wp-item-font-size: 1.4rem !default;
10-
$tabbar-wp-item-font-weight: 500 !default;
9+
$tabbar-wp-item-font-size: 1.2rem !default;
10+
$tabbar-wp-item-font-weight: normal !default;
1111
$tabbar-wp-item-icon-size: 2.4rem !default;
1212
$tabbar-wp-item-height: 4.8rem !default;
1313

@@ -41,7 +41,6 @@ tabbar {
4141
.tab-button-text {
4242
margin-top: 5px;
4343
margin-bottom: 5px;
44-
text-transform: uppercase;
4544
}
4645

4746
.tab-button-icon {

0 commit comments

Comments
 (0)