Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

fix(Sidebar):fix-colors

Aswin Asok35e5c1b0acc1
diff --git a/web/apps/locker/src/components/LockerAboutDrawer.tsx b/web/apps/locker/src/components/LockerAboutDrawer.tsx
index 053ff1c450..ccac31d407 100644
--- a/web/apps/locker/src/components/LockerAboutDrawer.tsx
+++ b/web/apps/locker/src/components/LockerAboutDrawer.tsx
@@ -1,10 +1,10 @@
import {
- Github01Icon,
- LicenseIcon,
+ File01Icon,
+ GithubIcon,
Shield01Icon,
} from "@hugeicons/core-free-icons";
-import NorthEastIcon from "@mui/icons-material/NorthEast";
-import { Stack, useTheme } from "@mui/material";
+import ChevronRightIcon from "@mui/icons-material/ChevronRight";
+import { Stack } from "@mui/material";
import { t } from "i18next";
import React from "react";
import { LockerSidebarCardButton } from "./LockerSidebarCardButton";
@@ -18,8 +18,6 @@ const openExternal = (url: string) => window.open(url, "_blank", "noopener");
export const LockerAboutDrawer: React.FC<
LockerNestedSidebarDrawerVisibilityProps
> = ({ open, onClose, onRootClose }) => {
- const theme = useTheme();
-
const handleRootClose = () => {
onClose();
onRootClose();
@@ -32,33 +30,23 @@ export const LockerAboutDrawer: React.FC<
title={t("about")}
hideRootCloseButton
>
- <Stack
- sx={{
- px: 2,
- py: 1,
- gap: 1,
- backgroundColor: "background.default",
- ...theme.applyStyles("dark", {
- backgroundColor: "background.paper",
- }),
- }}
- >
+ <Stack sx={{ px: 2, py: 1, gap: 1 }}>
<LockerSidebarCardButton
- icon={Github01Icon}
+ icon={GithubIcon}
label={t("we_are_open_source")}
- endIcon={<NorthEastIcon />}
+ endIcon={<ChevronRightIcon />}
onClick={() => openExternal("https://github.com/ente/ente")}
/>
<LockerSidebarCardButton
icon={Shield01Icon}
label={t("privacy")}
- endIcon={<NorthEastIcon />}
+ endIcon={<ChevronRightIcon />}
onClick={() => openExternal("https://ente.com/privacy")}
/>
<LockerSidebarCardButton
- icon={LicenseIcon}
+ icon={File01Icon}
label={t("terms")}
- endIcon={<NorthEastIcon />}
+ endIcon={<ChevronRightIcon />}
onClick={() => openExternal("https://ente.com/terms")}
/>
</Stack>
diff --git a/web/apps/locker/src/components/LockerAccountDrawer.tsx b/web/apps/locker/src/components/LockerAccountDrawer.tsx
index 209c3ec695..73258e5573 100644
--- a/web/apps/locker/src/components/LockerAccountDrawer.tsx
+++ b/web/apps/locker/src/components/LockerAccountDrawer.tsx
@@ -7,8 +7,7 @@ import {
SecurityCheckIcon,
} from "@hugeicons/core-free-icons";
import ChevronRightIcon from "@mui/icons-material/ChevronRight";
-import NorthEastIcon from "@mui/icons-material/NorthEast";
-import { Box, Stack, Typography, useTheme } from "@mui/material";
+import { Stack, Typography } from "@mui/material";
import { RecoveryKey } from "ente-accounts/components/RecoveryKey";
import { openAccountsManagePasskeysPage } from "ente-accounts/services/passkey";
import { useBaseContext } from "ente-base/context";
@@ -35,8 +34,6 @@ export const LockerAccountDrawer: React.FC<
> = ({ open, onClose, onRootClose }) => {
const { showMiniDialog, onGenericError } = useBaseContext();
const router = useRouter();
- const theme = useTheme();
-
const [isRecoveryKeyOpen, setIsRecoveryKeyOpen] = useState(false);
const [isSessionsOpen, setIsSessionsOpen] = useState(false);
const [isTwoFactorOpen, setIsTwoFactorOpen] = useState(false);
@@ -105,17 +102,7 @@ export const LockerAccountDrawer: React.FC<
title={t("account")}
hideRootCloseButton
>
- <Stack
- sx={{
- px: 2,
- pb: 2,
- gap: 2,
- backgroundColor: "background.default",
- ...theme.applyStyles("dark", {
- backgroundColor: "background.paper",
- }),
- }}
- >
+ <Stack sx={{ px: 2, pb: 2, gap: 2 }}>
<LockerSidebarCardButton
icon={Key02Icon}
label={t("recovery_key")}
@@ -143,7 +130,7 @@ export const LockerAccountDrawer: React.FC<
<LockerSidebarCardButton
icon={Key01Icon}
label={t("passkeys")}
- endIcon={<NorthEastIcon />}
+ endIcon={<ChevronRightIcon />}
onClick={handleOpenPasskeys}
/>
<LockerSidebarCardButton
@@ -154,8 +141,6 @@ export const LockerAccountDrawer: React.FC<
/>
</Stack>
- <Box sx={{ borderTop: 1, borderColor: "divider", mx: 1 }} />
-
<Stack sx={{ gap: 1 }}>
<LockerSidebarCardButton
icon={PasswordValidationIcon}
diff --git a/web/apps/locker/src/components/LockerSidebar.tsx b/web/apps/locker/src/components/LockerSidebar.tsx
index 0db9029468..7b975f96b0 100644
--- a/web/apps/locker/src/components/LockerSidebar.tsx
+++ b/web/apps/locker/src/components/LockerSidebar.tsx
@@ -139,9 +139,9 @@ export const LockerSidebar: React.FC<LockerSidebarProps> = ({
sx={{
height: "calc(100dvh - env(titlebar-area-height, 0px) - 16px)",
minHeight: 0,
- backgroundColor: "background.default",
+ backgroundColor: "#f4f4f4",
...theme.applyStyles("dark", {
- backgroundColor: "background.paper",
+ backgroundColor: "#161616",
}),
}}
>
@@ -174,7 +174,11 @@ export const LockerSidebar: React.FC<LockerSidebarProps> = ({
>
<EnteLogo height={18} />
</Box>
- <IconButton onClick={onClose} color="secondary">
+ <IconButton
+ onClick={onClose}
+ color="secondary"
+ sx={{ mr: 0.75 }}
+ >
<CloseIcon />
</IconButton>
</Stack>
@@ -364,15 +368,6 @@ export const LockerSidebar: React.FC<LockerSidebarProps> = ({
/>
</Stack>
</Box>
- <Box
- sx={{
- mx: 1.5,
- mt: 2,
- borderTop: 1,
- borderColor: "divider",
- }}
- />
-
<Box sx={{ px: 0.5, mt: 2, pb: 1 }}>
<Stack sx={{ gap: 1 }}>
<LockerSidebarCardButton
@@ -403,14 +398,6 @@ export const LockerSidebar: React.FC<LockerSidebarProps> = ({
/>
</Stack>
</Box>
- <Box
- sx={{
- mx: 1.5,
- mt: 1,
- borderTop: 1,
- borderColor: "divider",
- }}
- />
<Box sx={{ px: 0.5, mt: 2, pb: 1 }}>
<Stack sx={{ gap: 1 }}>
<LockerSidebarCardButton
diff --git a/web/apps/locker/src/components/LockerSidebarCardButton.tsx b/web/apps/locker/src/components/LockerSidebarCardButton.tsx
index 3fd4a40da1..ffd70de6ce 100644
--- a/web/apps/locker/src/components/LockerSidebarCardButton.tsx
+++ b/web/apps/locker/src/components/LockerSidebarCardButton.tsx
@@ -43,12 +43,12 @@ export const LockerSidebarCardButton: React.FC<
<Stack
direction="row"
sx={(theme) => ({
- minHeight: 56,
- px: 2,
+ minHeight: 54,
+ px: 1.5,
gap: 1.5,
alignItems: "center",
borderRadius: "20px",
- backgroundColor: "backdrop.base",
+ backgroundColor: "#ffffff",
color: color ?? "text.base",
transition: theme.transitions.create(
["background-color", "border-color", "color"],
@@ -63,38 +63,52 @@ export const LockerSidebarCardButton: React.FC<
"&:hover": {
backgroundColor: selected
? "rgba(16, 113, 255, 0.16)"
- : "fill.faint",
+ : "#eaeaea",
},
- ...theme.applyStyles("light", {
+ "&:active": {
+ backgroundColor: selected
+ ? "rgba(16, 113, 255, 0.18)"
+ : "#dedede",
+ },
+ ...theme.applyStyles("dark", {
+ backgroundColor: "#212121",
...(selected && {
- backgroundColor: "rgba(16, 113, 255, 0.10)",
+ backgroundColor: "rgba(16, 113, 255, 0.12)",
}),
"&:hover": {
backgroundColor: selected
- ? "rgba(16, 113, 255, 0.14)"
- : theme.vars.palette.fill.faint,
+ ? "rgba(16, 113, 255, 0.16)"
+ : "#1b1b1b",
+ },
+ "&:active": {
+ backgroundColor: selected
+ ? "rgba(16, 113, 255, 0.18)"
+ : "#141414",
},
}),
})}
>
- {iconNode ? (
+ {iconNode || icon ? (
<Box
sx={{
display: "flex",
alignItems: "center",
justifyContent: "center",
color: "inherit",
+ width: 36,
+ height: 36,
+ flexShrink: 0,
}}
>
- {iconNode}
+ {iconNode ?? (
+ <HugeiconsIcon
+ icon={icon!}
+ size={18}
+ color="currentColor"
+ strokeWidth={1.6}
+ />
+ )}
</Box>
- ) : icon ? (
- <HugeiconsIcon
- icon={icon}
- size={24}
- color="currentColor"
- strokeWidth={1.9}
- />
) : null}
<Box sx={{ flex: 1, minWidth: 0 }}>
{typeof label === "string" ? (
@@ -102,7 +116,9 @@ export const LockerSidebarCardButton: React.FC<
variant="small"
sx={{
color: "inherit",
- fontWeight: selected ? 700 : 500,
+ fontSize: 14,
+ lineHeight: "20px",
+ fontWeight: selected ? 600 : 500,
}}
>
{label}
@@ -112,18 +128,40 @@ export const LockerSidebarCardButton: React.FC<
)}
</Box>
{caption && (
- <Typography
- variant="mini"
+ <Box
sx={{
- color: selected ? "accent.main" : "text.muted",
+ width: 36,
+ height: 36,
+ display: "flex",
+ alignItems: "center",
+ justifyContent: "center",
flexShrink: 0,
}}
>
- {caption}
- </Typography>
+ <Typography
+ variant="mini"
+ sx={{
+ color: selected ? "accent.main" : "text.muted",
+ fontSize: 14,
+ lineHeight: "20px",
+ }}
+ >
+ {caption}
+ </Typography>
+ </Box>
)}
{endIcon && (
- <Box sx={{ color: selected ? "accent.main" : "text.muted" }}>
+ <Box
+ sx={{
+ width: 36,
+ height: 36,
+ display: "flex",
+ alignItems: "center",
+ justifyContent: "center",
+ color: selected ? "accent.main" : "text.muted",
+ flexShrink: 0,
+ }}
+ >
{endIcon}
</Box>
)}
diff --git a/web/apps/locker/src/components/LockerSidebarShell.tsx b/web/apps/locker/src/components/LockerSidebarShell.tsx
index 73f45076e0..778410c618 100644
--- a/web/apps/locker/src/components/LockerSidebarShell.tsx
+++ b/web/apps/locker/src/components/LockerSidebarShell.tsx
@@ -33,13 +33,12 @@ export const LockerSidebarDrawer: React.FC<DrawerProps> = ({
maxWidth: "375px",
width: "100%",
scrollbarWidth: "thin",
- backgroundColor: "background.default",
+ backgroundColor: "#f4f4f4",
"&&": { padding: 0 },
},
(theme) =>
theme.applyStyles("dark", {
- backgroundColor:
- theme.vars.palette.background.paper,
+ backgroundColor: "#161616",
}),
paperSlotProps?.sx as never,
],
diff --git a/web/apps/locker/src/components/LockerSupportDrawer.tsx b/web/apps/locker/src/components/LockerSupportDrawer.tsx
index 1eef7a23af..b6754f11dc 100644
--- a/web/apps/locker/src/components/LockerSupportDrawer.tsx
+++ b/web/apps/locker/src/components/LockerSupportDrawer.tsx
@@ -5,8 +5,7 @@ import {
NewsIcon,
} from "@hugeicons/core-free-icons";
import ChevronRightIcon from "@mui/icons-material/ChevronRight";
-import NorthEastIcon from "@mui/icons-material/NorthEast";
-import { Box, Stack, Tooltip, Typography, useTheme } from "@mui/material";
+import { Stack, Tooltip, Typography } from "@mui/material";
import { useBaseContext } from "ente-base/context";
import log from "ente-base/log";
import { savedLogs } from "ente-base/log-web";
@@ -25,8 +24,6 @@ export const LockerSupportDrawer: React.FC<
LockerNestedSidebarDrawerVisibilityProps
> = ({ open, onClose, onRootClose }) => {
const { showMiniDialog } = useBaseContext();
- const theme = useTheme();
-
const handleRootClose = () => {
onClose();
onRootClose();
@@ -62,33 +59,23 @@ export const LockerSupportDrawer: React.FC<
title={t("help_and_support")}
hideRootCloseButton
>
- <Stack
- sx={{
- px: 2,
- py: 1,
- gap: 1,
- backgroundColor: "background.default",
- ...theme.applyStyles("dark", {
- backgroundColor: "background.paper",
- }),
- }}
- >
+ <Stack sx={{ px: 2, py: 1, gap: 1 }}>
<LockerSidebarCardButton
icon={InformationCircleIcon}
label={t("help")}
- endIcon={<NorthEastIcon />}
+ endIcon={<ChevronRightIcon />}
onClick={handleHelp}
/>
<LockerSidebarCardButton
icon={NewsIcon}
label={t("blog")}
- endIcon={<NorthEastIcon />}
+ endIcon={<ChevronRightIcon />}
onClick={handleBlog}
/>
<LockerSidebarCardButton
icon={MessageQuestionIcon}
label={t("request_feature")}
- endIcon={<NorthEastIcon />}
+ endIcon={<ChevronRightIcon />}
onClick={handleRequestFeature}
/>
<LockerSidebarCardButton
@@ -106,9 +93,6 @@ export const LockerSupportDrawer: React.FC<
endIcon={<ChevronRightIcon />}
onClick={handleSupport}
/>
- <Box
- sx={{ borderTop: 1, borderColor: "divider", mx: 1, my: 1 }}
- />
<LockerSidebarCardButton
icon={InformationCircleIcon}
label={t("view_logs")}