Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dark mode updated #2 #2353

Merged
merged 6 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -21,6 +21,7 @@ const LandingContainer = () => {
onOpen: onWaitlistModalOpen,
onClose: onWaitlistModalClose,
} = useModal(false);
useLightThemeOnly();

return (
<div
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
padding: 0 1rem;
background-color: var(--tertiary-fill);
width: 100%;
color: var(--primary-text);
}

.tableHeader {
Expand Down Expand Up @@ -82,8 +83,4 @@

.clickableRow {
cursor: pointer;

&:hover {
background-color: $c-primary-100;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@
background-color: $c-pink-active-feed-cards;
margin-left: 2.8rem;
margin-right: unset;

.mentionText {
roienatan marked this conversation as resolved.
Show resolved Hide resolved
color: $c-pink-mention-2;
}
}

.systemMessageContainer {
Expand Down Expand Up @@ -270,15 +274,13 @@

.fileTitle {
font-size: $xxsmall;
color: $c-gray-100;
font-weight: 600;
line-height: 1.25rem;
margin: 0;
margin-bottom: 0.125rem;
}

.fileSize {
color: $c-gray-100;
font-size: $xxsmall-3;
font-weight: 400;
margin: 0;
Expand Down
5 changes: 1 addition & 4 deletions src/shared/components/Chat/ChatMessage/ChatMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
EntityTypes,
QueryParamKey,
} from "@/shared/constants";
import { Colors } from "@/shared/constants";
import { useModal } from "@/shared/hooks";
import { useIsTabletView } from "@/shared/hooks/viewport";
import { ModerationFlags } from "@/shared/interfaces/Moderation";
import {
Expand Down Expand Up @@ -335,9 +335,6 @@ export default function ChatMessage({
name={filePreview.name || filePreview.title}
fileSize={filePreview.size}
variant={FilePreviewVariant.medium}
iconColor={
isNotCurrentUserMessage ? Colors.black : Colors.lightPink
}
isCurrentUser={!isNotCurrentUserMessage}
/>
)}
Expand Down
4 changes: 0 additions & 4 deletions src/shared/components/Chat/ChatMessage/DMChatMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
EntityTypes,
QueryParamKey,
} from "@/shared/constants";
import { Colors } from "@/shared/constants";
import { useRoutesContext } from "@/shared/contexts";
import { useIsTabletView } from "@/shared/hooks/viewport";
import { ModerationFlags } from "@/shared/interfaces/Moderation";
Expand Down Expand Up @@ -389,9 +388,6 @@ export default function DMChatMessage({
name={filePreview.name || filePreview.title}
fileSize={filePreview.size}
variant={FilePreviewVariant.medium}
iconColor={
isNotCurrentUserMessage ? Colors.black : Colors.lightPink
}
isCurrentUser={!isNotCurrentUserMessage}
/>
)}
Expand Down
3 changes: 1 addition & 2 deletions src/shared/icons/file.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { ReactElement } from "react";
import { Colors } from "@/shared/constants";

const BASE_WIDTH = 66;
const BASE_HEIGHT = 78;
Expand All @@ -12,7 +11,7 @@ interface GalleryIconProps {
}

export default function FileIcon({
color = Colors.darkBlue,
color = "currentColor",
size = BASE_WIDTH,
className,
}: GalleryIconProps): ReactElement {
Expand Down
4 changes: 0 additions & 4 deletions src/shared/ui-kit/Button/Button.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,6 @@
&:active {
--btn-bg-color: #{$c-pink-active-btn};
}

&.buttonDisabled {
--btn-bg-color: #{$c-neutrals-100};
}
}

.buttonWarningVariant {
Expand Down
2 changes: 2 additions & 0 deletions src/shared/ui-kit/FilePreview/FilePreview.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
width: fit-content;
cursor: pointer;
margin-left: 1.5rem;
margin-bottom: 0.5rem;
}

.linkWrapper {
display: flex;
width: fit-content;
color: var(--primary-text);
}

.fileExtension {
Expand Down
8 changes: 1 addition & 7 deletions src/shared/ui-kit/FilePreview/FilePreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ interface FilePreviewProps {
variant?: FilePreviewVariant;
iconContainerClassName?: string;
containerClassName?: string;
iconColor?: string;
isCurrentUser?: boolean;
isPreview?: boolean;
}
Expand All @@ -32,7 +31,6 @@ export default function FilePreview(props: FilePreviewProps) {
variant = FilePreviewVariant.small,
iconContainerClassName,
containerClassName,
iconColor,
size,
fileSize,
isCurrentUser,
Expand All @@ -51,11 +49,7 @@ export default function FilePreview(props: FilePreviewProps) {
target="_blank"
rel="noopener noreferrer"
>
<FileIcon
className={iconContainerClassName}
color={iconColor}
size={size}
/>
<FileIcon className={iconContainerClassName} size={size} />
<div
className={classNames(styles.fileExtension, {
[styles.fileExtensionExtraSmall]:
Expand Down
2 changes: 1 addition & 1 deletion src/shared/ui-kit/Sidenav/Sidenav.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $zIndex: 3;
left: 0;
z-index: $zIndex;
display: block;
background-color: $c-gray-5;
background-color: var(--drop-shadow);
opacity: 0.5;
animation: fade var(--sb-transition-duration);
}
Expand Down
Loading