Skip to content

Commit 72b9a8c

Browse files
aslilacaslilac
committed
minimal fixes
1 parent 7cf5ad2 commit 72b9a8c

File tree

14 files changed

+51
-116
lines changed

14 files changed

+51
-116
lines changed

‎site/src/components/Dashboard/DeploymentBanner/DeploymentBannerView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { TerminalIcon } from "components/Icons/TerminalIcon";
3636
import { RocketIcon } from "components/Icons/RocketIcon";
3737
import ErrorIcon from "@mui/icons-material/ErrorOutline";
3838
import { MONOSPACE_FONT_FAMILY } from "theme/constants";
39-
import colors from "theme/tailwind";
39+
import colors from "theme/tailwindColors";
4040
import { getDisplayWorkspaceStatus } from "utils/workspace";
4141
import { HelpTooltipTitle } from "components/HelpTooltip/HelpTooltip";
4242
import { Stack } from "components/Stack/Stack";

‎site/src/components/Markdown/Markdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { type FC, memo } from "react";
1111
import ReactMarkdown, { type Options } from "react-markdown";
1212
import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
1313
import gfm from "remark-gfm";
14-
import colors from "theme/tailwind";
14+
import colors from "theme/tailwindColors";
1515
import { dracula } from "react-syntax-highlighter/dist/cjs/styles/prism";
1616

1717
interface MarkdownProps {

‎site/src/pages/AuditPage/AuditLogRow/AuditLogDiff/AuditLogDiff.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type Interpolation, type Theme } from "@emotion/react";
22
import { type FC } from "react";
33
import type { AuditLog } from "api/typesGenerated";
4-
import colors from "theme/tailwind";
4+
import colors from "theme/tailwindColors";
55
import { MONOSPACE_FONT_FAMILY } from "theme/constants";
66

77
const getDiffValue = (value: unknown): string => {

‎site/src/pages/DeploySettingsPage/AppearanceSettingsPage/AppearanceSettingsPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
import { Fieldset } from "components/DeploySettingsLayout/Fieldset";
2020
import { Stack } from "components/Stack/Stack";
2121
import { getFormHelpers } from "utils/formUtils";
22-
import colors from "theme/tailwind";
22+
import colors from "theme/tailwindColors";
2323

2424
export type AppearanceSettingsPageViewProps = {
2525
appearance: UpdateAppearanceConfig;

‎site/src/theme/dark/colors.ts

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎site/src/theme/dark/experimental.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { type NewTheme } from "../experimental";
2-
import colors from "../tailwind";
2+
import colors from "../tailwindColors";
33

44
export default {
55
l1: {

‎site/src/theme/dark/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import colors from "./colors";
21
import experimental from "./experimental";
32
import monaco from "./monaco";
43
import muiTheme from "./mui";
54

65
export default {
76
...muiTheme,
8-
colors,
97
experimental,
108
monaco,
119
};

‎site/src/theme/dark/mui.ts

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import {
99
BUTTON_SM_HEIGHT,
1010
BUTTON_XL_HEIGHT,
1111
} from "../constants";
12-
import tw from "../tailwind";
13-
import colors from "./colors";
12+
import tw from "../tailwindColors";
1413

1514
let muiTheme = createTheme({
1615
palette: {
@@ -22,46 +21,46 @@ let muiTheme = createTheme({
2221
dark: tw.sky[400],
2322
},
2423
secondary: {
25-
main: colors.gray[11],
26-
contrastText: colors.gray[4],
27-
dark: colors.gray[9],
24+
main: tw.zinc[500],
25+
contrastText: tw.zinc[200],
26+
dark: tw.zinc[400],
2827
},
2928
background: {
30-
default: colors.gray[17],
31-
paper: colors.gray[16],
29+
default: tw.zinc[950],
30+
paper: tw.zinc[900],
3231
},
3332
text: {
34-
primary: colors.gray[1],
35-
secondary: colors.gray[6],
36-
disabled: colors.gray[9],
33+
primary: tw.zinc[50],
34+
secondary: tw.zinc[300],
35+
disabled: tw.zinc[400],
3736
},
38-
divider: colors.gray[13],
37+
divider: tw.zinc[700],
3938
warning: {
40-
light: colors.orange[9],
41-
main: colors.orange[12],
42-
dark: colors.orange[15],
39+
light: tw.amber[500],
40+
main: tw.amber[800],
41+
dark: tw.amber[950],
4342
},
4443
success: {
45-
main: colors.green[11],
46-
dark: colors.green[12],
44+
main: tw.green[500],
45+
dark: tw.green[600],
4746
},
4847
info: {
49-
light: colors.blue[7],
50-
main: colors.blue[9],
51-
dark: colors.blue[14],
52-
contrastText: colors.gray[4],
48+
light: tw.blue[400],
49+
main: tw.blue[600],
50+
dark: tw.blue[950],
51+
contrastText: tw.zinc[200],
5352
},
5453
error: {
55-
light: colors.red[6],
56-
main: colors.red[8],
57-
dark: colors.red[15],
58-
contrastText: colors.gray[4],
54+
light: tw.red[400],
55+
main: tw.red[500],
56+
dark: tw.red[950],
57+
contrastText: tw.zinc[200],
5958
},
6059
action: {
61-
hover: colors.gray[14],
60+
hover: tw.zinc[800],
6261
},
6362
neutral: {
64-
main: colors.gray[1],
63+
main: tw.zinc[50],
6564
},
6665
},
6766
typography: {
@@ -118,7 +117,7 @@ muiTheme = createTheme(muiTheme, {
118117
},
119118
},
120119
colorDefault: {
121-
backgroundColor: colors.gray[6],
120+
backgroundColor: tw.zinc[300],
122121
},
123122
},
124123
},
@@ -170,26 +169,26 @@ muiTheme = createTheme(muiTheme, {
170169
},
171170
outlined: {
172171
":hover": {
173-
border: `1px solid ${colors.gray[11]}`,
172+
border: `1px solid ${tw.zinc[500]}`,
174173
},
175174
},
176175
outlinedNeutral: {
177-
borderColor: colors.gray[12],
176+
borderColor: tw.zinc[600],
178177

179178
"&.Mui-disabled": {
180-
borderColor: colors.gray[13],
181-
color: colors.gray[11],
179+
borderColor: tw.zinc[700],
180+
color: tw.zinc[500],
182181

183182
"& > .MuiLoadingButton-loadingIndicator": {
184-
color: colors.gray[11],
183+
color: tw.zinc[500],
185184
},
186185
},
187186
},
188187
containedNeutral: {
189-
backgroundColor: colors.gray[14],
188+
backgroundColor: tw.zinc[800],
190189

191190
"&:hover": {
192-
backgroundColor: colors.gray[13],
191+
backgroundColor: tw.zinc[700],
193192
},
194193
},
195194
iconSizeMedium: {
@@ -212,7 +211,7 @@ muiTheme = createTheme(muiTheme, {
212211
root: {
213212
">button:hover+button": {
214213
// The !important is unfortunate, but necessary for the border.
215-
borderLeftColor: `${colors.gray[11]} !important`,
214+
borderLeftColor: `${tw.zinc[500]} !important`,
216215
},
217216
},
218217
},
@@ -318,7 +317,7 @@ muiTheme = createTheme(muiTheme, {
318317
MuiChip: {
319318
styleOverrides: {
320319
root: {
321-
backgroundColor: colors.gray[12],
320+
backgroundColor: tw.zinc[600],
322321
},
323322
},
324323
},
@@ -399,12 +398,12 @@ muiTheme = createTheme(muiTheme, {
399398
colorPrimary: {
400399
// Same as button
401400
"& .MuiOutlinedInput-notchedOutline": {
402-
borderColor: colors.gray[12],
401+
borderColor: tw.zinc[600],
403402
},
404403
// The default outlined input color is white, which seemed jarring.
405404
"&:hover:not(.Mui-error):not(.Mui-focused) .MuiOutlinedInput-notchedOutline":
406405
{
407-
borderColor: colors.gray[11],
406+
borderColor: tw.zinc[500],
408407
},
409408
},
410409
},
@@ -442,11 +441,11 @@ muiTheme = createTheme(muiTheme, {
442441
* customization).
443442
*/
444443
"&.Mui-focusVisible": {
445-
boxShadow: `0 0 0 2px ${colors.blue[7]}`,
444+
boxShadow: `0 0 0 2px ${tw.blue[400]}`,
446445
},
447446

448447
"&.Mui-disabled": {
449-
color: colors.gray[11],
448+
color: tw.zinc[500],
450449
},
451450
},
452451
},
@@ -458,7 +457,7 @@ muiTheme = createTheme(muiTheme, {
458457
".Mui-focusVisible .MuiSwitch-thumb": {
459458
// Had to thicken outline to make sure that the focus color didn't
460459
// bleed into the thumb and was still easily-visible
461-
boxShadow: `0 0 0 3px ${colors.blue[7]}`,
460+
boxShadow: `0 0 0 3px ${tw.blue[400]}`,
462461
},
463462
},
464463
},
@@ -542,7 +541,7 @@ muiTheme = createTheme(muiTheme, {
542541
styleOverrides: {
543542
root: {
544543
"&.Mui-focusVisible": {
545-
boxShadow: `0 0 0 2px ${colors.blue[7]}`,
544+
boxShadow: `0 0 0 2px ${tw.blue[400]}`,
546545
},
547546
},
548547
},

‎site/src/theme/darkBlue/colors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import tw from "../tailwind";
1+
import tw from "../tailwindColors";
22

33
export default {
44
white: "#fff",

‎site/src/theme/darkBlue/experimental.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { type NewTheme } from "../experimental";
2-
import colors from "../tailwind";
2+
import colors from "../tailwindColors";
33

44
export default {
55
l1: {

‎site/src/theme/light/colors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import tw from "../tailwind";
1+
import tw from "../tailwindColors";
22

33
export default {
44
white: "#fff",

‎site/src/theme/light/experimental.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { type NewTheme } from "../experimental";
2-
import colors from "../tailwind";
2+
import colors from "../tailwindColors";
33

44
export default {
55
l1: {

‎site/src/theme/light/mui.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
BUTTON_SM_HEIGHT,
1010
BUTTON_XL_HEIGHT,
1111
} from "../constants";
12-
import tw from "../tailwind";
12+
import tw from "../tailwindColors";
1313

1414
let muiTheme = createTheme({
1515
palette: {

‎site/src/theme/tailwind.ts renamed to ‎site/src/theme/tailwindColors.ts

File renamed without changes.

0 commit comments

Comments
 (0)