From 138e8763dccb1b689b5e9d6a8d0860a7220362a5 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Wed, 24 Feb 2016 14:46:45 -0500 Subject: [PATCH] feat(windows): clean up action sheet UI references #5565 --- .../action-sheet/action-sheet.wp.scss | 18 +++++++++++------- ionic/components/menu/menu.wp.scss | 2 +- ionic/components/tabs/tabs.wp.scss | 5 ++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ionic/components/action-sheet/action-sheet.wp.scss b/ionic/components/action-sheet/action-sheet.wp.scss index a3ffd988b6f..c87b0ce9ab6 100644 --- a/ionic/components/action-sheet/action-sheet.wp.scss +++ b/ionic/components/action-sheet/action-sheet.wp.scss @@ -4,17 +4,21 @@ // Windows Action Sheet // -------------------------------------------------- -$action-sheet-wp-background-color: #fafafa !default; +$action-sheet-wp-text-align: left !default; + +$action-sheet-wp-background-color: #F2F2F2 !default; -$action-sheet-wp-title-color: #757575 !default; -$action-sheet-wp-title-font-size: 1.6rem !default; $action-sheet-wp-title-padding: 19px 16px 17px !default; +$action-sheet-wp-title-font-size: 1.6rem !default; +$action-sheet-wp-title-color: #4D4D4D !default; +$action-sheet-wp-title-text-align: $action-sheet-wp-text-align !default; $action-sheet-wp-button-height: 4.8rem !default; -$action-sheet-wp-button-text-color: #222 !default; +$action-sheet-wp-button-text-color: #4D4D4D !default; $action-sheet-wp-button-font-size: 1.6rem !default; $action-sheet-wp-button-padding: 0 16px !default; -$action-sheet-wp-button-background-active-color: #f1f1f1 !default; +$action-sheet-wp-button-text-align: $action-sheet-wp-text-align !default; +$action-sheet-wp-button-background-active-color: $list-wp-activated-background-color !default; $action-sheet-wp-icon-font-size: 2.4rem !default; $action-sheet-wp-icon-margin: 0 28px 0 0 !default; @@ -24,7 +28,7 @@ $action-sheet-wp-icon-margin: 0 28px 0 0 !default; padding: $action-sheet-wp-title-padding; font-size: $action-sheet-wp-title-font-size; color: $action-sheet-wp-title-color; - text-align: left; + text-align: $action-sheet-wp-title-text-align; } .action-sheet-button { @@ -36,7 +40,7 @@ $action-sheet-wp-icon-margin: 0 28px 0 0 !default; font-weight: normal; color: $action-sheet-wp-button-text-color; background-color: transparent; - text-align: left; + text-align: $action-sheet-wp-button-text-align; &.activated { background: $action-sheet-wp-button-background-active-color; diff --git a/ionic/components/menu/menu.wp.scss b/ionic/components/menu/menu.wp.scss index 464b9884cee..63fd324b3d8 100644 --- a/ionic/components/menu/menu.wp.scss +++ b/ionic/components/menu/menu.wp.scss @@ -3,7 +3,7 @@ // Windows Menu // -------------------------------------------------- -$menu-wp-background: $background-wp-color !default; +$menu-wp-background: #F2F2F2 !default; ion-menu { diff --git a/ionic/components/tabs/tabs.wp.scss b/ionic/components/tabs/tabs.wp.scss index 44e53620168..72db8575a0d 100644 --- a/ionic/components/tabs/tabs.wp.scss +++ b/ionic/components/tabs/tabs.wp.scss @@ -6,8 +6,8 @@ $tabbar-wp-background: $toolbar-wp-background !default; $tabbar-wp-item-padding: 12px 10px 5px 10px !default; -$tabbar-wp-item-font-size: 1.4rem !default; -$tabbar-wp-item-font-weight: 500 !default; +$tabbar-wp-item-font-size: 1.2rem !default; +$tabbar-wp-item-font-weight: normal !default; $tabbar-wp-item-icon-size: 2.4rem !default; $tabbar-wp-item-height: 4.8rem !default; @@ -41,7 +41,6 @@ tabbar { .tab-button-text { margin-top: 5px; margin-bottom: 5px; - text-transform: uppercase; } .tab-button-icon {