Skip to content

fix: make text colors legible #3250

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 6 commits into from
Jul 27, 2022
Merged

fix: make text colors legible #3250

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
ec4914d
Update color palette
presleyp Jul 27, 2022
cfe1cb1
Edit dialog error colors
presleyp Jul 27, 2022
3838756
Format
presleyp Jul 27, 2022
3b6e0c6
Lighten links
presleyp Jul 27, 2022
6e0b036
Lighten link just in ErrorSummary
presleyp Jul 27, 2022
6f2cfe6
Format
presleyp Jul 27, 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
6 changes: 3 additions & 3 deletions site/src/components/Dialog/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import MuiDialog, { DialogProps as MuiDialogProps } from "@material-ui/core/Dial
import MuiDialogTitle from "@material-ui/core/DialogTitle"
import InputAdornment from "@material-ui/core/InputAdornment"
import OutlinedInput, { OutlinedInputProps } from "@material-ui/core/OutlinedInput"
import { darken, fade, makeStyles } from "@material-ui/core/styles"
import { darken, fade, lighten, makeStyles } from "@material-ui/core/styles"
import SvgIcon from "@material-ui/core/SvgIcon"
import * as React from "react"
import { combineClasses } from "../../util/combineClasses"
Expand Down Expand Up @@ -200,10 +200,10 @@ const useButtonStyles = makeStyles((theme) => ({
},
errorButton: {
"&.MuiButton-contained": {
backgroundColor: theme.palette.error.main,
backgroundColor: lighten(theme.palette.error.dark, 0.15),
color: theme.palette.error.contrastText,
"&:hover": {
backgroundColor: darken(theme.palette.error.main, 0.3),
backgroundColor: theme.palette.error.dark,
"@media (hover: none)": {
backgroundColor: "transparent",
},
Expand Down
3 changes: 2 additions & 1 deletion site/src/components/ErrorSummary/ErrorSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Button from "@material-ui/core/Button"
import Collapse from "@material-ui/core/Collapse"
import IconButton from "@material-ui/core/IconButton"
import Link from "@material-ui/core/Link"
import { darken, makeStyles, Theme } from "@material-ui/core/styles"
import { darken, lighten, makeStyles, Theme } from "@material-ui/core/styles"
import CloseIcon from "@material-ui/icons/Close"
import RefreshIcon from "@material-ui/icons/Refresh"
import { ApiError, getErrorDetail, getErrorMessage } from "api/errors"
Expand Down Expand Up @@ -104,6 +104,7 @@ const useStyles = makeStyles<Theme, StyleProps>((theme) => ({
},
detailsLink: {
cursor: "pointer",
color: `${lighten(theme.palette.primary.light, 0.2)}`,
},
details: {
marginTop: `${theme.spacing(2)}px`,
Expand Down
4 changes: 3 additions & 1 deletion site/src/theme/palettes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ export const darkPalette: PaletteOptions = {
info: {
main: colors.blue[11],
dark: colors.blue[15],
contrastText: colors.gray[3],
},
error: {
main: colors.red[11],
main: colors.red[5],
dark: colors.red[15],
contrastText: colors.gray[3],
},
}