From cac60b67eea16890c07852e4d5ad66215648a08a Mon Sep 17 00:00:00 2001 From: Ross Gerbasi Date: Tue, 13 Feb 2018 16:40:39 -0600 Subject: [PATCH] fix(button): activated background color should be darker --- packages/core/src/components/button/button.ios.scss | 2 +- packages/core/src/components/button/button.ios.vars.scss | 2 +- packages/core/src/components/button/button.md.scss | 2 +- packages/core/src/components/button/button.md.vars.scss | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/src/components/button/button.ios.scss b/packages/core/src/components/button/button.ios.scss index 418dcaabfc..8a18c5fb7b 100644 --- a/packages/core/src/components/button/button.ios.scss +++ b/packages/core/src/components/button/button.ios.scss @@ -46,7 +46,7 @@ button[disabled], @mixin ios-button-default($color-name) { $bg-color: ion-color($colors-ios, $color-name, base, ios); - $bg-color-activated: ion-color($colors-ios, $color-name, tint, ios); + $bg-color-activated: ion-color($colors-ios, $color-name, shade, ios); $bg-color-focused: ion-color($colors-ios, $color-name, shade, ios); $fg-color: ion-color($colors-ios, $color-name, contrast, ios); diff --git a/packages/core/src/components/button/button.ios.vars.scss b/packages/core/src/components/button/button.ios.vars.scss index 61be82a95e..3d51e02c60 100644 --- a/packages/core/src/components/button/button.ios.vars.scss +++ b/packages/core/src/components/button/button.ios.vars.scss @@ -46,7 +46,7 @@ $button-ios-background-color: ion-color($colors-ios, prima $button-ios-text-color: ion-color($colors-ios, $button-ios-background-color, contrast, ios) !default; /// @prop - Background color of the activated button -$button-ios-background-color-activated: ion-color($colors-ios, $button-ios-background-color, tint, ios) !default; +$button-ios-background-color-activated: ion-color($colors-ios, $button-ios-background-color, shade, ios) !default; /// @prop - Opacity of the activated button $button-ios-opacity-activated: 1 !default; diff --git a/packages/core/src/components/button/button.md.scss b/packages/core/src/components/button/button.md.scss index a761476d94..fe5afc1d07 100644 --- a/packages/core/src/components/button/button.md.scss +++ b/packages/core/src/components/button/button.md.scss @@ -57,7 +57,7 @@ button[disabled], @mixin md-button-default($color-name) { $bg-color: ion-color($colors-md, $color-name, base, md); - $bg-color-activated: ion-color($colors-md, $color-name, tint, md); + $bg-color-activated: ion-color($colors-md, $color-name, shade, md); $bg-color-focused: ion-color($colors-md, $color-name, shade, md); $fg-color: ion-color($colors-md, $color-name, contrast, md); diff --git a/packages/core/src/components/button/button.md.vars.scss b/packages/core/src/components/button/button.md.vars.scss index 1b8391f026..5a750e7f84 100644 --- a/packages/core/src/components/button/button.md.vars.scss +++ b/packages/core/src/components/button/button.md.vars.scss @@ -64,7 +64,7 @@ $button-md-transition-timing-function: cubic-bezier(.4, 0, .2, 1) !default; $button-md-background-color-hover: $button-md-background-color !default; /// @prop - Background color of the activated button -$button-md-background-color-activated: ion-color($colors-md, $button-md-background-color, tint, md) !default; +$button-md-background-color-activated: ion-color($colors-md, $button-md-background-color, shade, md) !default; /// @prop - Opacity of the activated button $button-md-opacity-activated: 1 !default;