Skip to content

armgit / ente

Public Imported from GitHub
0

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

Apply dark theme across Space

Anand Baburajanac5e9b3a05f1
diff --git a/web/apps/space/src/components/AvatarCropPage.tsx b/web/apps/space/src/components/AvatarCropPage.tsx
index 92cce524de..964ddd7b8c 100644
--- a/web/apps/space/src/components/AvatarCropPage.tsx
+++ b/web/apps/space/src/components/AvatarCropPage.tsx
@@ -5,6 +5,7 @@ import React from "react";
import Cropper, { type Area, type Point } from "react-easy-crop";
import {
spaceAppBackground,
+ spaceOnAccent,
spaceSurface,
spaceSurfaceHover,
spaceText,
@@ -69,7 +70,7 @@ const SpaceAvatarCropPageButton: React.FC<{
bgcolor: disabled && !loading ? spaceSurface : green,
border: 0,
borderRadius: "20px",
- color: disabled && !loading ? textLight : "white",
+ color: disabled && !loading ? textLight : spaceOnAccent,
cursor: disabled ? "default" : "pointer",
display: "flex",
flex: "0 0 auto",
@@ -302,7 +303,7 @@ export const SpaceAvatarCropPage: React.FC<SpaceAvatarCropPageProps> = ({
<Box
sx={{
alignSelf: "center",
- bgcolor: isSquareCrop ? "#111" : "#FFFFFF",
+ bgcolor: spaceAppBackground,
borderRadius: isSquareCrop
? "50%"
: isCoverCrop
diff --git a/web/apps/space/src/components/ButtonSpinner.tsx b/web/apps/space/src/components/ButtonSpinner.tsx
index 4aeb63b570..441630840f 100644
--- a/web/apps/space/src/components/ButtonSpinner.tsx
+++ b/web/apps/space/src/components/ButtonSpinner.tsx
@@ -6,6 +6,6 @@ export const SpaceButtonSpinner: React.FC = () => (
ariaLabel="Loading"
color="currentColor"
size={20}
- trackColor="rgba(255, 255, 255, 0.38)"
+ trackColor="color-mix(in srgb, currentColor 30%, transparent)"
/>
);
diff --git a/web/apps/space/src/components/ConfirmationActionSheet.tsx b/web/apps/space/src/components/ConfirmationActionSheet.tsx
index fcf657806a..bb85e05481 100644
--- a/web/apps/space/src/components/ConfirmationActionSheet.tsx
+++ b/web/apps/space/src/components/ConfirmationActionSheet.tsx
@@ -7,6 +7,7 @@ import { SpaceBottomSheetTransition } from "components/BottomSheetTransition";
import React from "react";
import {
spaceDialogBackground,
+ spaceOnAccent,
spaceSurface,
spaceText,
spaceTextMuted,
@@ -17,7 +18,6 @@ const dangerColor = "#F63A3A";
const textBase = spaceText;
interface ConfirmationActionSheetProps {
- appearance?: "light" | "dark";
open: boolean;
title: string;
description?: React.ReactNode;
@@ -37,7 +37,6 @@ interface ConfirmationActionSheetProps {
export const ConfirmationActionSheet: React.FC<
ConfirmationActionSheetProps
> = ({
- appearance = "light",
open,
title,
description,
@@ -54,7 +53,6 @@ export const ConfirmationActionSheet: React.FC<
onExited,
}) => {
const titleID = React.useId();
- const isDark = appearance == "dark";
const isBottomSheet = useMediaQuery("(max-width: 599px)");
return (
@@ -68,18 +66,14 @@ export const ConfirmationActionSheet: React.FC<
? { transition: SpaceBottomSheetTransition }
: undefined
}
- sx={
- isDark
- ? {
- zIndex: 1500,
- "--space-dialog-backdrop": "rgba(0 0 0 / 0.86)",
- }
- : undefined
- }
+ sx={{
+ zIndex: 1500,
+ "--space-dialog-backdrop": "rgba(0 0 0 / 0.86)",
+ }}
slotProps={{
paper: {
sx: {
- bgcolor: isDark ? "#1E1E1E" : spaceDialogBackground,
+ bgcolor: spaceDialogBackground,
borderRadius: "28px 28px 0 0",
bottom: 0,
boxShadow: "none",
@@ -116,7 +110,7 @@ export const ConfirmationActionSheet: React.FC<
component="h2"
id={titleID}
sx={{
- color: isDark ? "#F4F4F4" : textBase,
+ color: textBase,
fontFamily: '"Inter Variable", Inter, sans-serif',
fontSize: 15,
fontWeight: 600,
@@ -131,7 +125,7 @@ export const ConfirmationActionSheet: React.FC<
{description && (
<Box
sx={{
- color: isDark ? "#BDBDBD" : spaceTextMuted,
+ color: spaceTextMuted,
fontFamily: '"Inter Variable", Inter, sans-serif',
fontSize: 13,
lineHeight: "18px",
@@ -155,15 +149,15 @@ export const ConfirmationActionSheet: React.FC<
label={confirmLabel}
backgroundColor={confirmBackgroundColor}
className={confirmClassName}
- color="#FFFFFF"
+ color={spaceOnAccent}
disabled={confirmDisabled}
actionPhase={confirmActionPhase}
onClick={onConfirm}
/>
<SheetButton
label={cancelLabel}
- backgroundColor={isDark ? "#333333" : spaceSurface}
- color={isDark ? "#D8D8D8" : spaceTextMuted}
+ backgroundColor={spaceSurface}
+ color={spaceTextMuted}
disabled={cancelDisabled}
onClick={onCancel}
/>
diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsx
index 82c1a41d2f..c7058e66bc 100644
--- a/web/apps/space/src/components/FileViewer.tsx
+++ b/web/apps/space/src/components/FileViewer.tsx
@@ -1812,6 +1812,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
}}
/>
<Box
+ className="green-bg"
component="button"
type="button"
aria-label={
@@ -1826,12 +1827,12 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
onPointerDown={handleInputActionPointerDown}
sx={{
alignItems: "center",
- bgcolor: "#FFFFFF",
+ bgcolor: green,
border: 0,
borderRadius: "24px",
boxSizing: "border-box",
boxShadow: "0 10px 28px rgba(0, 0, 0, 0.28)",
- color: "#111111",
+ color: "#FFFFFF",
cursor: isDraftPostPublishDisabled
? "default"
: "pointer",
@@ -1853,9 +1854,9 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
outlineOffset: 2,
},
"&:hover": {
- bgcolor: isDraftPostPublishDisabled
- ? "#FFFFFF"
- : "#F0F0F0",
+ filter: isDraftPostPublishDisabled
+ ? undefined
+ : "brightness(0.96)",
},
}}
>
@@ -1965,12 +1966,12 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
onClick={updateCaption}
sx={{
alignItems: "center",
- bgcolor: "#FFFFFF",
+ bgcolor: controlBackground,
border: 0,
borderRadius: "24px",
boxSizing: "border-box",
boxShadow: "0 10px 28px rgba(0, 0, 0, 0.28)",
- color: "#111111",
+ color: textBase,
cursor: isCaptionUpdateDisabled
? "default"
: "pointer",
@@ -1997,8 +1998,8 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
},
"&:hover": {
bgcolor: isCaptionUpdateDisabled
- ? "#FFFFFF"
- : "#F0F0F0",
+ ? controlBackground
+ : controlBackgroundHover,
},
}}
>
@@ -2192,13 +2193,10 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
animation: isPhotoLikePopping
? `${spacePostLikeButtonPop} ${spacePostLikePopDurationMs}ms ${spacePostLikePopTiming} both`
: undefined,
- bgcolor:
- isReplyMode && canSendReply
- ? "#FFFFFF"
- : controlBackground,
+ bgcolor: controlBackground,
color:
isReplyMode && canSendReply
- ? "#111111"
+ ? textBase
: controlIcon,
cursor:
isReplyMode && !canSendReply
@@ -2211,7 +2209,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
"&:hover": {
bgcolor: isReplyMode
? canSendReply
- ? "#F0F0F0"
+ ? controlBackgroundHover
: controlBackground
: controlBackgroundHover,
},
@@ -2291,7 +2289,6 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
)}
{canDeletePost && (
<ConfirmationActionSheet
- appearance="dark"
open={deleteSheetOpen}
title="Are you sure you want to delete this?"
confirmLabel="Yes, delete"
@@ -2305,7 +2302,6 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
)}
{canAddFriendForPostAction && (
<ConfirmationActionSheet
- appearance="dark"
open={addFriendSheetOpen}
title={
addFriendIntent == "like"
diff --git a/web/apps/space/src/components/HomeHeader.tsx b/web/apps/space/src/components/HomeHeader.tsx
index dacf0521e9..9e10891e2f 100644
--- a/web/apps/space/src/components/HomeHeader.tsx
+++ b/web/apps/space/src/components/HomeHeader.tsx
@@ -1,11 +1,15 @@
import { BubbleChatIcon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
-import { Box, Skeleton } from "@mui/material";
+import { alpha, Box, Skeleton } from "@mui/material";
import { SpaceAvatarImage } from "components/AvatarImage";
import React from "react";
import type { SetupProfile } from "screens/SetupProfileScreen";
import { useSpaceAppState } from "state/app-state";
-import { spaceAppBackgroundColor, spaceText } from "styles/colors";
+import {
+ spaceAppBackgroundColor,
+ spaceSurface,
+ spaceText,
+} from "styles/colors";
import { spaceTouchTargetSize } from "styles/touch-targets";
const green = "#08C225";
@@ -14,10 +18,9 @@ const headerActionSize = spaceTouchTargetSize;
const headerAvatarSize = 36;
const headerAvatarImageSize = 28;
const headerChatCircleSize = 36;
-export const spaceHomeHeaderChromeColor = "#F0F0F0";
const headerIconSize = 25;
const headerSideWidth = 36;
-const mediaPlaceholderColor = "#E5E7EA";
+const mediaPlaceholderColor = spaceSurface;
const avatarFadeSx = {
"@keyframes spaceAvatarFade": { from: { opacity: 0 }, to: { opacity: 1 } },
animation: "spaceAvatarFade 320ms cubic-bezier(0.22, 1, 0.36, 1) both",
@@ -60,7 +63,7 @@ export const SpaceHomeHeader: React.FC<SpaceHomeHeaderProps> = ({
width: "100%",
zIndex: 4,
"&::after": {
- bgcolor: spaceHomeHeaderChromeColor,
+ bgcolor: spaceSurface,
borderRadius: "999px",
content: '""',
height: 44,
@@ -76,7 +79,7 @@ export const SpaceHomeHeader: React.FC<SpaceHomeHeaderProps> = ({
WebkitMaskImage:
"linear-gradient(to bottom, #000 0%, transparent 100%)",
backdropFilter: "blur(4px)",
- background: `linear-gradient(to bottom, ${spaceAppBackgroundColor}, rgba(255, 255, 255, 0.35) 75%, transparent)`,
+ background: `linear-gradient(to bottom, ${spaceAppBackgroundColor}, ${alpha(spaceAppBackgroundColor, 0.35)} 75%, transparent)`,
content: '""',
height: "calc(100% + 28px)",
left: 0,
@@ -157,12 +160,7 @@ export const SpaceHomeHeader: React.FC<SpaceHomeHeaderProps> = ({
component="img"
alt="Space"
src="/images/space.svg"
- sx={{
- display: "block",
- filter: "invert(1)",
- height: 19,
- width: "auto",
- }}
+ sx={{ display: "block", height: 19, width: "auto" }}
/>
</Box>
<Box
@@ -221,7 +219,7 @@ export const SpaceHomeHeader: React.FC<SpaceHomeHeaderProps> = ({
<Box
sx={{
bgcolor: dangerColor,
- border: `2px solid ${spaceHomeHeaderChromeColor}`,
+ border: `2px solid ${spaceSurface}`,
borderRadius: "50%",
boxSizing: "border-box",
height: 12.5,
diff --git a/web/apps/space/src/components/MobileBestToast.tsx b/web/apps/space/src/components/MobileBestToast.tsx
index b95357882c..c14309003f 100644
--- a/web/apps/space/src/components/MobileBestToast.tsx
+++ b/web/apps/space/src/components/MobileBestToast.tsx
@@ -91,7 +91,7 @@ export const SpaceMobileBestToast: React.FC = () => {
p: 0,
width: 40,
"&:focus-visible": {
- outline: "2px solid rgba(0 0 0 / 0.72)",
+ outline: `2px solid ${spaceText}`,
outlineOffset: 2,
},
}}
diff --git a/web/apps/space/src/components/NotificationPermissionInstructions.tsx b/web/apps/space/src/components/NotificationPermissionInstructions.tsx
index 59a19b36ef..69143e729c 100644
--- a/web/apps/space/src/components/NotificationPermissionInstructions.tsx
+++ b/web/apps/space/src/components/NotificationPermissionInstructions.tsx
@@ -2,7 +2,12 @@ import { Box, Dialog, useMediaQuery } from "@mui/material";
import { SpaceBottomSheetTransition } from "components/BottomSheetTransition";
import { isSpaceIOS } from "hooks/use-pwa-install-prompt";
import React from "react";
-import { spaceText, spaceTextMuted } from "styles/colors";
+import {
+ spaceOnAccent,
+ spaceSurface,
+ spaceText,
+ spaceTextMuted,
+} from "styles/colors";
const green = "#08C225";
const textBase = spaceText;
@@ -121,7 +126,7 @@ export const SpaceNotificationPermissionInstructions: React.FC<
key={step}
sx={{
alignItems: "center",
- bgcolor: "#FAFAFA",
+ bgcolor: spaceSurface,
borderRadius: "18px",
color: textSoft,
display: "flex",
@@ -175,7 +180,7 @@ export const SpaceNotificationPermissionInstructions: React.FC<
bgcolor: green,
border: 0,
borderRadius: "20px",
- color: "#FFFFFF",
+ color: spaceOnAccent,
cursor: "pointer",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
@@ -190,7 +195,7 @@ export const SpaceNotificationPermissionInstructions: React.FC<
width: "100%",
"&:active": { filter: "brightness(0.96)" },
"&:focus-visible": {
- outline: "2px solid rgba(0 0 0 / 0.72)",
+ outline: `2px solid ${spaceText}`,
outlineOffset: 2,
},
"&:hover": { filter: "brightness(0.98)" },
diff --git a/web/apps/space/src/components/PWAInstallPrompt.tsx b/web/apps/space/src/components/PWAInstallPrompt.tsx
index 1bfc439a9c..397566b486 100644
--- a/web/apps/space/src/components/PWAInstallPrompt.tsx
+++ b/web/apps/space/src/components/PWAInstallPrompt.tsx
@@ -18,6 +18,8 @@ import { useSpaceWebPushPrompt } from "hooks/use-web-push-prompt";
import React from "react";
import {
spaceDialogBackground,
+ spaceOnAccent,
+ spaceSurface,
spaceText,
spaceTextMuted,
} from "styles/colors";
@@ -286,7 +288,7 @@ export const SpacePWAPromptBanner: React.FC<SpacePWAPromptBannerProps> = ({
bgcolor: green,
border: 0,
borderRadius: "14px",
- color: "#FFFFFF",
+ color: spaceOnAccent,
cursor: actionDisabled ? "default" : "pointer",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
@@ -577,7 +579,7 @@ export const SpacePWAInstallInstructions: React.FC<
bgcolor: green,
border: 0,
borderRadius: "20px",
- color: "#FFFFFF",
+ color: spaceOnAccent,
cursor: "pointer",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
@@ -592,7 +594,7 @@ export const SpacePWAInstallInstructions: React.FC<
width: "100%",
"&:active": { filter: "brightness(0.96)" },
"&:focus-visible": {
- outline: "2px solid rgba(0 0 0 / 0.72)",
+ outline: `2px solid ${spaceText}`,
outlineOffset: 2,
},
"&:hover": { filter: "brightness(0.98)" },
@@ -609,7 +611,7 @@ const InstallInstructionStep: React.FC<InstallStep> = ({ icon, text }) => (
<Box
sx={{
alignItems: "center",
- bgcolor: "#FAFAFA",
+ bgcolor: spaceSurface,
borderRadius: "18px",
color: textSoft,
display: "flex",
diff --git a/web/apps/space/src/components/ShareInviteButton.tsx b/web/apps/space/src/components/ShareInviteButton.tsx
index 85b465e273..7003f0599d 100644
--- a/web/apps/space/src/components/ShareInviteButton.tsx
+++ b/web/apps/space/src/components/ShareInviteButton.tsx
@@ -4,6 +4,7 @@ import { Box } from "@mui/material";
import { spaceToastAutoDismissDurationMs } from "components/ActionToast";
import React from "react";
import { spaceEmptyStateButtonSx } from "styles/buttons";
+import { spaceSurfaceHover, spaceText } from "styles/colors";
export const SpaceShareIcon: React.FC<{
size?: number;
@@ -15,7 +16,7 @@ export const SpaceShareIcon: React.FC<{
interface SpaceShareInviteButtonProps {
profileLink?: string;
sharing?: boolean;
- variant?: "green" | "white";
+ variant?: "green" | "secondary";
onShareError?: (error: unknown) => void;
onSharingChange?: (sharing: boolean) => void;
}
@@ -81,16 +82,16 @@ export const SpaceShareInviteButton: React.FC<SpaceShareInviteButtonProps> = ({
disabled={isDisabled}
onClick={() => void shareInvite()}
sx={
- variant == "white"
+ variant == "secondary"
? {
...spaceEmptyStateButtonSx,
- bgcolor: "#FFF",
- color: "#303030",
+ bgcolor: spaceSurfaceHover,
+ color: spaceText,
"&:focus-visible": {
- outline: "2px solid #303030",
+ outline: `2px solid ${spaceText}`,
outlineOffset: 2,
},
- "&:hover:not(:disabled)": { bgcolor: "#F4F4F4" },
+ "&:hover:not(:disabled)": { bgcolor: "#404040" },
}
: spaceEmptyStateButtonSx
}
diff --git a/web/apps/space/src/components/ShareLinkDialog.tsx b/web/apps/space/src/components/ShareLinkDialog.tsx
index 93301092f2..2eee6a2e45 100644
--- a/web/apps/space/src/components/ShareLinkDialog.tsx
+++ b/web/apps/space/src/components/ShareLinkDialog.tsx
@@ -3,7 +3,7 @@ import { SpaceBottomSheetTransition } from "components/BottomSheetTransition";
import log from "ente-base/log";
import React from "react";
import { onOpenSpaceShareLinkDialog } from "services/share-link";
-import { spaceText, spaceTextMuted } from "styles/colors";
+import { spaceOnAccent, spaceText, spaceTextMuted } from "styles/colors";
const green = "#08C225";
const dangerColor = "#F63A3A";
@@ -209,7 +209,7 @@ const ActionButton: React.FC<ActionButtonProps> = ({
bgcolor: green,
border: 0,
borderRadius: "20px",
- color: "#FFF",
+ color: spaceOnAccent,
cursor: disabled ? "default" : "pointer",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
diff --git a/web/apps/space/src/pages/_app.tsx b/web/apps/space/src/pages/_app.tsx
index a48cdf6130..0980a5189a 100644
--- a/web/apps/space/src/pages/_app.tsx
+++ b/web/apps/space/src/pages/_app.tsx
@@ -22,31 +22,77 @@ import {
spaceAppBackground,
spaceAppBackgroundColor,
spaceDialogBackground,
+ spaceSurface,
+ spaceSurfaceHover,
+ spaceText,
+ spaceTextMuted,
} from "styles/colors";
import "styles/globals.css";
-const spaceTheme = createTheme(shareTheme, {
- components: {
- MuiCssBaseline: {
- styleOverrides: {
- html: { backgroundColor: spaceAppBackgroundColor },
- body: { background: spaceAppBackground },
- "#__next": { minHeight: "100svh" },
+const darkPalette = shareTheme.colorSchemes.dark!.palette;
+
+const spaceTheme = createTheme(
+ {
+ cssVariables: { colorSchemeSelector: "class" },
+ colorSchemes: {
+ light: false,
+ dark: {
+ palette: {
+ ...darkPalette,
+ background: {
+ ...darkPalette.background,
+ default: spaceAppBackgroundColor,
+ paper: spaceDialogBackground,
+ paper2: spaceSurface,
+ elevatedPaper: spaceDialogBackground,
+ searchInput: spaceSurface,
+ },
+ primary: {
+ main: spaceSurfaceHover,
+ contrastText: spaceText,
+ },
+ text: {
+ ...darkPalette.text,
+ primary: spaceText,
+ secondary: spaceTextMuted,
+ base: spaceText,
+ muted: spaceTextMuted,
+ },
+ },
},
},
- MuiDialog: {
- styleOverrides: {
- paper: { backgroundColor: spaceDialogBackground },
- root: {
- ".MuiBackdrop-root": {
- backgroundColor:
- "var(--space-dialog-backdrop, rgba(0 0 0 / 0.48))",
+ defaultColorScheme: "dark",
+ typography: shareTheme.typography,
+ shape: shareTheme.shape,
+ transitions: shareTheme.transitions,
+ components: shareTheme.components,
+ },
+ {
+ components: {
+ MuiCssBaseline: {
+ styleOverrides: {
+ html: { backgroundColor: spaceAppBackgroundColor },
+ body: { background: spaceAppBackground },
+ "#__next": { minHeight: "100svh" },
+ },
+ },
+ MuiDialog: {
+ styleOverrides: {
+ paper: {
+ backgroundColor: spaceDialogBackground,
+ backgroundImage: "none",
+ },
+ root: {
+ ".MuiBackdrop-root": {
+ backgroundColor:
+ "var(--space-dialog-backdrop, rgba(0 0 0 / 0.48))",
+ },
},
},
},
},
},
-});
+);
const App: React.FC<AppProps> = ({ Component, pageProps }) => {
useSetupLogs({ disableDiskLogs: true });
@@ -63,21 +109,22 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
return (
<ThemeProvider
theme={spaceTheme}
- defaultMode="light"
+ defaultMode="dark"
storageManager={null}
>
<CustomHead
title="Ente Space"
viewportContent="width=device-width, initial-scale=1, maximum-scale=1"
>
- <meta name="color-scheme" content="only light" />
+ <meta name="color-scheme" content="dark" />
+ <meta name="theme-color" content={spaceAppBackgroundColor} />
<meta name="application-name" content="Ente Space" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-title" content="Ente Space" />
<meta
name="apple-mobile-web-app-status-bar-style"
- content="default"
+ content="black"
/>
<link
rel="manifest"
diff --git a/web/apps/space/src/pages/index.tsx b/web/apps/space/src/pages/index.tsx
index d32c593407..9903e12e60 100644
--- a/web/apps/space/src/pages/index.tsx
+++ b/web/apps/space/src/pages/index.tsx
@@ -549,10 +549,7 @@ export const Page: React.FC<PageProps> = ({ invitePreview }) => {
if (!publicIdentity && publicError) {
return (
<>
- <SpacePageMeta
- themeColor={spaceAppBackgroundColor}
- preview="invite"
- />
+ <SpacePageMeta themeColor="#FFFFFF" preview="invite" />
<PublicProfileUnavailable />
</>
);
@@ -640,7 +637,9 @@ export const Page: React.FC<PageProps> = ({ invitePreview }) => {
return (
<>
<SpacePageMeta
- themeColor={spaceAppBackgroundColor}
+ themeColor={
+ publicLink ? spaceAppBackgroundColor : "#FFFFFF"
+ }
preview="invite"
/>
{publicLink ? (
diff --git a/web/apps/space/src/screens/CreateAccountScreen.tsx b/web/apps/space/src/screens/CreateAccountScreen.tsx
index 6464ce86d9..c9e7ff3dcc 100644
--- a/web/apps/space/src/screens/CreateAccountScreen.tsx
+++ b/web/apps/space/src/screens/CreateAccountScreen.tsx
@@ -8,6 +8,7 @@ import {
import React, { useId, useMemo, useState } from "react";
import {
spaceAppBackground,
+ spaceOnAccent,
spaceSurface,
spaceText,
spaceTextMuted,
@@ -18,7 +19,7 @@ const green = "#08C225";
const textBase = spaceText;
const textLight = spaceTextMuted;
const warning = "#F63A3A";
-const caution = "#B65F00";
+const caution = "#E9A64D";
const createAccountFormID = "space-create-account-form";
const passwordStrengthLabels: Record<PasswordStrength, string> = {
@@ -528,7 +529,7 @@ export const CreateAccountScreen: React.FC<CreateAccountScreenProps> = ({
acceptedTerms ? green : textLight
}`,
borderRadius: "4px",
- color: "white",
+ color: spaceOnAccent,
display: "flex",
flexShrink: 0,
height: 16,
@@ -630,7 +631,7 @@ export const CreateAccountScreen: React.FC<CreateAccountScreenProps> = ({
border: 0,
borderRadius: "20px",
color: isCreateAccountButtonActive
- ? "white"
+ ? spaceOnAccent
: textLight,
cursor: canCreateAccount ? "pointer" : "default",
display: "flex",
diff --git a/web/apps/space/src/screens/EditProfilePhotoScreen.tsx b/web/apps/space/src/screens/EditProfilePhotoScreen.tsx
index 3e09aa68b3..0c9f992d80 100644
--- a/web/apps/space/src/screens/EditProfilePhotoScreen.tsx
+++ b/web/apps/space/src/screens/EditProfilePhotoScreen.tsx
@@ -6,7 +6,7 @@ import { SpaceLoadingSpinner } from "components/RouteFallback";
import log from "ente-base/log";
import React, { useEffect, useRef, useState } from "react";
import type { Area, Point } from "react-easy-crop";
-import { spaceAppBackground, spaceText } from "styles/colors";
+import { spaceAppBackground, spaceOnAccent, spaceText } from "styles/colors";
import { spaceTouchTargetSize } from "styles/touch-targets";
import {
prepareSpaceAvatarImageFromCrop,
@@ -325,7 +325,7 @@ export const EditProfilePhotoScreen: React.FC<EditProfilePhotoScreenProps> = ({
bgcolor: green,
border: 0,
borderRadius: "20px",
- color: "white",
+ color: spaceOnAccent,
cursor: "pointer",
display: "flex",
fontFamily:
diff --git a/web/apps/space/src/screens/FriendsScreen.tsx b/web/apps/space/src/screens/FriendsScreen.tsx
index 2cd50520ca..06043b8da6 100644
--- a/web/apps/space/src/screens/FriendsScreen.tsx
+++ b/web/apps/space/src/screens/FriendsScreen.tsx
@@ -36,6 +36,7 @@ import type { SpaceFriendRequest } from "services/space";
import {
spaceAppBackground,
spaceDialogBackground,
+ spaceOnAccent,
spaceSurface,
spaceSurfaceHover,
spaceText,
@@ -368,10 +369,12 @@ const FriendRow: React.FC<FriendRowProps> = ({
py: "4px",
whiteSpace: "nowrap",
"&.Mui-focusVisible": {
- bgcolor: "rgba(0, 0, 0, 0.04)",
+ bgcolor: "rgba(255, 255, 255, 0.08)",
},
- "&:active": { bgcolor: "rgba(0, 0, 0, 0.04)" },
- "&:hover": { bgcolor: "rgba(0, 0, 0, 0.04)" },
+ "&:active": {
+ bgcolor: "rgba(255, 255, 255, 0.08)",
+ },
+ "&:hover": { bgcolor: "rgba(255, 255, 255, 0.08)" },
}}
>
<HugeiconsIcon
@@ -405,10 +408,10 @@ const FriendRow: React.FC<FriendRowProps> = ({
py: "4px",
whiteSpace: "nowrap",
"&.Mui-focusVisible": {
- bgcolor: "rgba(246, 58, 58, 0.06)",
+ bgcolor: "rgba(246, 58, 58, 0.14)",
},
- "&:active": { bgcolor: "rgba(246, 58, 58, 0.06)" },
- "&:hover": { bgcolor: "rgba(246, 58, 58, 0.06)" },
+ "&:active": { bgcolor: "rgba(246, 58, 58, 0.14)" },
+ "&:hover": { bgcolor: "rgba(246, 58, 58, 0.14)" },
}}
>
<HugeiconsIcon
@@ -506,7 +509,7 @@ const FriendRequestRow: React.FC<FriendRequestRowProps> = ({
bgcolor: green,
border: 0,
borderRadius: "12px",
- color: "#FFFFFF",
+ color: spaceOnAccent,
cursor: isBusy ? "default" : "pointer",
display: "flex",
fontFamily:
@@ -905,7 +908,7 @@ const AddFriendSheet: React.FC<AddFriendSheetProps> = ({
bgcolor: green,
border: 0,
borderRadius: "20px",
- color: "#FFFFFF",
+ color: spaceOnAccent,
cursor: isSubmitting || isSent ? "default" : "pointer",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index 01e2d0afac..b74629c524 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -14,11 +14,7 @@ import {
type SpaceViewerPostActionMode,
} from "components/FileViewer";
import { FriendQuickActionsDialog } from "components/FriendQuickActionsDialog";
-import {
- SpaceHomeHeader,
- spaceHomeHeaderChromeColor,
- spaceHomeHeaderHeight,
-} from "components/HomeHeader";
+import { SpaceHomeHeader, spaceHomeHeaderHeight } from "components/HomeHeader";
import { SpacePostFloatingActionButton } from "components/PostFloatingActionButton";
import {
SpacePostBadge,
@@ -40,7 +36,14 @@ import {
type SpacePostAssetURLLoader,
type SpaceProfilePostPage,
} from "services/space";
-import { spaceAppBackground, spaceText, spaceTextMuted } from "styles/colors";
+import {
+ spaceAppBackground,
+ spaceOnAccent,
+ spaceSurface,
+ spaceSurfaceHover,
+ spaceText,
+ spaceTextMuted,
+} from "styles/colors";
import { firstNameFrom } from "utils/display";
import {
homeTileGridLayout,
@@ -62,9 +65,10 @@ import { thumbHashDataURLFromBase64 } from "utils/thumbhash";
const green = "#08C225";
const textBase = spaceText;
const textSecondary = spaceTextMuted;
-const avatarFallbackColor = "#888888";
+const avatarFallbackColor = spaceSurfaceHover;
const avatarFallbackTextColor = "#FFFFFF";
-const mediaPlaceholderColor = spaceHomeHeaderChromeColor;
+const mediaPlaceholderColor = spaceSurface;
+const tileBadgeBackground = "#343438";
const homeHorizontalPadding = "16px";
const postTileMediaLoadRootMargin = "640px 0px";
interface HomeScreenProps {
@@ -382,7 +386,7 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
const twoTileRequestUsernameTop =
twoTileRequestActionTop === undefined
? undefined
- : twoTileRequestActionTop - twoTileRequestUsernameGap;
+ : Math.max(28, twoTileRequestActionTop - twoTileRequestUsernameGap);
const hasMediaToLoad =
isAvatarPending || Boolean(post && !postUnavailable && !imageUrl);
@@ -619,8 +623,8 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
showFriendRequestDetails
) && (
<SpacePostBadge
- backgroundColor="rgba(255, 255, 255, 0.82)"
- color="#5A5A5A"
+ backgroundColor={tileBadgeBackground}
+ color={textBase}
placement="center"
>
{friendRequestDirection == "sent"
@@ -636,7 +640,7 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
component="span"
title={`@${friend.username}’s posts will appear here`}
sx={{
- bgcolor: "#FFFFFF",
+ bgcolor: tileBadgeBackground,
borderRadius: "999px",
boxSizing: "border-box",
color: textSecondary,
@@ -675,8 +679,8 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
)}
{!isLoading && postUnavailable && (
<SpacePostBadge
- backgroundColor="rgba(255, 255, 255, 0.82)"
- color={textSecondary}
+ backgroundColor={tileBadgeBackground}
+ color={textBase}
>
Unavailable
</SpacePostBadge>
@@ -759,25 +763,26 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
aria-hidden
title={`@${friend.username}`}
sx={{
- alignItems: "center",
- bgcolor: "#FFFFFF",
+ bgcolor: tileBadgeBackground,
borderRadius: "999px",
boxSizing: "border-box",
color: textBase,
- display: "inline-flex",
+ display: "block",
fontFamily: '"Nunito", sans-serif',
fontSize: requestUsernameTextSize,
fontWeight: 800,
height: showFriendRequestDetails ? undefined : 24,
- justifyContent: "center",
left: "50%",
- lineHeight: 1,
- maxWidth: "84%",
+ lineHeight: showFriendRequestDetails
+ ? "20px"
+ : "24px",
+ maxWidth: "88%",
overflow: "hidden",
position: "absolute",
- px: showFriendRequestDetails ? "11px" : "10px",
+ px: showFriendRequestDetails ? "11px" : "6px",
py: showFriendRequestDetails ? "6px" : 0,
textOverflow: "ellipsis",
+ textAlign: "center",
top: isTwoTileLayout
? twoTileRequestUsernameTop
: showFriendRequestDetails
@@ -841,7 +846,7 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
border: 0,
borderRadius: `${requestActionSize / 2}px`,
boxSizing: "border-box",
- color: "#FFFFFF",
+ color: spaceOnAccent,
cursor: isFriendRequestActionBusy
? "default"
: "pointer",
@@ -890,11 +895,11 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
}
sx={{
alignItems: "center",
- bgcolor: "#E8E8E8",
+ bgcolor: spaceSurfaceHover,
border: 0,
borderRadius: `${requestActionSize / 2}px`,
boxSizing: "border-box",
- color: "#5A5A5A",
+ color: textBase,
cursor: isFriendRequestActionBusy
? "default"
: "pointer",
@@ -914,7 +919,7 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
},
"&:hover": isFriendRequestActionBusy
? undefined
- : { bgcolor: "#DEDEDE" },
+ : { bgcolor: "#48484E" },
}}
>
{friendRequestAction == "discard" ? (
@@ -1841,10 +1846,9 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
>
{emptyFriendTileSize > 0 && (
<Box
- className="green-bg"
sx={{
alignItems: "flex-start",
- bgcolor: green,
+ bgcolor: spaceSurface,
border: 0,
borderRadius: "24px",
boxSizing: "border-box",
@@ -1914,7 +1918,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
<Box sx={{ mt: "24px" }}>
<SpaceShareInviteButton
profileLink={profileLink}
- variant="white"
+ variant="secondary"
onShareError={(error) =>
log.error(
"Failed to share Space invite link",
diff --git a/web/apps/space/src/screens/LoginScreen.tsx b/web/apps/space/src/screens/LoginScreen.tsx
index 17518e33d4..5a9fa57580 100644
--- a/web/apps/space/src/screens/LoginScreen.tsx
+++ b/web/apps/space/src/screens/LoginScreen.tsx
@@ -4,6 +4,7 @@ import { SpaceButtonSpinner } from "components/ButtonSpinner";
import React, { useEffect, useRef, useState } from "react";
import {
spaceAppBackground,
+ spaceOnAccent,
spaceSurface,
spaceText,
spaceTextMuted,
@@ -468,7 +469,9 @@ export const LoginScreen: React.FC<LoginScreenProps> = ({
: spaceSurface,
border: 0,
borderRadius: "20px",
- color: isContinueButtonActive ? "white" : textLight,
+ color: isContinueButtonActive
+ ? spaceOnAccent
+ : textLight,
cursor: canContinue ? "pointer" : "default",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
diff --git a/web/apps/space/src/screens/MessagesScreen.tsx b/web/apps/space/src/screens/MessagesScreen.tsx
index 3ec5c2a90b..fc1a294ba0 100644
--- a/web/apps/space/src/screens/MessagesScreen.tsx
+++ b/web/apps/space/src/screens/MessagesScreen.tsx
@@ -33,6 +33,7 @@ import {
spaceAppBackground,
spaceAppBackgroundColor,
spaceDialogBackground,
+ spaceOnAccent,
spaceSurface,
spaceSurfaceHover,
spaceText,
@@ -47,18 +48,16 @@ const green = "#08C225";
const textBase = spaceText;
const textSecondary = spaceTextMuted;
const conversationPrimaryText = spaceText;
-const lightSurface = spaceSurface;
-const lightSurfaceHover = spaceSurfaceHover;
-const composerSurface = lightSurface;
-const outgoingBubble = "#0DAF35";
-const incomingBubble = lightSurface;
+const composerSurface = spaceSurface;
+const outgoingBubble = "#176B2A";
+const incomingBubble = spaceSurface;
const outgoingMessageText = "#FFFFFF";
const incomingMessageText = spaceText;
-const outgoingQuoteBubble = "#9EDFAE";
+const outgoingQuoteBubble = "#124F21";
const incomingQuoteBubble = spaceSurfaceHover;
const incomingQuoteText = spaceTextMuted;
-const outgoingQuoteText = "#176B2A";
-const quoteRule = "#D6D6D6";
+const outgoingQuoteText = "#C7E8CE";
+const quoteRule = "#666666";
const dangerColor = "#F63A3A";
const composerHeight = 48;
const composerMaxHeight = 112;
@@ -584,7 +583,7 @@ const ConversationListItem: React.FC<{
bgcolor: dangerColor,
borderRadius: "8px",
boxShadow: `0 0 0 2px ${spaceAppBackgroundColor}`,
- color: "#FFFFFF",
+ color: spaceOnAccent,
display: "inline-flex",
flexShrink: 0,
fontFamily:
@@ -766,7 +765,7 @@ const ConversationListItem: React.FC<{
bgcolor: green,
border: 0,
borderRadius: "16px",
- color: "#FFFFFF",
+ color: spaceOnAccent,
cursor: "pointer",
fontFamily: '"Inter Variable", Inter, sans-serif',
fontSize: 12,
@@ -798,7 +797,7 @@ const ConversationListItem: React.FC<{
bgcolor: green,
border: 0,
borderRadius: "12px",
- color: "white",
+ color: spaceOnAccent,
cursor: "pointer",
fontFamily:
'"Inter Variable", Inter, sans-serif',
@@ -828,7 +827,7 @@ const ConversationListItem: React.FC<{
justifyContent: "center",
p: 0,
width: 34,
- "&:hover": { bgcolor: "#F1F1F1" },
+ "&:hover": { bgcolor: spaceSurfaceHover },
}}
>
<HugeiconsIcon
@@ -1072,14 +1071,14 @@ const MessageActionMenuItem: React.FC<{
py: "7px",
"&.Mui-focusVisible": {
bgcolor:
- tone == "danger" ? "rgba(246, 58, 58, 0.14)" : lightSurface,
+ tone == "danger" ? "rgba(246, 58, 58, 0.14)" : spaceSurface,
outline: 0,
},
"&:focus": { outline: 0 },
"&:focus-visible": { outline: 0 },
"&:hover": {
bgcolor:
- tone == "danger" ? "rgba(246, 58, 58, 0.14)" : lightSurface,
+ tone == "danger" ? "rgba(246, 58, 58, 0.14)" : spaceSurface,
},
}}
>
@@ -1162,7 +1161,7 @@ const FriendAddedSystemMessage: React.FC = () => (
<Box
sx={{
alignSelf: "center",
- bgcolor: lightSurface,
+ bgcolor: spaceSurface,
borderRadius: "999px",
color: textSecondary,
fontFamily: '"Inter Variable", Inter, sans-serif',
@@ -1618,7 +1617,7 @@ const MessageBubble: React.FC<{
"&:hover": {
bgcolor: isOwn
? outgoingBubble
- : lightSurfaceHover,
+ : spaceSurfaceHover,
},
}}
>
@@ -2790,11 +2789,11 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
alignItems: "center",
bgcolor: canSend
? green
- : lightSurface,
+ : spaceSurface,
border: 0,
borderRadius: "50%",
color: canSend
- ? "#FFFFFF"
+ ? spaceOnAccent
: "#BDBDBD",
cursor: canSend
? "pointer"
@@ -2819,7 +2818,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
"&:hover": {
bgcolor: canSend
? "#07AE22"
- : lightSurface,
+ : spaceSurface,
},
}}
>
diff --git a/web/apps/space/src/screens/PasskeyVerificationScreen.tsx b/web/apps/space/src/screens/PasskeyVerificationScreen.tsx
index f9f246a6ac..f196d074bd 100644
--- a/web/apps/space/src/screens/PasskeyVerificationScreen.tsx
+++ b/web/apps/space/src/screens/PasskeyVerificationScreen.tsx
@@ -2,12 +2,12 @@ import { Box } from "@mui/material";
import { SpaceBackIcon } from "components/BackIcon";
import { SpaceButtonSpinner } from "components/ButtonSpinner";
import React from "react";
-import { spaceAppBackground, spaceText } from "styles/colors";
+import { spaceAppBackground, spaceOnAccent, spaceText } from "styles/colors";
import { spaceTouchTargetSize } from "styles/touch-targets";
const green = "#08C225";
-const primaryLight = "#DDEEDF";
-const primaryDark = "#069D1E";
+const primarySurface = "#193C22";
+const primaryText = "#79DD8B";
const textBase = spaceText;
const warning = "#F63A3A";
@@ -228,7 +228,7 @@ export const PasskeyVerificationScreen: React.FC<
bgcolor: green,
border: 0,
borderRadius: "20px",
- color: "white",
+ color: spaceOnAccent,
cursor: "pointer",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
@@ -257,10 +257,10 @@ export const PasskeyVerificationScreen: React.FC<
onClick={onCheckStatus}
sx={{
alignItems: "center",
- bgcolor: primaryLight,
+ bgcolor: primarySurface,
border: 0,
borderRadius: "20px",
- color: primaryDark,
+ color: primaryText,
cursor: isChecking ? "default" : "pointer",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
diff --git a/web/apps/space/src/screens/ProfileImageViewerScreen.tsx b/web/apps/space/src/screens/ProfileImageViewerScreen.tsx
index fad1c8930f..68c3354063 100644
--- a/web/apps/space/src/screens/ProfileImageViewerScreen.tsx
+++ b/web/apps/space/src/screens/ProfileImageViewerScreen.tsx
@@ -5,7 +5,12 @@ import { spaceAppAvatarCropSize } from "components/AvatarCropPage";
import { SpaceAvatarImage } from "components/AvatarImage";
import React, { useEffect, useRef } from "react";
import type { SetupProfile } from "screens/SetupProfileScreen";
-import { spaceAppBackground, spaceSurface, spaceText } from "styles/colors";
+import {
+ spaceAppBackground,
+ spaceOnAccent,
+ spaceSurface,
+ spaceText,
+} from "styles/colors";
import { spaceTouchTargetSize } from "styles/touch-targets";
import {
spaceAvatarImageInputAccept,
@@ -347,7 +352,7 @@ export const ProfileImageViewerScreen: React.FC<
bgcolor: green,
border: 0,
borderRadius: "20px",
- color: "white",
+ color: spaceOnAccent,
cursor: "pointer",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsx
index 8f8e0f6bf9..da9f1c4607 100644
--- a/web/apps/space/src/screens/ProfileScreen.tsx
+++ b/web/apps/space/src/screens/ProfileScreen.tsx
@@ -41,6 +41,7 @@ import {
spaceAppBackgroundColor,
spaceDialogBackground,
spaceSurface,
+ spaceSurfaceHover,
spaceText,
spaceTextMuted,
} from "styles/colors";
@@ -62,7 +63,7 @@ const dangerColor = "#F63A3A";
const textBase = spaceText;
const textSoft = spaceTextMuted;
const coverForeground = "#FFFFFF";
-const profileIdentityColor = "#303030";
+const profileIdentityColor = spaceText;
const profileStatsColor = spaceTextMuted;
const profileStatsValueColor = spaceText;
const profileCoverBackground = "#1F1F1F";
@@ -283,10 +284,10 @@ const PublicProfileActionButton: React.FC<PublicProfileActionButtonProps> = ({
sx={{
alignItems: "center",
appearance: "none",
- bgcolor: "#FFF",
+ bgcolor: spaceSurface,
border: 0,
borderRadius: "14px",
- color: "#000",
+ color: spaceText,
cursor: disabled ? "default" : "pointer",
display: "flex",
flexShrink: 0,
@@ -298,7 +299,7 @@ const PublicProfileActionButton: React.FC<PublicProfileActionButtonProps> = ({
lineHeight: "18px",
px: "14px",
py: "8px",
- "&:hover": { bgcolor: disabled ? "#FFF" : "#F4F4F4" },
+ "&:hover": { bgcolor: disabled ? spaceSurface : spaceSurfaceHover },
"&:focus-visible": {
outline: `2px solid ${green}`,
outlineOffset: 2,
@@ -1722,15 +1723,15 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
whiteSpace: "nowrap",
"&.Mui-focusVisible": {
bgcolor:
- "rgba(246, 58, 58, 0.06)",
+ "rgba(246, 58, 58, 0.14)",
},
"&:active": {
bgcolor:
- "rgba(246, 58, 58, 0.06)",
+ "rgba(246, 58, 58, 0.14)",
},
"&:hover": {
bgcolor:
- "rgba(246, 58, 58, 0.06)",
+ "rgba(246, 58, 58, 0.14)",
},
}}
>
diff --git a/web/apps/space/src/screens/SettingsScreen.tsx b/web/apps/space/src/screens/SettingsScreen.tsx
index 148c53c2f7..06af17c37e 100644
--- a/web/apps/space/src/screens/SettingsScreen.tsx
+++ b/web/apps/space/src/screens/SettingsScreen.tsx
@@ -26,6 +26,7 @@ import { useSpaceWebPushPrompt } from "hooks/use-web-push-prompt";
import React from "react";
import {
spaceAppBackground,
+ spaceOnAccent,
spaceSurface,
spaceSurfaceHover,
spaceText,
@@ -35,8 +36,8 @@ import { spaceTouchTargetSize } from "styles/touch-targets";
const green = "#08C225";
const textBase = spaceText;
-const rowBackground = "#F7F7F7";
-const rowHover = "#F0F0F0";
+const rowBackground = spaceSurface;
+const rowHover = spaceSurfaceHover;
const dangerColor = "#F63A3A";
const iconMuted = spaceTextMuted;
const textLight = spaceTextMuted;
@@ -256,7 +257,7 @@ const SettingsRow: React.FC<SettingsRowProps> = ({
<Box
aria-hidden
sx={{
- bgcolor: toggleState ? green : "#D6D6D6",
+ bgcolor: toggleState ? green : spaceSurfaceHover,
borderRadius: "999px",
height: 24,
p: "2px",
@@ -829,7 +830,7 @@ export const ChangeNameSettingsScreen: React.FC<
bgcolor: green,
border: 0,
borderRadius: "20px",
- color: "white",
+ color: spaceOnAccent,
cursor: canSave ? "pointer" : "default",
display: "flex",
fontFamily:
diff --git a/web/apps/space/src/screens/SetupProfilePhotoScreen.tsx b/web/apps/space/src/screens/SetupProfilePhotoScreen.tsx
index c628efe42e..fbbed88672 100644
--- a/web/apps/space/src/screens/SetupProfilePhotoScreen.tsx
+++ b/web/apps/space/src/screens/SetupProfilePhotoScreen.tsx
@@ -12,6 +12,7 @@ import React, { useEffect, useRef, useState } from "react";
import type { Area, Point } from "react-easy-crop";
import {
spaceAppBackground,
+ spaceOnAccent,
spaceSurface,
spaceSurfaceHover,
spaceText,
@@ -380,7 +381,7 @@ export const SetupProfilePhotoScreen: React.FC<
bgcolor: green,
border: 0,
borderRadius: "20px",
- color: "white",
+ color: spaceOnAccent,
cursor: canAddPicture ? "pointer" : "default",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
diff --git a/web/apps/space/src/screens/SetupProfileScreen.tsx b/web/apps/space/src/screens/SetupProfileScreen.tsx
index 9254752148..2aadab4f00 100644
--- a/web/apps/space/src/screens/SetupProfileScreen.tsx
+++ b/web/apps/space/src/screens/SetupProfileScreen.tsx
@@ -3,6 +3,7 @@ import { SpaceBackIcon } from "components/BackIcon";
import React, { useState } from "react";
import {
spaceAppBackground,
+ spaceOnAccent,
spaceSurface,
spaceText,
spaceTextMuted,
@@ -382,7 +383,7 @@ export const SetupProfileScreen: React.FC<SetupProfileScreenProps> = ({
bgcolor: canContinue ? green : spaceSurface,
border: 0,
borderRadius: "20px",
- color: canContinue ? "white" : textLight,
+ color: canContinue ? spaceOnAccent : textLight,
cursor: canContinue ? "pointer" : "default",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
diff --git a/web/apps/space/src/screens/VerifyEmailScreen.tsx b/web/apps/space/src/screens/VerifyEmailScreen.tsx
index 2bd95f6931..6ac03d865d 100644
--- a/web/apps/space/src/screens/VerifyEmailScreen.tsx
+++ b/web/apps/space/src/screens/VerifyEmailScreen.tsx
@@ -5,6 +5,7 @@ import { SpaceOtpInput } from "components/OtpInput";
import React, { useEffect, useRef, useState } from "react";
import {
spaceAppBackground,
+ spaceOnAccent,
spaceSurface,
spaceText,
spaceTextMuted,
@@ -358,7 +359,9 @@ export const VerifyEmailScreen: React.FC<VerifyEmailScreenProps> = ({
: spaceSurface,
border: 0,
borderRadius: "20px",
- color: isVerifyButtonActive ? "white" : textLight,
+ color: isVerifyButtonActive
+ ? spaceOnAccent
+ : textLight,
cursor: canVerify ? "pointer" : "default",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
diff --git a/web/apps/space/src/screens/VerifyTwoFactorScreen.tsx b/web/apps/space/src/screens/VerifyTwoFactorScreen.tsx
index 917ec9df86..be545e1f6e 100644
--- a/web/apps/space/src/screens/VerifyTwoFactorScreen.tsx
+++ b/web/apps/space/src/screens/VerifyTwoFactorScreen.tsx
@@ -7,6 +7,7 @@ import { SpaceOtpInput } from "components/OtpInput";
import React, { useEffect, useRef, useState } from "react";
import {
spaceAppBackground,
+ spaceOnAccent,
spaceSurface,
spaceText,
spaceTextMuted,
@@ -264,7 +265,9 @@ export const VerifyTwoFactorScreen: React.FC<VerifyTwoFactorScreenProps> = ({
: spaceSurface,
border: 0,
borderRadius: "20px",
- color: isVerifyButtonActive ? "white" : textLight,
+ color: isVerifyButtonActive
+ ? spaceOnAccent
+ : textLight,
cursor: canVerify ? "pointer" : "default",
display: "flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
diff --git a/web/apps/space/src/styles/buttons.ts b/web/apps/space/src/styles/buttons.ts
index 558dbe5f2e..98f5715f66 100644
--- a/web/apps/space/src/styles/buttons.ts
+++ b/web/apps/space/src/styles/buttons.ts
@@ -1,3 +1,4 @@
+import { spaceOnAccent } from "styles/colors";
import { spaceTouchTargetSize } from "styles/touch-targets";
const green = "#08C225";
@@ -9,7 +10,7 @@ export const spaceEmptyStateButtonSx = {
border: 0,
borderRadius: "18px",
boxSizing: "border-box",
- color: "#FFF",
+ color: spaceOnAccent,
cursor: "pointer",
display: "inline-flex",
fontFamily: '"Inter Variable", Inter, sans-serif',
diff --git a/web/apps/space/src/styles/colors.ts b/web/apps/space/src/styles/colors.ts
index 005dd1c56d..53490e995e 100644
--- a/web/apps/space/src/styles/colors.ts
+++ b/web/apps/space/src/styles/colors.ts
@@ -1,9 +1,10 @@
-export const spaceAppBackgroundColor = "#FFFFFF";
+export const spaceAppBackgroundColor = "#1C1C1E";
export const spaceAppBackground = spaceAppBackgroundColor;
-export const spaceDialogBackground = "#FFFFFF";
-export const spaceSurface = "#F2F2F2";
-export const spaceSurfaceHover = "#E8E8E8";
-export const spaceText = "#000000";
-export const spaceTextMuted = "#777777";
+export const spaceDialogBackground = "#323236";
+export const spaceSurface = "#28282B";
+export const spaceSurfaceHover = "#3A3A3F";
+export const spaceText = "#F2F2F4";
+export const spaceTextMuted = "#B0B0B8";
+export const spaceOnAccent = "#FFFFFF";