Skip to content

Commit

Permalink
feat: Use consistent colors for links and highlighting (#1989)
Browse files Browse the repository at this point in the history
* feat: consistent highlight colors

* update user dropdown menu border

* update borderedmenurow active color
  • Loading branch information
AbhineetJain committed Jun 3, 2022
1 parent 6bb7678 commit d6e9eab
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions site/src/components/BorderedMenu/BorderedMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ const useStyles = makeStyles((theme) => ({
},
paperRoot: {
width: "292px",
border: `2px solid ${theme.palette.primary.main}`,
border: `2px solid ${theme.palette.secondary.dark}`,
borderRadius: 7,
boxShadow: `4px 4px 0px ${fade(theme.palette.primary.main, 0.2)}`,
boxShadow: `4px 4px 0px ${fade(theme.palette.secondary.dark, 0.2)}`,
},
}))
4 changes: 2 additions & 2 deletions site/src/components/BorderedMenuRow/BorderedMenuRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ const useStyles = makeStyles((theme) => ({
},

"&[data-status='active']": {
color: theme.palette.primary.main,
color: theme.palette.secondary.dark,
"& .BorderedMenuRow-description": {
color: theme.palette.text.primary,
},
"& .BorderedMenuRow-icon": {
color: theme.palette.primary.main,
color: theme.palette.secondary.dark,
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/BuildsTable/BuildsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const useStyles = makeStyles((theme) => ({
},

"&:focus": {
outline: `1px solid ${theme.palette.primary.dark}`,
outline: `1px solid ${theme.palette.secondary.dark}`,
},
},
}))
2 changes: 1 addition & 1 deletion site/src/components/NavbarView/NavbarView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const useStyles = makeStyles((theme) => ({
content: `" "`,
bottom: 0,
left: theme.spacing(3),
background: "#C16800",
background: theme.palette.secondary.dark,
right: theme.spacing(3),
height: 2,
position: "absolute",
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/TabSidebar/TabSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const useStyles = makeStyles((theme) => ({
color: theme.palette.text.primary,
},
"&.active": {
color: theme.palette.primary.dark,
color: theme.palette.secondary.dark,
},

"&.active, &:hover": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ const useStyles = makeStyles((theme) => ({
margin: theme.spacing(0.5),
},
chipRoot: {
backgroundColor: "#7057FF",
backgroundColor: theme.palette.secondary.dark,
},
link: {
textDecoration: "none",
Expand Down
1 change: 1 addition & 0 deletions site/src/theme/palettes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export const darkPalette: PaletteOptions = {
secondary: {
main: "#008510",
contrastText: "#f8f8f8",
dark: "#7057FF",
},
background: {
default: "#1F1F1F",
Expand Down

0 comments on commit d6e9eab

Please sign in to comment.