diff --git a/web/packages/base/components/utils/mui-theme.d.ts b/web/packages/base/components/utils/mui-theme.d.ts index 6f15714aba..6a82f67043 100644 --- a/web/packages/base/components/utils/mui-theme.d.ts +++ b/web/packages/base/components/utils/mui-theme.d.ts @@ -145,8 +145,9 @@ declare module "@mui/material/styles" { * even when the app is in light mode. */ dark: { - background: TypeBackground; - text: TypeText; + background: Omit; + text: Omit; + divider: string; }; }; /** diff --git a/web/packages/base/components/utils/theme.ts b/web/packages/base/components/utils/theme.ts index f1c51f7fe9..5c6859dd7d 100644 --- a/web/packages/base/components/utils/theme.ts +++ b/web/packages/base/components/utils/theme.ts @@ -117,6 +117,16 @@ const getTheme = (appName: AppName): Theme => { */ const getColors = (appName: AppName) => ({ ..._colors, + ...{ + fixed: { + ..._colors.fixed, + dark: { + background: _colors.dark.background, + text: _colors.dark.text, + divider: _colors.dark.stroke.faint + }, + }, + }, ...{ accent: appName == "auth" ? _colors.accentAuth : _colors.accentPhotos, }, @@ -151,19 +161,6 @@ const _colors = { light: "#ff6565", }, switchOn: "#2eca45", - dark: { - // Duplicated from "dark" below. - background: { - default: "#000", - paper: "#1b1b1b", - paper2: "#252525", - }, - text: { - base: "#fff", - muted: "rgba(255 255 255 / 0.70)", - faint: "rgba(255 255 255 / 0.50)", - }, - }, }, light: { // Keep these solid. diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx index 1b020cdb68..2ab43464de 100644 --- a/web/packages/gallery/components/viewer/FileViewer.tsx +++ b/web/packages/gallery/components/viewer/FileViewer.tsx @@ -43,14 +43,7 @@ import EditIcon from "@mui/icons-material/Edit"; import FileDownloadOutlinedIcon from "@mui/icons-material/FileDownloadOutlined"; import FullscreenExitOutlinedIcon from "@mui/icons-material/FullscreenExitOutlined"; import FullscreenOutlinedIcon from "@mui/icons-material/FullscreenOutlined"; -import { - Button, - Divider, - Menu, - MenuItem, - styled, - Typography, -} from "@mui/material"; +import { Button, Menu, MenuItem, styled, Typography } from "@mui/material"; import { t } from "i18next"; import React, { useCallback, @@ -748,7 +741,15 @@ const FileViewer: React.FC = ({ )} - + { /*TODO */ isFullscreen @@ -762,11 +763,8 @@ const FileViewer: React.FC = ({ )} - - - + + {pt("Shortcuts")}