From 2cce4ec7c63cbca2b4b91a788241fe0d2e0cc273 Mon Sep 17 00:00:00 2001 From: Nicola Benaglia Date: Sun, 6 Apr 2025 22:00:38 +0200 Subject: [PATCH] Adapt to theme --- src/components/DesktopSideBar.tsx | 43 +++---------------------------- 1 file changed, 3 insertions(+), 40 deletions(-) diff --git a/src/components/DesktopSideBar.tsx b/src/components/DesktopSideBar.tsx index ef023ba..8c966d6 100644 --- a/src/components/DesktopSideBar.tsx +++ b/src/components/DesktopSideBar.tsx @@ -1,12 +1,8 @@ -import { Box, ButtonBase } from "@mui/material"; -import React from "react"; +import { Box, ButtonBase, useTheme } from "@mui/material"; import { HomeIcon } from "../assets/Icons/HomeIcon"; import { MessagingIcon } from "../assets/Icons/MessagingIcon"; import { Save } from "./Save/Save"; -import { HubsIcon } from "../assets/Icons/HubsIcon"; -import { CoreSyncStatus } from "./CoreSyncStatus"; import { IconWrapper } from "./Desktop/DesktopFooter"; -import AppIcon from "./../assets/svgs/AppIcon.svg"; import { useRecoilState } from "recoil"; import { enabledDevModeAtom } from "../atoms/global"; import { AppsIcon } from "../assets/Icons/AppsIcon"; @@ -54,12 +50,9 @@ export const DesktopSideBar = ({ > >>>>>> b721248 (Add themeSelector component) /> >>>>>> b721248 (Add themeSelector component) label="Apps" selected={isApps} disableWidth > >>>>>> b721248 (Add themeSelector component) height={30} /> -<<<<<<< HEAD - -======= ->>>>>>> b721248 (Add themeSelector component) { setDesktopViewMode("chat"); @@ -100,13 +83,7 @@ export const DesktopSideBar = ({ color={ hasUnreadDirects || hasUnreadGroups ? "var(--unread)" -<<<<<<< HEAD - : theme.palette.text.primary -======= - : desktopViewMode === "chat" - ? "white" - : "rgba(250, 250, 250, 0.5)" ->>>>>>> b721248 (Add themeSelector component) + : theme.palette.text.primary } label="Chat" disableWidth @@ -116,13 +93,8 @@ export const DesktopSideBar = ({ color={ hasUnreadDirects || hasUnreadGroups ? "var(--unread)" -<<<<<<< HEAD : theme.palette.text.primary -======= - : desktopViewMode === "chat" - ? "white" - : "rgba(250, 250, 250, 0.5)" ->>>>>>> b721248 (Add themeSelector component) + ? "rgba(250, 250, 250, 0.5)" } /> @@ -154,22 +126,13 @@ export const DesktopSideBar = ({ }} > >>>>>> b721248 (Add themeSelector component) label="Dev" disableWidth > >>>>>> b721248 (Add themeSelector component) height={30} />