Skip to content

refactor: Typography, action hover and table head colors #4046

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
merged 2 commits into from
Sep 14, 2022
Merged

refactor: Typography, action hover and table head colors #4046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44ed42c
Adjust primary text color
BrunoQuaresma Sep 13, 2022
e4a3dd4
refactor: Typography and table head colors
BrunoQuaresma Sep 13, 2022
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
2 changes: 1 addition & 1 deletion site/src/components/NavbarView/NavbarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ const useStyles = makeStyles((theme) => ({
// NavLink adds this class when the current route matches.
"&.active": {
position: "relative",
color: theme.palette.primary.contrastText,
color: theme.palette.text.primary,
fontWeight: "bold",

"&::before": {
Expand Down
7 changes: 1 addition & 6 deletions site/src/theme/overrides.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export const getOverrides = ({ palette, breakpoints }: Theme): Overrides => {
backgroundImage: `linear-gradient(to right bottom, ${palette.background.default}, ${colors.gray[17]})`,
backgroundRepeat: "no-repeat",
backgroundAttachment: "fixed",
letterSpacing: "-0.015em",
},
":root": {
colorScheme: palette.type,
Expand Down Expand Up @@ -81,11 +80,6 @@ export const getOverrides = ({ palette, breakpoints }: Theme): Overrides => {
},
},
},
MuiTableHead: {
root: {
display: "table-header-group",
},
},
MuiTableContainer: {
root: {
borderRadius,
Expand Down Expand Up @@ -119,6 +113,7 @@ export const getOverrides = ({ palette, breakpoints }: Theme): Overrides => {
fontSize: 14,
color: palette.text.secondary,
fontWeight: 600,
background: palette.background.paperLight,
},
root: {
fontSize: 16,
Expand Down
11 changes: 9 additions & 2 deletions site/src/theme/palettes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ import { colors } from "./colors"
// Couldn't find a type for this so I made one. We can extend the palette if needed with module augmentation.
export type PaletteIndex = "primary" | "secondary" | "info" | "success" | "error" | "warning"

declare module "@material-ui/core/styles/createPalette" {
interface TypeBackground {
paperLight: string
}
}

export const darkPalette: PaletteOptions = {
type: "dark",
primary: {
Expand All @@ -20,9 +26,10 @@ export const darkPalette: PaletteOptions = {
background: {
default: colors.gray[17],
paper: colors.gray[16],
paperLight: colors.gray[15],
},
text: {
primary: colors.gray[4],
primary: colors.gray[1],
secondary: colors.gray[5],
},
divider: colors.gray[13],
Expand All @@ -46,6 +53,6 @@ export const darkPalette: PaletteOptions = {
contrastText: colors.gray[4],
},
action: {
hover: colors.gray[13],
hover: colors.gray[14],
},
}