From 9d6557d17389219717d2382cfbe8493ba1e0fab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kayla=20=E3=81=AF=E3=81=AA?= Date: Thu, 9 Apr 2026 12:33:01 -0400 Subject: [PATCH] refactor(site): migrate some components from emotion to tailwind (#24182) --- .../components/Timeline/TimelineDateRow.tsx | 20 ++---------- .../CreateWorkspacePage/SelectedTemplate.tsx | 31 +++++-------------- .../LicensesSettingsPage/DividerWithText.tsx | 31 +++++-------------- .../TemplateDocsPage/TemplateDocsPage.tsx | 19 ++---------- 4 files changed, 19 insertions(+), 82 deletions(-) diff --git a/site/src/components/Timeline/TimelineDateRow.tsx b/site/src/components/Timeline/TimelineDateRow.tsx index 04376b73f4..e659fe9f03 100644 --- a/site/src/components/Timeline/TimelineDateRow.tsx +++ b/site/src/components/Timeline/TimelineDateRow.tsx @@ -1,4 +1,3 @@ -import { css, useTheme } from "@emotion/react"; import type { FC } from "react"; import { TableCell, TableRow } from "#/components/Table/Table"; import { formatDate } from "#/utils/time"; @@ -9,25 +8,10 @@ export interface TimelineDateRow { } export const TimelineDateRow: FC = ({ date }) => { - const theme = useTheme(); - return ( - + {createDisplayDate(date)} diff --git a/site/src/pages/CreateWorkspacePage/SelectedTemplate.tsx b/site/src/pages/CreateWorkspacePage/SelectedTemplate.tsx index 0360633b34..8e338ed2a3 100644 --- a/site/src/pages/CreateWorkspacePage/SelectedTemplate.tsx +++ b/site/src/pages/CreateWorkspacePage/SelectedTemplate.tsx @@ -1,4 +1,3 @@ -import type { Interpolation, Theme } from "@emotion/react"; import type { FC } from "react"; import type { Template, TemplateExample } from "#/api/typesGenerated"; import { Avatar } from "#/components/Avatar/Avatar"; @@ -10,42 +9,28 @@ interface SelectedTemplateProps { export const SelectedTemplate: FC = ({ template }) => { return ( - + - - + {"display_name" in template && template.display_name.length > 0 ? template.display_name : template.name} {template.description && ( - {template.description} + + {template.description} + )} ); }; - -const styles = { - template: (theme) => ({ - padding: "20px 24px", - borderRadius: 8, - backgroundColor: theme.palette.background.paper, - border: `1px solid ${theme.palette.divider}`, - }), - - templateName: { - fontSize: 16, - }, - - templateDescription: (theme) => ({ - fontSize: 14, - color: theme.palette.text.secondary, - }), -} satisfies Record>; diff --git a/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/DividerWithText.tsx b/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/DividerWithText.tsx index 6c7f1f8077..b4ce079c93 100644 --- a/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/DividerWithText.tsx +++ b/site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/DividerWithText.tsx @@ -1,30 +1,13 @@ -import type { Interpolation, Theme } from "@emotion/react"; import type { FC, PropsWithChildren } from "react"; + export const DividerWithText: FC = ({ children }) => { return ( -
-
- {children} -
+
+
+ + {children} + +
); }; - -const styles = { - container: { - display: "flex", - alignItems: "center", - }, - border: (theme) => ({ - borderBottom: `2px solid ${theme.palette.divider}`, - width: "100%", - }), - content: (theme) => ({ - paddingTop: 4, - paddingBottom: 4, - paddingRight: 16, - paddingLeft: 16, - fontSize: theme.typography.h5.fontSize, - color: theme.palette.text.secondary, - }), -} satisfies Record>; diff --git a/site/src/pages/TemplatePage/TemplateDocsPage/TemplateDocsPage.tsx b/site/src/pages/TemplatePage/TemplateDocsPage/TemplateDocsPage.tsx index 5f716273a3..a09c002a92 100644 --- a/site/src/pages/TemplatePage/TemplateDocsPage/TemplateDocsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateDocsPage/TemplateDocsPage.tsx @@ -1,4 +1,3 @@ -import { useTheme } from "@emotion/react"; import frontMatter from "front-matter"; import { MemoizedMarkdown } from "#/components/Markdown/Markdown"; import { useTemplateLayoutContext } from "#/pages/TemplatePage/TemplateLayout"; @@ -6,30 +5,16 @@ import { pageTitle } from "#/utils/page"; export default function TemplateDocsPage() { const { template, activeVersion } = useTemplateLayoutContext(); - const theme = useTheme(); - const readme = frontMatter(activeVersion.readme); return ( <> {pageTitle(template.name, "Documentation")} -
-
+
README.md