From ec4914d9d8cc46296380f807f7aeb1b1a6aebe2b Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Wed, 27 Jul 2022 14:56:55 +0000 Subject: [PATCH 1/6] Update color palette --- site/src/theme/palettes.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/site/src/theme/palettes.ts b/site/src/theme/palettes.ts index 7b78334e27cd6..f237d4a61d237 100644 --- a/site/src/theme/palettes.ts +++ b/site/src/theme/palettes.ts @@ -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] }, } From cfe1cb1be6d27968714f27be579fbe91700e8893 Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Wed, 27 Jul 2022 14:57:11 +0000 Subject: [PATCH 2/6] Edit dialog error colors --- site/src/components/Dialog/Dialog.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/src/components/Dialog/Dialog.tsx b/site/src/components/Dialog/Dialog.tsx index 8da09f2480c50..6462061f01cfc 100644 --- a/site/src/components/Dialog/Dialog.tsx +++ b/site/src/components/Dialog/Dialog.tsx @@ -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, lighten, fade, makeStyles } from "@material-ui/core/styles" import SvgIcon from "@material-ui/core/SvgIcon" import * as React from "react" import { combineClasses } from "../../util/combineClasses" @@ -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", }, From 3838756d3fee173a7fe6fa1bc262fe045d80c0dc Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Wed, 27 Jul 2022 15:51:57 +0000 Subject: [PATCH 3/6] Format --- site/src/components/Dialog/Dialog.tsx | 2 +- site/src/theme/palettes.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site/src/components/Dialog/Dialog.tsx b/site/src/components/Dialog/Dialog.tsx index 6462061f01cfc..39f2dc14394de 100644 --- a/site/src/components/Dialog/Dialog.tsx +++ b/site/src/components/Dialog/Dialog.tsx @@ -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, lighten, 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" diff --git a/site/src/theme/palettes.ts b/site/src/theme/palettes.ts index f237d4a61d237..e2e23cdf4dbeb 100644 --- a/site/src/theme/palettes.ts +++ b/site/src/theme/palettes.ts @@ -34,11 +34,11 @@ export const darkPalette: PaletteOptions = { info: { main: colors.blue[11], dark: colors.blue[15], - contrastText: colors.gray[3] + contrastText: colors.gray[3], }, error: { main: colors.red[5], dark: colors.red[15], - contrastText: colors.gray[3] + contrastText: colors.gray[3], }, } From 3b6e0c6629ec9bb0cc555e1e77b1448bdc7e4132 Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Wed, 27 Jul 2022 16:45:55 +0000 Subject: [PATCH 4/6] Lighten links --- site/src/theme/palettes.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/theme/palettes.ts b/site/src/theme/palettes.ts index e2e23cdf4dbeb..76d0701705f6d 100644 --- a/site/src/theme/palettes.ts +++ b/site/src/theme/palettes.ts @@ -6,7 +6,7 @@ export const darkPalette: PaletteOptions = { primary: { main: colors.blue[7], contrastText: colors.gray[3], - light: colors.blue[6], + light: colors.blue[5], dark: colors.blue[9], }, secondary: { From 6e0b03688089e9c87ff9d26e87cadb8d0dc8f6ca Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Wed, 27 Jul 2022 17:14:25 +0000 Subject: [PATCH 5/6] Lighten link just in ErrorSummary --- site/src/components/ErrorSummary/ErrorSummary.tsx | 3 ++- site/src/theme/palettes.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/site/src/components/ErrorSummary/ErrorSummary.tsx b/site/src/components/ErrorSummary/ErrorSummary.tsx index 77bea7b056363..150cf9fbedcf0 100644 --- a/site/src/components/ErrorSummary/ErrorSummary.tsx +++ b/site/src/components/ErrorSummary/ErrorSummary.tsx @@ -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" @@ -104,6 +104,7 @@ const useStyles = makeStyles((theme) => ({ }, detailsLink: { cursor: "pointer", + color: `${lighten(theme.palette.primary.light, 0.2)}` }, details: { marginTop: `${theme.spacing(2)}px`, diff --git a/site/src/theme/palettes.ts b/site/src/theme/palettes.ts index 76d0701705f6d..e2e23cdf4dbeb 100644 --- a/site/src/theme/palettes.ts +++ b/site/src/theme/palettes.ts @@ -6,7 +6,7 @@ export const darkPalette: PaletteOptions = { primary: { main: colors.blue[7], contrastText: colors.gray[3], - light: colors.blue[5], + light: colors.blue[6], dark: colors.blue[9], }, secondary: { From 6f2cfe68798a64d373f05d772733010fd57fe5bf Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Wed, 27 Jul 2022 17:21:39 +0000 Subject: [PATCH 6/6] Format --- site/src/components/ErrorSummary/ErrorSummary.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/components/ErrorSummary/ErrorSummary.tsx b/site/src/components/ErrorSummary/ErrorSummary.tsx index 150cf9fbedcf0..3c92afce4e6fc 100644 --- a/site/src/components/ErrorSummary/ErrorSummary.tsx +++ b/site/src/components/ErrorSummary/ErrorSummary.tsx @@ -104,7 +104,7 @@ const useStyles = makeStyles((theme) => ({ }, detailsLink: { cursor: "pointer", - color: `${lighten(theme.palette.primary.light, 0.2)}` + color: `${lighten(theme.palette.primary.light, 0.2)}`, }, details: { marginTop: `${theme.spacing(2)}px`,