From b97e20d3ed73fa6be9d1a92c1e5b6fa7a3d51cb9 Mon Sep 17 00:00:00 2001 From: Roie Natan Date: Mon, 27 Nov 2023 20:40:35 -0500 Subject: [PATCH 1/5] dark mode updates round 2 --- .../components/Chat/ChatMessage/ChatMessage.module.scss | 3 +++ src/shared/ui-kit/Button/Button.module.scss | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/shared/components/Chat/ChatMessage/ChatMessage.module.scss b/src/shared/components/Chat/ChatMessage/ChatMessage.module.scss index 59b11ede60..7bdf30e5f0 100644 --- a/src/shared/components/Chat/ChatMessage/ChatMessage.module.scss +++ b/src/shared/components/Chat/ChatMessage/ChatMessage.module.scss @@ -94,6 +94,9 @@ background-color: $c-pink-active-feed-cards; margin-left: 2.8rem; margin-right: unset; + .mentionText { + color: $c-pink-mention-2; + } } .systemMessageContainer { diff --git a/src/shared/ui-kit/Button/Button.module.scss b/src/shared/ui-kit/Button/Button.module.scss index 8e6b6e3500..91ade8b9ad 100644 --- a/src/shared/ui-kit/Button/Button.module.scss +++ b/src/shared/ui-kit/Button/Button.module.scss @@ -236,10 +236,6 @@ &:active { --btn-bg-color: #{$c-pink-active-btn}; } - - &.buttonDisabled { - --btn-bg-color: #{$c-neutrals-100}; - } } .buttonWarningVariant { From c273d1db976c088ed621995f8e8caff21865d155 Mon Sep 17 00:00:00 2001 From: Roie Natan Date: Tue, 28 Nov 2023 10:22:44 -0500 Subject: [PATCH 2/5] updates --- .../containers/LandingContainer/LandingContainer.tsx | 3 ++- .../components/AddRecipient/AddRecipient.module.scss | 5 +---- .../components/Chat/ChatMessage/ChatMessage.module.scss | 2 -- src/shared/components/Chat/ChatMessage/ChatMessage.tsx | 4 ---- src/shared/components/Chat/ChatMessage/DMChatMessage.tsx | 4 ---- src/shared/icons/file.icon.tsx | 6 +++--- src/shared/ui-kit/FilePreview/FilePreview.module.scss | 2 ++ src/shared/ui-kit/FilePreview/FilePreview.tsx | 8 +------- 8 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/pages/Landing/containers/LandingContainer/LandingContainer.tsx b/src/pages/Landing/containers/LandingContainer/LandingContainer.tsx index b2653afe15..85bf6cee53 100644 --- a/src/pages/Landing/containers/LandingContainer/LandingContainer.tsx +++ b/src/pages/Landing/containers/LandingContainer/LandingContainer.tsx @@ -2,7 +2,7 @@ import React from "react"; import { useSelector } from "react-redux"; import classNames from "classnames"; import { Language } from "@/shared/constants"; -import { useModal } from "@/shared/hooks"; +import { useLightThemeOnly, useModal } from "@/shared/hooks"; import { selectLanguage } from "@/shared/store/selectors"; import { JoinWaitlistModal } from "../../components/JoinWaitlistModal"; import { @@ -21,6 +21,7 @@ const LandingContainer = () => { onOpen: onWaitlistModalOpen, onClose: onWaitlistModalClose, } = useModal(false); + useLightThemeOnly(); return (
)} diff --git a/src/shared/components/Chat/ChatMessage/DMChatMessage.tsx b/src/shared/components/Chat/ChatMessage/DMChatMessage.tsx index 42b3a3add8..0593515d22 100644 --- a/src/shared/components/Chat/ChatMessage/DMChatMessage.tsx +++ b/src/shared/components/Chat/ChatMessage/DMChatMessage.tsx @@ -19,7 +19,6 @@ import { EntityTypes, QueryParamKey, } from "@/shared/constants"; -import { Colors } from "@/shared/constants"; import { useRoutesContext } from "@/shared/contexts"; import { useModal } from "@/shared/hooks"; import { useIsTabletView } from "@/shared/hooks/viewport"; @@ -402,9 +401,6 @@ export default function DMChatMessage({ name={filePreview.name || filePreview.title} fileSize={filePreview.size} variant={FilePreviewVariant.medium} - iconColor={ - isNotCurrentUserMessage ? Colors.black : Colors.lightPink - } isCurrentUser={!isNotCurrentUserMessage} /> )} diff --git a/src/shared/icons/file.icon.tsx b/src/shared/icons/file.icon.tsx index b56b65a077..3fe07b33e9 100644 --- a/src/shared/icons/file.icon.tsx +++ b/src/shared/icons/file.icon.tsx @@ -1,21 +1,21 @@ import React, { ReactElement } from "react"; -import { Colors } from "@/shared/constants"; const BASE_WIDTH = 66; const BASE_HEIGHT = 78; const HEIGHT_COEFFICIENT = BASE_HEIGHT / BASE_WIDTH; interface GalleryIconProps { - color?: string; + iconColor?: string; className?: string; size?: number; } export default function FileIcon({ - color = Colors.darkBlue, + iconColor, size = BASE_WIDTH, className, }: GalleryIconProps): ReactElement { + const color = iconColor ?? "currentColor"; return ( - +
Date: Tue, 28 Nov 2023 10:38:16 -0500 Subject: [PATCH 3/5] sidenav shadow color updated --- src/shared/ui-kit/Sidenav/Sidenav.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/ui-kit/Sidenav/Sidenav.module.scss b/src/shared/ui-kit/Sidenav/Sidenav.module.scss index bd13544dc3..8efa322a8a 100644 --- a/src/shared/ui-kit/Sidenav/Sidenav.module.scss +++ b/src/shared/ui-kit/Sidenav/Sidenav.module.scss @@ -15,7 +15,7 @@ $zIndex: 3; left: 0; z-index: $zIndex; display: block; - background-color: $c-gray-5; + background-color: $black-gray-3; opacity: 0.5; animation: fade var(--sb-transition-duration); } From 99653174e61565122fbfb945ee16827d734bb2ec Mon Sep 17 00:00:00 2001 From: Roie Natan Date: Tue, 28 Nov 2023 10:40:36 -0500 Subject: [PATCH 4/5] . --- src/shared/ui-kit/Sidenav/Sidenav.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/ui-kit/Sidenav/Sidenav.module.scss b/src/shared/ui-kit/Sidenav/Sidenav.module.scss index 8efa322a8a..966e023038 100644 --- a/src/shared/ui-kit/Sidenav/Sidenav.module.scss +++ b/src/shared/ui-kit/Sidenav/Sidenav.module.scss @@ -15,7 +15,7 @@ $zIndex: 3; left: 0; z-index: $zIndex; display: block; - background-color: $black-gray-3; + background-color: var(--drop-shadow); opacity: 0.5; animation: fade var(--sb-transition-duration); } From 2b4ab60b82e748e74716a1a7a8272ef02aab7721 Mon Sep 17 00:00:00 2001 From: Roie Natan Date: Wed, 29 Nov 2023 19:00:18 -0500 Subject: [PATCH 5/5] code review --- .../components/Chat/ChatMessage/ChatMessage.module.scss | 1 + src/shared/icons/file.icon.tsx | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/components/Chat/ChatMessage/ChatMessage.module.scss b/src/shared/components/Chat/ChatMessage/ChatMessage.module.scss index 702403c4cd..301f26a02b 100644 --- a/src/shared/components/Chat/ChatMessage/ChatMessage.module.scss +++ b/src/shared/components/Chat/ChatMessage/ChatMessage.module.scss @@ -94,6 +94,7 @@ background-color: $c-pink-active-feed-cards; margin-left: 2.8rem; margin-right: unset; + .mentionText { color: $c-pink-mention-2; } diff --git a/src/shared/icons/file.icon.tsx b/src/shared/icons/file.icon.tsx index 3fe07b33e9..fe97cf696b 100644 --- a/src/shared/icons/file.icon.tsx +++ b/src/shared/icons/file.icon.tsx @@ -5,17 +5,16 @@ const BASE_HEIGHT = 78; const HEIGHT_COEFFICIENT = BASE_HEIGHT / BASE_WIDTH; interface GalleryIconProps { - iconColor?: string; + color?: string; className?: string; size?: number; } export default function FileIcon({ - iconColor, + color = "currentColor", size = BASE_WIDTH, className, }: GalleryIconProps): ReactElement { - const color = iconColor ?? "currentColor"; return (