8000 feat: Use consistent colors for links and highlighting by AbhineetJain · Pull Request #1989 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat: Use consistent colors for links and highlighting #1989

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 3 commits into from
Jun 3, 2022
Merged

feat: Use consistent colors for links and highlighting #1989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ee3dd9
feat: consistent highlight colors
AbhineetJain Jun 2, 2022
7398478
update user dropdown menu border
AbhineetJain Jun 2, 2022
124b62d
update borderedmenurow active color
AbhineetJain Jun 2, 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
4 changes: 2 additions & 2 deletions site/src/components/BorderedMenu/BorderedMenu.tsx
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion site/src/components/UserDropdownContent/UserDropdownContent.tsx
View file
Open in desktop
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 1 site/src/theme/palettes.ts
View file
Open in desktop
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",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

},
background: {
default: "#1F1F1F",
Expand Down
0