From b1226cbb41960a77beee9504d5413098c25f30ae Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 30 Mar 2016 19:54:15 -0500 Subject: [PATCH 1/2] segment.wp: display active style outside toolbar In the iOS and Android styles the segment-activated class lives directly under segment-button. However in the Windows Phone version these styles live only under toolbar, causing the styles to not be applied properly if the ion-segment is used outside of a toolbar. --- ionic/components/segment/segment.wp.scss | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ionic/components/segment/segment.wp.scss b/ionic/components/segment/segment.wp.scss index bfc00f377a..eae6abc7e0 100644 --- a/ionic/components/segment/segment.wp.scss +++ b/ionic/components/segment/segment.wp.scss @@ -39,6 +39,11 @@ ion-segment { color: $segment-button-wp-text-color-activated; background-color: $segment-button-wp-background-color; opacity: $segment-button-wp-opacity; + + .activated, + .segment-activated { + opacity: $segment-button-wp-opacity-activated; + } ion-icon { font-size: $segment-button-wp-icon-size; @@ -51,12 +56,6 @@ ion-segment { ion-segment { margin: 0 auto; } - - .segment-button.activated, - .segment-button.segment-activated { - opacity: $segment-button-wp-opacity-activated; - } - } From 87a8f8dbc1a1688b8842203a3ec96c29780638ae Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 30 Mar 2016 20:05:55 -0500 Subject: [PATCH 2/2] match syntax of ios.scss file Updated the syntax of the fix to match ios style --- ionic/components/segment/segment.wp.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ionic/components/segment/segment.wp.scss b/ionic/components/segment/segment.wp.scss index eae6abc7e0..464df8f8cd 100644 --- a/ionic/components/segment/segment.wp.scss +++ b/ionic/components/segment/segment.wp.scss @@ -40,8 +40,7 @@ ion-segment { background-color: $segment-button-wp-background-color; opacity: $segment-button-wp-opacity; - .activated, - .segment-activated { + &.segment-activated { opacity: $segment-button-wp-opacity-activated; }