From cb22bfa90b97fa7d2d2f80175f8d1377e89403ec Mon Sep 17 00:00:00 2001
From: Kira Pilot <kira.pilot23@gmail.com>
Date: Fri, 17 Nov 2023 16:22:16 +0000
Subject: [PATCH 1/4] fix: clarify language in orphan section of delete modal

---
 .../WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx b/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
index d2e6369b78e4e..265a47119d3be 100644
--- a/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
@@ -166,10 +166,11 @@ export const WorkspaceDeleteDialog = (props: WorkspaceDeleteDialogProps) => {
                   />
                 </div>
                 <div css={{ flexDirection: "column" }}>
-                  <p className="info">Orphan resources</p>
+                  <p className="info">Orphan Resources</p>
                   <span css={{ fontSize: "11px" }}>
-                    Skip resource cleanup. Resources such as volumes and virtual
-                    machines will not be destroyed.&nbsp;
+                    As a template admin, you may skip resource cleanup.
+                    Resources such as volumes and virtual machines will not be
+                    destroyed.&nbsp;
                     <Link
                       href={docs("/workspaces#workspace-resources")}
                       target="_blank"

From fdce48a53b2d261d7038fa9af02c03bd8d543ce7 Mon Sep 17 00:00:00 2001
From: Kira Pilot <kira.pilot23@gmail.com>
Date: Fri, 17 Nov 2023 21:12:26 +0000
Subject: [PATCH 2/4] tinted title

---
 .../WorkspaceDeleteDialog.tsx                      | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx b/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
index e214b0572d760..3de57df4e4e6a 100644
--- a/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
@@ -36,7 +36,7 @@ const styles = {
       color: theme.palette.text.primary,
     },
   }),
-  orphanContainer: () => ({
+  orphanContainer: (theme) => ({
     marginTop: 24,
     display: "flex",
     backgroundColor: colors.orange[15],
@@ -57,6 +57,7 @@ const styles = {
     "& .info": {
       fontSize: 14,
       fontWeight: 600,
+      color: theme.experimental.roles.danger.text,
     },
   }),
 } satisfies Record<string, Interpolation<Theme>>;
@@ -166,18 +167,11 @@ export const WorkspaceDeleteDialog = (props: WorkspaceDeleteDialogProps) => {
                   />
                 </div>
                 <div css={{ flexDirection: "column" }}>
-<<<<<<< HEAD
                   <p className="info">Orphan Resources</p>
-                  <span css={{ fontSize: "11px" }}>
-                    As a template admin, you may skip resource cleanup.
+                  <span css={{ fontSize: 12, marginTop: 4, display: "block" }}>
+                    As a Template Admin, you may skip resource cleanup.
                     Resources such as volumes and virtual machines will not be
                     destroyed.&nbsp;
-=======
-                  <p className="info">Orphan resources</p>
-                  <span css={{ fontSize: 12, marginTop: 4, display: "block" }}>
-                    Skip resource cleanup. Resources such as volumes and virtual
-                    machines will not be destroyed.&nbsp;
->>>>>>> origin/main
                     <Link
                       href={docs("/workspaces#workspace-resources")}
                       target="_blank"

From 00a1b40f07a24ea5f8c7d871e2d3f673050a47a5 Mon Sep 17 00:00:00 2001
From: Kira Pilot <kira@coder.com>
Date: Mon, 20 Nov 2023 11:41:16 -0500
Subject: [PATCH 3/4] Update
 site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx

Co-authored-by: Muhammad Atif Ali <atif@coder.com>
---
 .../WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx b/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
index 3de57df4e4e6a..b362d7acd4482 100644
--- a/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
@@ -169,7 +169,7 @@ export const WorkspaceDeleteDialog = (props: WorkspaceDeleteDialogProps) => {
                 <div css={{ flexDirection: "column" }}>
                   <p className="info">Orphan Resources</p>
                   <span css={{ fontSize: 12, marginTop: 4, display: "block" }}>
-                    As a Template Admin, you may skip resource cleanup.
+                    As a Template Admin, you may skip resource cleanup to force remove a failed workspace.
                     Resources such as volumes and virtual machines will not be
                     destroyed.&nbsp;
                     <Link

From e106b1f7e25d874a3fbe980c71fed00e427fd42d Mon Sep 17 00:00:00 2001
From: Kira Pilot <kira.pilot23@gmail.com>
Date: Mon, 20 Nov 2023 16:50:18 +0000
Subject: [PATCH 4/4] prettier

---
 .../WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx b/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
index b362d7acd4482..d5c4b8c477d07 100644
--- a/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
+++ b/site/src/pages/WorkspacePage/WorkspaceDeleteDialog/WorkspaceDeleteDialog.tsx
@@ -169,9 +169,9 @@ export const WorkspaceDeleteDialog = (props: WorkspaceDeleteDialogProps) => {
                 <div css={{ flexDirection: "column" }}>
                   <p className="info">Orphan Resources</p>
                   <span css={{ fontSize: 12, marginTop: 4, display: "block" }}>
-                    As a Template Admin, you may skip resource cleanup to force remove a failed workspace.
-                    Resources such as volumes and virtual machines will not be
-                    destroyed.&nbsp;
+                    As a Template Admin, you may skip resource cleanup to force
+                    remove a failed workspace. Resources such as volumes and
+                    virtual machines will not be destroyed.&nbsp;
                     <Link
                       href={docs("/workspaces#workspace-resources")}
                       target="_blank"