diff --git a/ionic/components/alert/alert.wp.scss b/ionic/components/alert/alert.wp.scss index 8732a0dad9..0346218b32 100644 --- a/ionic/components/alert/alert.wp.scss +++ b/ionic/components/alert/alert.wp.scss @@ -48,6 +48,7 @@ $alert-wp-button-font-weight: 300 !default; $alert-wp-checkbox-background: map-get($colors-wp, primary) !default; $alert-wp-checkbox-border-color: $input-wp-border-color !default; +$alert-wp-checkbox-border-radius: 0 !default; $alert-wp-radio-background: map-get($colors-wp, primary) !default; $alert-wp-radio-border-color: $input-wp-border-color !default; @@ -218,7 +219,7 @@ ion-alert { left: 13px; width: 16px; height: 16px; - border-radius: 2px; + border-radius: $alert-wp-checkbox-border-radius; border-width: 2px; border-style: solid; border-color: $alert-wp-checkbox-border-color; diff --git a/ionic/components/card/card.wp.scss b/ionic/components/card/card.wp.scss index 3b17d15ef7..471abc4702 100644 --- a/ionic/components/card/card.wp.scss +++ b/ionic/components/card/card.wp.scss @@ -21,9 +21,8 @@ $card-wp-avatar-size: 4rem !default; $card-wp-thumbnail-size: 8rem !default; $card-wp-background-color: $list-wp-background-color !default; -$card-wp-border: 2px solid rgba(0,0,0,0.2) !default; -$card-wp-box-shadow: none !default; -$card-wp-border-radius: 4px !default; +$card-wp-box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.2) !default; +$card-wp-border-radius: 1px !default; $card-wp-font-size: 1.4rem !default; $card-wp-line-height: 1.5 !default; @@ -45,7 +44,6 @@ ion-card { background: $card-wp-background-color; border-radius: $card-wp-border-radius; box-shadow: $card-wp-box-shadow; - border: $card-wp-border; ion-list { margin-bottom: 0; diff --git a/ionic/components/searchbar/searchbar.wp.scss b/ionic/components/searchbar/searchbar.wp.scss index 85ef2cdb6f..955e87550b 100644 --- a/ionic/components/searchbar/searchbar.wp.scss +++ b/ionic/components/searchbar/searchbar.wp.scss @@ -150,7 +150,7 @@ ion-searchbar { @each $color-name, $color-value in $colors-wp { - ion-searchbar[#{$color-name}] .searchbar-focused { + ion-searchbar[#{$color-name}].searchbar-focused { border-color: $color-value; } diff --git a/ionic/components/searchbar/test/toolbar/main.html b/ionic/components/searchbar/test/toolbar/main.html index 30683770b0..d3641465c5 100644 --- a/ionic/components/searchbar/test/toolbar/main.html +++ b/ionic/components/searchbar/test/toolbar/main.html @@ -10,12 +10,12 @@
Search - Primary Toolbar
- +
Search - Danger Toolbar
- +
Search - Light Toolbar
diff --git a/ionic/components/segment/segment.wp.scss b/ionic/components/segment/segment.wp.scss index e55b9d504a..b3f46bbfc6 100644 --- a/ionic/components/segment/segment.wp.scss +++ b/ionic/components/segment/segment.wp.scss @@ -16,7 +16,7 @@ $segment-button-wp-icon-size: 2.6rem !default; $segment-button-wp-icon-line-height: $segment-button-wp-line-height !default; $segment-button-wp-background-color: transparent !default; -$segment-button-wp-opacity: 0.7 !default; +$segment-button-wp-opacity: 0.5 !default; $segment-button-wp-opacity-activated: 1.0 !default; $segment-button-wp-buttons-justify-content: flex-start !default; diff --git a/ionic/components/tabs/tabs.wp.scss b/ionic/components/tabs/tabs.wp.scss index 72db8575a0..9d65dee5ef 100644 --- a/ionic/components/tabs/tabs.wp.scss +++ b/ionic/components/tabs/tabs.wp.scss @@ -35,6 +35,11 @@ tabbar { &[aria-selected=true] { opacity: 1.0; color: $tab-button-wp-active-color; + border-bottom: 2px solid $tab-button-wp-active-color; + } + + &.activated { + background: rgba(0,0,0,0.1); } } @@ -45,7 +50,7 @@ tabbar { .tab-button-icon { font-size: $tabbar-wp-item-icon-size; - min-width: $tabbar-wp-item-icon-size + 5; + min-width: $tabbar-wp-item-icon-size; } [tabbarIcons=bottom] .tab-button { @@ -83,6 +88,7 @@ tabbar { .tab-button:hover:not(.disable-hover), .tab-button[aria-selected=true] { color: color-inverse($color-value); + border-color: color-inverse($color-value); } } diff --git a/ionic/components/tabs/test/basic/index.ts b/ionic/components/tabs/test/basic/index.ts index 0c5085c3c7..ea97f343cf 100644 --- a/ionic/components/tabs/test/basic/index.ts +++ b/ionic/components/tabs/test/basic/index.ts @@ -174,7 +174,7 @@ class Tab3 { - + diff --git a/ionic/components/toolbar/toolbar.wp.scss b/ionic/components/toolbar/toolbar.wp.scss index 9361b7e1c0..da6cc16378 100644 --- a/ionic/components/toolbar/toolbar.wp.scss +++ b/ionic/components/toolbar/toolbar.wp.scss @@ -55,6 +55,7 @@ ion-navbar-section { flex: 1; order: map-get($toolbar-order-wp, content); max-width: 100%; + min-width: 0; } .toolbar-title {