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

fix(color): edge currentColor bug (#16177)

Browse Source 
fixes #16168
This commit is contained in:
Manu MA
2018-11-01 18:14:31 +01:00
committed by Adam Bradley
parent 1935deb012
commit fce30ebc06
11 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +24,8 @@
// -------------------------------------------------- // --------------------------------------------------
:host-context(.ion-color)::slotted(*) .button { :host-context(.ion-color)::slotted(*) .button {
--color: currentColor; --color: initial;
--color-activated: currentColor; --color-activated: initial;
} }

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

@ -25,8 +25,8 @@
// -------------------------------------------------- // --------------------------------------------------
:host-context(.ion-color)::slotted(*) .button { :host-context(.ion-color)::slotted(*) .button {
--color: currentColor; --color: initial;
--color-activated: currentColor; --color-activated: initial;
} }
@ -45,7 +45,7 @@
// -------------------------------------------------- // --------------------------------------------------
::slotted(*) .button-outline { ::slotted(*) .button-outline {
--color: currentColor; --color: initial;
--color-activated: currentColor; --color-activated: currentColor;
--background: transparent; --background: transparent;
--background-activated: transparent; --background-activated: transparent;
@ -57,7 +57,7 @@
// -------------------------------------------------- // --------------------------------------------------
::slotted(*) .button-clear { ::slotted(*) .button-clear {
--color: currentColor; --color: initial;
--color-activated: currentColor; --color-activated: currentColor;
--background: transparent; --background: transparent;
} }

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

@ -45,7 +45,7 @@
:host(.ion-color)::slotted(*) ion-chip-icon, :host(.ion-color)::slotted(*) ion-chip-icon,
:host(.ion-color)::slotted(*) ion-chip-button { :host(.ion-color)::slotted(*) ion-chip-button {
--color: currentColor; --color: initial;
} }
::slotted(*) ion-label { ::slotted(*) ion-label {

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

@ -16,7 +16,7 @@
* @prop --placeholder-font-weight: Font weight of the input placeholder text * @prop --placeholder-font-weight: Font weight of the input placeholder text
* @prop --placeholder-opacity: Opacity of the input placeholder text * @prop --placeholder-opacity: Opacity of the input placeholder text
*/ */
--placeholder-color: currentColor; --placeholder-color: initial;
--placeholder-font-style: inherit; --placeholder-font-style: inherit;
--placeholder-font-weight: inherit; --placeholder-font-weight: inherit;
--placeholder-opacity: .5; --placeholder-opacity: .5;

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

@ -53,7 +53,7 @@
--inner-box-shadow: none; --inner-box-shadow: none;
--show-full-highlight: 0; --show-full-highlight: 0;
--show-inset-highlight: 0; --show-inset-highlight: 0;
--detail-icon-color: currentColor; --detail-icon-color: initial;
--detail-icon-font-size: 20px; --detail-icon-font-size: 20px;
--detail-icon-opacity: 0.25; --detail-icon-opacity: 0.25;

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

@ -8,7 +8,7 @@
/** /**
* @prop --color: Color of the label * @prop --color: Color of the label
*/ */
--color: currentColor; --color: initial;
@include margin(0); @include margin(0);

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

@ -4,7 +4,7 @@
// -------------------------------------------------- // --------------------------------------------------
:host { :host {
--color: currentColor; --color: initial;
} }
button { button {

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

@ -5,7 +5,7 @@
// -------------------------------------------------- // --------------------------------------------------
:host { :host {
--clear-button-color: currentColor; --clear-button-color: initial;
--cancel-button-color: #{$searchbar-md-cancel-button-color}; --cancel-button-color: #{$searchbar-md-cancel-button-color};
--color: #{$searchbar-md-input-text-color}; --color: #{$searchbar-md-input-text-color};
--icon-color: #{$searchbar-md-input-search-icon-color}; --icon-color: #{$searchbar-md-input-search-icon-color};

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

@ -15,7 +15,7 @@
* @prop --placeholder-font-weight: Font weight of the searchbar placeholder * @prop --placeholder-font-weight: Font weight of the searchbar placeholder
* @prop --placeholder-opacity: Opacity of the searchbar placeholder * @prop --placeholder-opacity: Opacity of the searchbar placeholder
*/ */
--placeholder-color: currentColor; --placeholder-color: initial;
--placeholder-font-style: inherit; --placeholder-font-style: inherit;
--placeholder-font-weight: inherit; --placeholder-font-weight: inherit;
--placeholder-opacity: .5; --placeholder-opacity: .5;

4
core/src/components/textarea/textarea.scss
View File

@ -18,8 +18,8 @@
* @prop --padding-start: Start padding of the textarea * @prop --padding-start: Start padding of the textarea
*/ */
--background: initial; --background: initial;
--color: currentColor; --color: initial;
--placeholder-color: currentColor; --placeholder-color: initial;
--placeholder-font-style: inherit; --placeholder-font-style: inherit;
--placeholder-font-weight: inherit; --placeholder-font-weight: inherit;
--placeholder-opacity: .5; --placeholder-opacity: .5;

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

@ -7,7 +7,7 @@
/** /**
* @prop --color: Text color of the title * @prop --color: Text color of the title
*/ */
--color: currentColor; --color: initial;
display: flex; display: flex;