Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IOAPPX-285] Update the color scale in relation to red #244

Merged
merged 6 commits into from
Apr 15, 2024
Merged

[IOAPPX-285] Update the color scale in relation to red #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78a62cc
Update red color values
dmnplb Apr 12, 2024
1dac166
Update `ButtonSolid` danger variant
dmnplb Apr 12, 2024
4e2745f
Update theme keys used in `ListItemNavAlert`
dmnplb Apr 12, 2024
831c901
Update `ListItemAction`
dmnplb Apr 12, 2024
0bbcac3
Update `jest` snapshots
dmnplb Apr 12, 2024
93c551d
Merge branch 'main' into IOAPPX-285-update-red-color-scale
dmnplb Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/buttons/ButtonSolid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ const mapColorStates: Record<
},
// Danger button
danger: {
default: IOColors["error-850"],
pressed: IOColors["error-600"],
default: IOColors["error-600"],
pressed: IOColors["error-500"],
label: {
default: "white",
disabled: "grey-700"
Expand Down
2 changes: 1 addition & 1 deletion src/components/listitems/ListItemAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const ListItemAction = ({
IOColors
> = {
primary: "blue",
danger: "error-850"
danger: "error-600"
};

const mapForegroundColor: Record<
Expand Down
8 changes: 4 additions & 4 deletions src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemNavAlert Snap
"borderWidth": 0,
},
{
"color": "#FE6666",
"color": "#D13333",
},
{
"flex": 0,
Expand All @@ -786,7 +786,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemNavAlert Snap
},
]
}
tintColor="#FE6666"
tintColor="#D13333"
vbHeight={24}
vbWidth={24}
width={24}
Expand Down Expand Up @@ -2582,7 +2582,7 @@ exports[`Test List Item Components ListItemNavAlert Snapshot 1`] = `
"borderWidth": 0,
},
{
"color": "#FE6666",
"color": "#D13333",
},
{
"flex": 0,
Expand All @@ -2591,7 +2591,7 @@ exports[`Test List Item Components ListItemNavAlert Snapshot 1`] = `
},
]
}
tintColor="#FE6666"
tintColor="#D13333"
vbHeight={24}
vbWidth={24}
width={24}
Expand Down
12 changes: 6 additions & 6 deletions src/components/toast/__tests__/__snapshots__/ToastNotification.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ exports[`Test ToastNotification component - Experimental Enabled should match sn
"padding": 16,
},
{
"backgroundColor": "#FFE0E0",
"borderColor": "#761F1F",
"backgroundColor": "#FFD9D9",
"borderColor": "#5D1313",
},
]
}
Expand All @@ -169,7 +169,7 @@ exports[`Test ToastNotification component - Experimental Enabled should match sn
"fontSize": 16,
},
{
"color": "#761F1F",
"color": "#5D1313",
"fontFamily": "Readex Pro",
"fontStyle": "normal",
"fontWeight": "400",
Expand Down Expand Up @@ -557,8 +557,8 @@ exports[`Test ToastNotification component should match snapshot for props ({ mes
"padding": 16,
},
{
"backgroundColor": "#FFE0E0",
"borderColor": "#761F1F",
"backgroundColor": "#FFD9D9",
"borderColor": "#5D1313",
},
]
}
Expand All @@ -584,7 +584,7 @@ exports[`Test ToastNotification component should match snapshot for props ({ mes
"fontSize": 16,
},
{
"color": "#761F1F",
"color": "#5D1313",
"fontFamily": "Titillium Web",
"fontStyle": "normal",
"fontWeight": "700",
Expand Down
14 changes: 7 additions & 7 deletions src/core/IOColors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ export const IOColors = asIOColors({
"turquoise-150": "#AAEEEF",
"turquoise-100": "#C2F3F4",
"turquoise-50": "#DBF9FA",
"error-850": "#761F1F",
"error-600": "#D75252",
"error-500": "#FE6666",
"error-400": "#FE8585" /* Dark mode */,
"error-100": "#FFE0E0",
"error-850": "#5D1313",
"error-600": "#D13333",
"error-500": "#FF4040",
"error-400": "#FF6666" /* Dark mode */,
"error-100": "#FFD9D9",
"warning-850": "#614C15",
"warning-700": "#A5822A",
"warning-500": "#FFCB46",
Expand Down Expand Up @@ -319,8 +319,8 @@ export const IOThemeLight: IOTheme = {
// Layout
"divider-default": "grey-200",
// Status
errorIcon: "error-500",
errorText: "error-850",
errorIcon: "error-600",
errorText: "error-600",
// Pictograms
"pictogram-hands": "blueIO-500",
"pictogram-tint-main": "turquoise-150",
Expand Down
Loading