Skip to content

Commit

Permalink
fix(color): edge currentColor bug (#16177)
Browse files Browse the repository at this point in the history
fixes #16168
  • Loading branch information
manucorporat authored and adamdbradley committed Nov 1, 2018
1 parent 1935deb commit fce30eb
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions core/src/components/buttons/buttons.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
// --------------------------------------------------

:host-context(.ion-color)::slotted(*) .button {
--color: currentColor;
--color-activated: currentColor;
--color: initial;
--color-activated: initial;
}


Expand Down
8 changes: 4 additions & 4 deletions core/src/components/buttons/buttons.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
// --------------------------------------------------

:host-context(.ion-color)::slotted(*) .button {
--color: currentColor;
--color-activated: currentColor;
--color: initial;
--color-activated: initial;
}


Expand All @@ -45,7 +45,7 @@
// --------------------------------------------------

::slotted(*) .button-outline {
--color: currentColor;
--color: initial;
--color-activated: currentColor;
--background: transparent;
--background-activated: transparent;
Expand All @@ -57,7 +57,7 @@
// --------------------------------------------------

::slotted(*) .button-clear {
--color: currentColor;
--color: initial;
--color-activated: currentColor;
--background: transparent;
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/chip/chip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

:host(.ion-color)::slotted(*) ion-chip-icon,
:host(.ion-color)::slotted(*) ion-chip-button {
--color: currentColor;
--color: initial;
}

::slotted(*) ion-label {
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/input/input.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @prop --placeholder-font-weight: Font weight 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-weight: inherit;
--placeholder-opacity: .5;
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/item/item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
--inner-box-shadow: none;
--show-full-highlight: 0;
--show-inset-highlight: 0;
--detail-icon-color: currentColor;
--detail-icon-color: initial;
--detail-icon-font-size: 20px;
--detail-icon-opacity: 0.25;

Expand Down
2 changes: 1 addition & 1 deletion core/src/components/label/label.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
* @prop --color: Color of the label
*/
--color: currentColor;
--color: initial;

@include margin(0);

Expand Down
2 changes: 1 addition & 1 deletion core/src/components/menu-button/menu-button.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// --------------------------------------------------

:host {
--color: currentColor;
--color: initial;
}

button {
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/searchbar/searchbar.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// --------------------------------------------------

:host {
--clear-button-color: currentColor;
--clear-button-color: initial;
--cancel-button-color: #{$searchbar-md-cancel-button-color};
--color: #{$searchbar-md-input-text-color};
--icon-color: #{$searchbar-md-input-search-icon-color};
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/searchbar/searchbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @prop --placeholder-font-weight: Font weight of the searchbar placeholder
* @prop --placeholder-opacity: Opacity of the searchbar placeholder
*/
--placeholder-color: currentColor;
--placeholder-color: initial;
--placeholder-font-style: inherit;
--placeholder-font-weight: inherit;
--placeholder-opacity: .5;
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/textarea/textarea.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* @prop --padding-start: Start padding of the textarea
*/
--background: initial;
--color: currentColor;
--placeholder-color: currentColor;
--color: initial;
--placeholder-color: initial;
--placeholder-font-style: inherit;
--placeholder-font-weight: inherit;
--placeholder-opacity: .5;
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/title/title.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/**
* @prop --color: Text color of the title
*/
--color: currentColor;
--color: initial;

display: flex;

Expand Down

0 comments on commit fce30eb

Please sign in to comment.