From 7c78fe558971cbf9cdfe95ac9e16f1422675ad2d Mon Sep 17 00:00:00 2001 From: Conor Macpherson Date: Thu, 20 Apr 2023 14:20:12 -0400 Subject: [PATCH 1/5] Fix style issues with workspace deletion modal. --- .../billing/delete_workspace/delete_workspace_modal.scss | 7 ++++++- .../billing/delete_workspace/delete_workspace_modal.tsx | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss index 2bcbbebd2a..d93d35824c 100644 --- a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss +++ b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss @@ -12,6 +12,10 @@ } } + &__Icon { + padding-top: 8px; + } + &__Title { color: var(--sys-denim-center-channel-text); font-family: Metropolis; @@ -22,10 +26,11 @@ &__Usage { text-align: left; + color: var(--sys-center-channel-text); &-Highlighted { color: black; - font-weight: 700; + font-weight: bold; } } diff --git a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.tsx b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.tsx index 5fc7c7c2a7..aaff7fab71 100644 --- a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.tsx +++ b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.tsx @@ -186,8 +186,8 @@ export default function DeleteWorkspaceModal(props: Props) { className='DeleteWorkspaceModal' onExited={handleClickCancel} > -
- +
+
Date: Thu, 20 Apr 2023 14:34:58 -0400 Subject: [PATCH 2/5] lint. --- .../billing/delete_workspace/delete_workspace_modal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.tsx b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.tsx index aaff7fab71..16ca7b506f 100644 --- a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.tsx +++ b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.tsx @@ -186,7 +186,7 @@ export default function DeleteWorkspaceModal(props: Props) { className='DeleteWorkspaceModal' onExited={handleClickCancel} > -
+
From fd1f62f9d17ae044907cff12ccc01d2b049b475e Mon Sep 17 00:00:00 2001 From: Conor Macpherson Date: Thu, 20 Apr 2023 15:21:02 -0400 Subject: [PATCH 3/5] lint. --- .../billing/delete_workspace/delete_workspace_modal.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss index d93d35824c..7afd7e64a2 100644 --- a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss +++ b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss @@ -25,8 +25,8 @@ } &__Usage { - text-align: left; color: var(--sys-center-channel-text); + text-align: left; &-Highlighted { color: black; From 35a16855170108f79ec3f74b52703e13eba25a5a Mon Sep 17 00:00:00 2001 From: Conor Macpherson Date: Thu, 20 Apr 2023 15:52:03 -0400 Subject: [PATCH 4/5] change font color from sys-center-console-text to center-console-text. --- .../billing/delete_workspace/delete_workspace_modal.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss index 7afd7e64a2..aee1487a3d 100644 --- a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss +++ b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss @@ -25,7 +25,7 @@ } &__Usage { - color: var(--sys-center-channel-text); + color: var(--center-channel-text); text-align: left; &-Highlighted { @@ -35,6 +35,7 @@ } &__Warning { + color: var(--center-channel-text); text-align: left; } From 26ee59e3c2fdb8bcd87a563f80b337fe5f9e1b58 Mon Sep 17 00:00:00 2001 From: Conor Macpherson Date: Thu, 20 Apr 2023 15:54:38 -0400 Subject: [PATCH 5/5] Change to -center-channel-color after seeing warning not to use -center-channel-text. --- .../billing/delete_workspace/delete_workspace_modal.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss index aee1487a3d..514dd90e0a 100644 --- a/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss +++ b/webapp/channels/src/components/admin_console/billing/delete_workspace/delete_workspace_modal.scss @@ -25,7 +25,7 @@ } &__Usage { - color: var(--center-channel-text); + color: var(--center-channel-color); text-align: left; &-Highlighted { @@ -35,7 +35,7 @@ } &__Warning { - color: var(--center-channel-text); + color: var(--center-channel-color); text-align: left; }