8000 chore: undo color roles name change · coder/coder@9497583 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9497583

Browse files
jaaydenhjaaydenh
committed
chore: undo color roles name change
1 parent 9514f30 commit 9497583

File tree

14 files changed

+33
-68
lines changed

14 files changed

+33
-68
lines changed

‎site/src/components/InfoTooltip/InfoTooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
HelpTooltipTrigger,
99
} from "components/HelpTooltip/HelpTooltip";
1010
import type { FC, ReactNode } from "react";
11-
import type { ThemeRole } from "theme/colorRoles";
11+
import type { ThemeRole } from "theme/roles";
1212

1313
interface InfoTooltipProps {
1414
type?: ThemeRole;

‎site/src/components/Pill/Pill.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
forwardRef,
1010
useMemo,
1111
} from "react";
12-
import type { ThemeRole } from "theme/colorRoles";
12+
import type { ThemeRole } from "theme/roles";
1313

1414
export type PillProps = HTMLAttributes<HTMLDivElement> & {
1515
icon?: ReactNode;

‎site/src/components/StatusIndicator/StatusIndicator.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useTheme } from "@emotion/react";
22
import type { FC } from "react";
3-
import type { ThemeRole } from "theme/colorRoles";
3+
import type { ThemeRole } from "theme/roles";
44

55
interface StatusIndicatorProps {
66
color: ThemeRole;

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

Lines changed: 1 addition & 1 deletion
A93C
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { TimelineEntry } from "components/Timeline/TimelineEntry";
1212
import { UserAvatar } from "components/UserAvatar/UserAvatar";
1313
import { type FC, useState } from "react";
1414
import { Link as RouterLink } from "react-router-dom";
15-
import type { ThemeRole } from "theme/colorRoles";
15+
import type { ThemeRole } from "theme/roles";
1616
import userAgentParser from "ua-parser-js";
1717
import { AuditLogDescription } from "./AuditLogDescription/AuditLogDescription";
1818
import { AuditLogDiff } from "./AuditLogDiff/AuditLogDiff";

‎site/src/pages/TemplateVersionEditorPage/TemplateVersionStatusBadge.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import QueuedIcon from "@mui/icons-material/HourglassEmpty";
44
import type { TemplateVersion } from "api/typesGenerated";
55
import { Pill, PillSpinner } from "components/Pill/Pill";
66
import type { FC, ReactNode } from "react";
7-
import type { ThemeRole } from "theme/colorRoles";
7+
import type { ThemeRole } from "theme/roles";
88
import { getPendingStatusLabel } from "utils/provisionerJob";
99

1010
interface TemplateVersionStatusBadgeProps {

‎site/src/pages/WorkspacePage/WorkspaceNotifications/Notifications.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
usePopover,
1010
} from "components/Popover/Popover";
1111
import type { FC, ReactNode } from "react";
12-
import type { ThemeRole } from "theme/colorRoles";
12+
import type { ThemeRole } from "theme/roles";
1313

1414
export type NotificationItem = {
1515
title: string;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { forDarkThemes } from "../externalImages";
2-
import roles from "./colorRoles";
2+
import roles from "./roles";
33
import experimental from "./experimental";
44
import monaco from "./monaco";
55
import muiTheme from "./mui";

‎site/src/theme/dark/colorRoles.ts renamed to ‎site/src/theme/dark/roles.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
import type { ColorRoles } from "../colorRoles";
1+
import type { Roles } from "../roles";
22
import colors from "../tailwindColors";
33

44
export default {
5-
default: {
6-
background: colors.zinc[800],
7-
outline: colors.zinc[700],
8-
text: colors.zinc[200],
9-
fill: {
10-
solid: colors.zinc[700],
11-
outline: colors.zinc[600],
12-
text: colors.zinc[50],
13-
},
14-
},
155
danger: {
166
background: colors.orange[950],
177
outline: colors.orange[500],
@@ -162,4 +152,4 @@ export default {
162152
text: colors.white,
163153
},
164154
},
165-
} satisfies ColorRoles;
155+
} satisfies Roles;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { forDarkThemes } from "../externalImages";
2-
import roles from "./colorRoles";
2+
import roles from "./roles";
33
import experimental from "./experimental";
44
import monaco from "./monaco";
55
import muiTheme from "./mui";

‎site/src/theme/darkBlue/colorRoles.ts renamed to ‎site/src/theme/darkBlue/roles.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
import type { ColorRoles } from "../colorRoles";
1+
import type { Roles } from "../roles";
22
import colors from "../tailwindColors";
33

44
export default {
5-
default: {
6-
background: colors.gray[800],
7-
outline: colors.gray[700],
8-
text: colors.gray[200],
9-
fill: {
10-
solid: colors.gray[700],
11-
outline: colors.gray[600],
12-
text: colors.gray[50],
13-
},
14-
},
155
danger: {
166
background: colors.orange[950],
177
outline: colors.orange[500],
@@ -162,4 +152,4 @@ export default {
162152
text: colors.white,
163153
},
164154
},
165-
} satisfies ColorRoles;
155+
} satisfies Roles;

0 commit comments

Comments
 (0)
0