From d9254e8711e5410567e212e12195aad30624afbc Mon Sep 17 00:00:00 2001 From: rohansinha01 Date: Tue, 11 Mar 2025 17:51:03 -0400 Subject: [PATCH 1/7] updated to tailwind --- .../pages/WorkspacesPage/WorkspacesEmpty.tsx | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx index e78991df13f69..162d969b5a0a7 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx @@ -25,21 +25,10 @@ export const WorkspacesEmpty: FC = ({ const defaultMessage = "A workspace is your personal, customizable development environment."; const defaultImage = ( -
- "& img": { - maxWidth: "100%", - }, - }} - > - -
+ + ); if (isUsingFilter) { From 2d6136567b311023a6fb1e7d02e1098008c2cac3 Mon Sep 17 00:00:00 2001 From: rohansinha01 Date: Tue, 11 Mar 2025 21:16:50 -0400 Subject: [PATCH 2/7] updated WorkspacesEmpty material ui to tailwind --- .../pages/WorkspacesPage/WorkspacesEmpty.tsx | 63 +++---------------- 1 file changed, 10 insertions(+), 53 deletions(-) diff --git a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx index 162d969b5a0a7..7f7e7ab5ea75a 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx @@ -45,9 +45,8 @@ export const WorkspacesEmpty: FC = ({ Go to templates } - css={{ - paddingBottom: 0, - }} + className="pb-0" + image={defaultImage} /> ); @@ -58,9 +57,7 @@ export const WorkspacesEmpty: FC = ({ ); @@ -72,71 +69,31 @@ export const WorkspacesEmpty: FC = ({ description={`${defaultMessage} Select one template below to start.`} cta={
-
+
{featuredTemplates?.map((t) => ( ({ - width: "320px", - padding: 16, - borderRadius: 6, - border: `1px solid ${theme.palette.divider}`, - textAlign: "left", - display: "flex", - gap: 16, - textDecoration: "none", - color: "inherit", - - "&:hover": { - backgroundColor: theme.palette.background.paper, - }, - })} + className="w-[320px] p-4 rounded-md border border-divider text-left flex gap-4 no-underline text-inherit hover:bg-paper" > -
+
-
-

+
+

{t.display_name || t.name}

-

({ - fontSize: 13, - color: theme.palette.text.secondary, - lineHeight: "1.4", - margin: 0, - paddingTop: "4px", +

+ > {t.description}

From 5111f08e26a00191b220c99b9596840b5a5ac38a Mon Sep 17 00:00:00 2001 From: rohansinha01 Date: Tue, 11 Mar 2025 22:08:38 -0400 Subject: [PATCH 3/7] make fmt --- .../pages/WorkspacesPage/WorkspacesEmpty.tsx | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx index 7f7e7ab5ea75a..3fa830a4158f5 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx @@ -26,9 +26,8 @@ export const WorkspacesEmpty: FC = ({ "A workspace is your personal, customizable development environment."; const defaultImage = (
- - -
+ +

); if (isUsingFilter) { @@ -46,7 +45,6 @@ export const WorkspacesEmpty: FC = ({ } className="pb-0" - image={defaultImage} /> ); @@ -87,13 +85,14 @@ export const WorkspacesEmpty: FC = ({ {t.display_name || t.name} -

+ // We've had users plug URLs directly into the + // descriptions, when those URLS have no hyphens or other + // easy semantic breakpoints. Need to set this to ensure + // those URLs don't break outside their containing boxes + > {t.description}

From 40ac4e5c5ae18f02b27d3076903fcbcb2b88f2fe Mon Sep 17 00:00:00 2001 From: rohansinha01 Date: Wed, 12 Mar 2025 13:14:46 -0400 Subject: [PATCH 4/7] moved comment before className --- site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx index 3fa830a4158f5..6dc6e3f070759 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx @@ -86,12 +86,13 @@ export const WorkspacesEmpty: FC = ({

{t.description}

From 2e19a4e092c7e941567c6351410ef32ef4d9cd9c Mon Sep 17 00:00:00 2001 From: rohansinha01 Date: Wed, 12 Mar 2025 13:16:25 -0400 Subject: [PATCH 5/7] removed blank space --- site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx index 6dc6e3f070759..88785783cb620 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx @@ -91,8 +91,6 @@ export const WorkspacesEmpty: FC = ({ // easy semantic breakpoints. Need to set this to ensure // those URLs don't break outside their containing boxes className="text-sm text-gray-600 leading-[1.4] m-0 pt-1 break-words" - - > {t.description}

From 9c7d3cc1e1930d60638302d5647a75054293fba8 Mon Sep 17 00:00:00 2001 From: rohansinha01 Date: Wed, 12 Mar 2025 20:28:54 -0400 Subject: [PATCH 6/7] fixed outdated colors from palette --- site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx index 88785783cb620..4aeff4f4cafb0 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx @@ -74,7 +74,7 @@ export const WorkspacesEmpty: FC = ({ to={`${getLink( linkToTemplate(t.organization_name, t.name), )}/workspace`} - className="w-[320px] p-4 rounded-md border border-divider text-left flex gap-4 no-underline text-inherit hover:bg-paper" + className="w-[320px] p-4 rounded-md border-solid border-surface-grey text-left flex gap-4 no-underline text-inherit hover:bg-surface-grey" >
From 8b7f0497f8626677162fe576ec8aafdc6dc57171 Mon Sep 17 00:00:00 2001 From: rohansinha01 Date: Mon, 17 Mar 2025 10:53:44 -0400 Subject: [PATCH 7/7] updated colors --- site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx index 4aeff4f4cafb0..2850e56e181a7 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesEmpty.tsx @@ -74,7 +74,7 @@ export const WorkspacesEmpty: FC = ({ to={`${getLink( linkToTemplate(t.organization_name, t.name), )}/workspace`} - className="w-[320px] p-4 rounded-md border-solid border-surface-grey text-left flex gap-4 no-underline text-inherit hover:bg-surface-grey" + className="w-[320px] p-4 rounded-md border border-solid border-surface-quaternary text-left flex gap-4 no-underline text-inherit hover:bg-surface-grey" >
@@ -90,7 +90,7 @@ export const WorkspacesEmpty: FC = ({ // descriptions, when those URLS have no hyphens or other // easy semantic breakpoints. Need to set this to ensure // those URLs don't break outside their containing boxes - className="text-sm text-gray-600 leading-[1.4] m-0 pt-1 break-words" + className="text-sm text-gray-400 leading-[1.4] m-0 pt-1 break-words" > {t.description}