Skip to content

add new primary color to palette #3951

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

Merged
ahussein3 merged 5 commits into from
Aug 23, 2023
Merged

add new primary color to palette #3951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43002ad
add new primary color to palette
Aug 17, 2023
06ff245
update row bottom border color for dark mode
Aug 22, 2023
4c51b65
Merge branch 'main' into AddDarkModeNewColor
ahussein3 Aug 22, 2023
92ca113
update Table snapshot
Aug 22, 2023
6f155ce
Merge branch 'main' into AddDarkModeNewColor
ahussein3 Aug 23, 2023
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
7 changes: 7 additions & 0 deletions ui/components/DataTable/DataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,13 @@ export const DataTable = styled(UnstyledDataTable)`
: props.theme.colors.neutral10};
transition: background 0.5s ease-in-out;
}

.MuiTableCell-root {
border-color: ${(props) =>
props.theme.mode === ThemeTypes.Dark
? props.theme.colors.primary30
: props.theme.colors.neutral20};
}
table {
margin-top: ${(props) => props.theme.spacing.small};
}
Expand Down
4 changes: 4 additions & 0 deletions ui/components/DataTable/__tests__/__snapshots__/DataTable.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,10 @@ exports[`DataTable snapshots renders 1`] = `
transition: background 0.5s ease-in-out;
}

.c1 .MuiTableCell-root {
border-color: #d8d8d8;
}

.c1 table {
margin-top: 12px;
}
Expand Down
10 changes: 9 additions & 1 deletion ui/lib/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export const theme = (mode: ThemeTypes = ThemeTypes.Light): DefaultTheme => {
primaryLight10: "#98E0F7",
primary10: "#00b3ec",
primary20: "#006B8E",
primary30: "#556991",
successLight: "#156034",
successMedium: "#78CC9C",
successOriginal: "#27AE60",
Expand Down Expand Up @@ -106,6 +107,7 @@ export const theme = (mode: ThemeTypes = ThemeTypes.Light): DefaultTheme => {
primaryLight10: "#98E0F7",
primary10: "#009CCC",
primary20: "#006B8E",
primary30: "#556991",
successLight: "#C9EBD7",
successMedium: "#78CC9C",
successOriginal: "#27AE60",
Expand Down Expand Up @@ -282,7 +284,7 @@ export const muiTheme = (colors, mode) =>
root: {
"&$disabled": {
color:
mode === ThemeTypes.Dark ? colors.primary20 : colors.neutral20,
mode === ThemeTypes.Dark ? colors.primary30 : colors.neutral20,
},
},
outlined: {
Expand All @@ -292,6 +294,12 @@ export const muiTheme = (colors, mode) =>
? `1px solid ${colors.primary20}`
: `1px solid ${colors.neutral20}`,
},
"&$outlinedPrimary": {
border:
mode === ThemeTypes.Dark
? `1px solid ${colors.primary30}`
: `1px solid ${colors.neutral20}`,
},
},
},
//disabled checkboxes in dark mode
Expand Down
1 change: 1 addition & 0 deletions ui/typedefs/styled.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export namespace colors {
const primaryLight10: string;
const primary10: string;
const primary20: string;
const primary30: string;
const alertLight: string;
const alertOriginal: string;
const alertMedium: string;
Expand Down