From ebe14c4e01310771f7edec5787397026484e9577 Mon Sep 17 00:00:00 2001 From: David Veszelovszki Date: Fri, 24 May 2024 09:26:09 +0200 Subject: [PATCH] SSC: Fix notification colors (#62860) --- .../cody/team/CodyManageTeamPage.module.scss | 38 ++++++++++++++----- client/web/src/cody/team/InviteUsers.tsx | 4 +- client/web/src/cody/team/TeamMemberList.tsx | 2 +- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/client/web/src/cody/team/CodyManageTeamPage.module.scss b/client/web/src/cody/team/CodyManageTeamPage.module.scss index 3253a0ebc06..daef7939f4d 100644 --- a/client/web/src/cody/team/CodyManageTeamPage.module.scss +++ b/client/web/src/cody/team/CodyManageTeamPage.module.scss @@ -8,7 +8,7 @@ .alert { position: relative; padding: 1.5rem 1.5rem 1.5rem 5rem; - color: #181b26; + color: var(--gray-11); &::after { content: ''; position: absolute; @@ -22,33 +22,51 @@ } .purple-success-alert { - background-color: #f2e7fb; + background-color: var(--violet-02); + color: var(--violet-06); + :global(.theme-dark) & { + background-color: var(--pink); + color: var(--gray-08); + } &::after { // Purple checkmark SVG background-image: url("data:image/svg+xml,"); } } -.blue-success-alert { - background-color: #e8f7ff; +.green-success-alert { + background-color: #e0f9d5; + color: #054410; + :global(.theme-dark) & { + background-color: #51cf66; + } &::after { - // Blue checkmark SVG - background-image: url("data:image/svg+xml,"); + // Green checkmark SVG + background-image: url("data:image/svg+xml,"); } } .error-alert { - background-color: #ffe8e8; + /* stylelint-disable-next-line declaration-property-unit-allowed-list */ + padding-left: calc(1.5rem + 124px + 1.5rem); + overflow: hidden; + background-color: var(--oc-orange-1); + color: var(--gray-08); + :global(.theme-dark) & { + background-color: var(--oc-orange-4); + } &::after { - // Ugly red X SVG – TODO: Replace it with a design-approved one. - background-image: url("data:image/svg+xml,"); + top: 1.5rem; + /* stylelint-disable-next-line declaration-property-unit-allowed-list */ + width: 124px; + background-image: url('data:image/svg+xml,'); } } .user-badges { position: relative; left: -31px; - border: 1px solid #e6ebf2; + border: 1px solid var(--gray-03); border-radius: 50%; } diff --git a/client/web/src/cody/team/InviteUsers.tsx b/client/web/src/cody/team/InviteUsers.tsx index 99864396db6..ec520eded30 100644 --- a/client/web/src/cody/team/InviteUsers.tsx +++ b/client/web/src/cody/team/InviteUsers.tsx @@ -77,7 +77,7 @@ export const InviteUsers: React.FunctionComponent = ({ return ( <> {invitesSendingStatus === 'success' && ( -
+

{invitesSentCount} {pluralize('invite', invitesSentCount)} sent!

@@ -92,7 +92,7 @@ export const InviteUsers: React.FunctionComponent = ({ {invitesSendingErrorMessage} - + If you encounter this issue repeatedly, please contact support at{' '} support@sourcegraph.com. diff --git a/client/web/src/cody/team/TeamMemberList.tsx b/client/web/src/cody/team/TeamMemberList.tsx index 60fa35b3fa8..1788cbc8b56 100644 --- a/client/web/src/cody/team/TeamMemberList.tsx +++ b/client/web/src/cody/team/TeamMemberList.tsx @@ -172,7 +172,7 @@ export const TeamMemberList: FunctionComponent = ({ className={classNames( 'mb-4', styles.alert, - actionResult.isError ? styles.errorAlert : styles.blueSuccessAlert + actionResult.isError ? styles.errorAlert : styles.greenSuccessAlert )} > {actionResult.message}