Skip to content

Commit

Permalink
update icon component to consume new design langauge
Browse files Browse the repository at this point in the history
  • Loading branch information
danrosenthal committed Feb 27, 2020
1 parent 9b679d1 commit b032a9e
Show file tree
Hide file tree
Showing 7 changed files with 344 additions and 31 deletions.
4 changes: 2 additions & 2 deletions src/components/Button/Button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ $stacking-order: (
@include recolor-icon(color('white'));

&.newDesignLanguage {
@include recolor-icon(var(--p-button-text));
@include recolor-icon(var(--p-icon-on-primary));
}

&.disabled {
Expand Down Expand Up @@ -230,7 +230,7 @@ $stacking-order: (
}

&.newDesignLanguage {
@include recolor-icon(var(--p-button-text));
@include recolor-icon(var(--p-icon-on-critical));
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/Frame/components/Toast/Toast.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $Backdrop-opacity: 0.88;
color: $error-color;

.CloseButton {
fill: $error-color;
fill: var(--p-icon-on-critical, $error-color);
}
}

Expand All @@ -51,7 +51,7 @@ $Backdrop-opacity: 0.88;
border: none;
appearance: none;
background: transparent;
fill: var(--p-text, color('white'));
fill: var(--p-icon, color('white'));
cursor: pointer;

&:focus {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Frame/components/Toast/Toast.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import styles from './Toast.scss';

export {ToastProps};

export const DEFAULT_TOAST_DURATION = 5000;
export const DEFAULT_TOAST_DURATION = 500000;

export const DEFAULT_TOAST_DURATION_WITH_ACTION = 10000;
export const DEFAULT_TOAST_DURATION_WITH_ACTION = 1000000;

export function Toast({
content,
Expand Down
Loading

0 comments on commit b032a9e

Please sign in to comment.