javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 14:01:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(button): activated background color should be darker

Browse Source
This commit is contained in:
Ross Gerbasi
2018-02-13 16:40:39 -06:00
parent 23dd255a8d
commit cac60b67ee
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/src/components/button/button.ios.scss
View File

@ -46,7 +46,7 @@ button[disabled],
@mixin ios-button-default($color-name) { @mixin ios-button-default($color-name) {
$bg-color: ion-color($colors-ios, $color-name, base, ios); $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); $bg-color-focused: ion-color($colors-ios, $color-name, shade, ios);
$fg-color: ion-color($colors-ios, $color-name, contrast, ios); $fg-color: ion-color($colors-ios, $color-name, contrast, ios);

2
packages/core/src/components/button/button.ios.vars.scss
View File

@ -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; $button-ios-text-color: ion-color($colors-ios, $button-ios-background-color, contrast, ios) !default;
/// @prop - Background color of the activated button /// @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 /// @prop - Opacity of the activated button
$button-ios-opacity-activated: 1 !default; $button-ios-opacity-activated: 1 !default;

2
packages/core/src/components/button/button.md.scss
View File

@ -57,7 +57,7 @@ button[disabled],
@mixin md-button-default($color-name) { @mixin md-button-default($color-name) {
$bg-color: ion-color($colors-md, $color-name, base, md); $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); $bg-color-focused: ion-color($colors-md, $color-name, shade, md);
$fg-color: ion-color($colors-md, $color-name, contrast, md); $fg-color: ion-color($colors-md, $color-name, contrast, md);

2
packages/core/src/components/button/button.md.vars.scss
View File

@ -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; $button-md-background-color-hover: $button-md-background-color !default;
/// @prop - Background color of the activated button /// @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 /// @prop - Opacity of the activated button
$button-md-opacity-activated: 1 !default; $button-md-opacity-activated: 1 !default;