javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 05:21:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(button): update solid buttons to use tint and shade colors (#18537)

Browse Source
This commit is contained in:
Brandy Carney
2019-06-21 11:31:41 -04:00
committed by GitHub
parent 1e014f0b14
commit 26ecf2b10f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@
@media (any-hover: hover) { @media (any-hover: hover) {
:host(.button-solid.ion-color:hover) .button-native { :host(.button-solid.ion-color:hover) .button-native {
background: #{current-color(base, .92)}; background: #{current-color(tint)};
} }
:host(.button-clear.ion-color:hover) .button-native, :host(.button-clear.ion-color:hover) .button-native,

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

@ -79,7 +79,7 @@
:host(.button-solid) { :host(.button-solid) {
--background: #{ion-color(primary, base)}; --background: #{ion-color(primary, base)};
--background-focused: #{ion-color(primary, shade)}; --background-focused: #{ion-color(primary, shade)};
--background-hover: #{ion-color(primary, base, 0.92)}; --background-hover: #{ion-color(primary, tint)};
--color: #{ion-color(primary, contrast)}; --color: #{ion-color(primary, contrast)};
--color-activated: #{ion-color(primary, contrast)}; --color-activated: #{ion-color(primary, contrast)};
--color-focused: #{ion-color(primary, contrast)}; --color-focused: #{ion-color(primary, contrast)};

4
core/src/components/buttons/buttons.md.scss
View File

@ -38,8 +38,8 @@
:host-context(.ion-color)::slotted(*) .button-solid { :host-context(.ion-color)::slotted(*) .button-solid {
--background: #{current-color(contrast)}; --background: #{current-color(contrast)};
--background-activated: #{current-color(contrast)}; --background-activated: #{current-color(contrast)};
--background-focused: #{current-color(contrast, .9)}; --background-focused: #{current-color(shade)};
--background-hover: #{current-color(contrast, .92)}; --background-hover: #{current-color(tint)};
--color: #{current-color(base)}; --color: #{current-color(base)};
--color-focused: #{current-color(base)}; --color-focused: #{current-color(base)};
--color-hover: #{current-color(base)}; --color-hover: #{current-color(base)};