Skip to content

armgit / ente

Public Imported from GitHub
0

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

[web] Simplify unlock cards and use Share accent

AswinAsok50865d39c3ac
diff --git a/web/apps/albums/src/public-album/access/components/PasswordUnlockScreen.tsx b/web/apps/albums/src/public-album/access/components/PasswordUnlockScreen.tsx
index 66b8b957b7..2234399fc4 100644
--- a/web/apps/albums/src/public-album/access/components/PasswordUnlockScreen.tsx
+++ b/web/apps/albums/src/public-album/access/components/PasswordUnlockScreen.tsx
@@ -2,7 +2,6 @@ import {
PublicAccessLayout,
PublicAccessLayoutTitle,
} from "@/public-album/access/components/PublicAccessLayout";
-import { Typography } from "@mui/material";
import {
SingleInputForm,
type SingleInputFormProps,
@@ -18,9 +17,6 @@ export const PasswordUnlockScreen: React.FC<PasswordUnlockScreenProps> = ({
}) => (
<PublicAccessLayout>
<PublicAccessLayoutTitle>{t("password")}</PublicAccessLayoutTitle>
- <Typography sx={{ color: "text.muted" }}>
- {t("link_password_description")}
- </Typography>
<SingleInputForm
inputType="password"
label={t("password")}
diff --git a/web/apps/embed/src/components/EmbedPasswordForm.tsx b/web/apps/embed/src/components/EmbedPasswordForm.tsx
index 5655d45968..0a0ef63c12 100644
--- a/web/apps/embed/src/components/EmbedPasswordForm.tsx
+++ b/web/apps/embed/src/components/EmbedPasswordForm.tsx
@@ -35,9 +35,6 @@ export const EmbedPasswordForm: React.FC<EmbedPasswordFormProps> = ({
return (
<AccountsPageContents paperSx={singleInputPagePaperSx}>
<Typography sx={v2TitleSx}>{t("password")}</Typography>
- <Typography sx={{ color: "text.muted" }}>
- {t("link_password_description")}
- </Typography>
<SingleInputForm
autoFocus={false}
inputType="password"
diff --git a/web/apps/share/src/components/file-share/CollectionShareView.tsx b/web/apps/share/src/components/file-share/CollectionShareView.tsx
index 4dec7644f7..84933382f9 100644
--- a/web/apps/share/src/components/file-share/CollectionShareView.tsx
+++ b/web/apps/share/src/components/file-share/CollectionShareView.tsx
@@ -62,13 +62,12 @@ const passwordCardSx = {
border: "1px solid",
borderColor: "divider",
color: "text.base",
- "& .MuiFormLabel-root.Mui-focused": { color: "accent.light" },
- "& .MuiButton-root": {
+ "& button[type='submit']": {
backgroundColor: "accent.main",
color: "accent.contrastText",
},
- "& .MuiButton-root:hover": { backgroundColor: "accent.dark" },
- "& .MuiButton-root.Mui-disabled": {
+ "& button[type='submit']:hover": { backgroundColor: "accent.dark" },
+ "& button[type='submit'].Mui-disabled": {
backgroundColor: "accent.main",
color: "accent.contrastText",
opacity: 0.7,
@@ -93,10 +92,6 @@ export const CollectionShareView: React.FC = () => {
handleCopyContent,
} = useCollectionShare();
const passwordTitle = translatedOrFallback("password", "Password");
- const passwordDescription = translatedOrFallback(
- "link_password_description",
- "Enter the password to unlock this collection.",
- );
const unlockLabel = translatedOrFallback("unlock", "Unlock");
return (
@@ -166,16 +161,9 @@ export const CollectionShareView: React.FC = () => {
>
{passwordTitle}
</Typography>
- <Typography
- variant="body"
- sx={{ color: "text.muted", mb: 2 }}
- >
- {passwordDescription}
- </Typography>
<SingleInputForm
inputType="password"
label={passwordTitle}
-
submitButtonTitle={unlockLabel}
onSubmit={handleSubmitPassword}
/>
diff --git a/web/packages/base/components/SingleInput.styles.ts b/web/packages/base/components/SingleInput.styles.ts
index 8a7706e005..e8b89af18c 100644
--- a/web/packages/base/components/SingleInput.styles.ts
+++ b/web/packages/base/components/SingleInput.styles.ts
@@ -23,6 +23,7 @@ export const singleInputPagePaperSx = ((theme: Theme) => ({
...v2PaperSx(theme),
boxSizing: "border-box",
p: "20px",
+ [theme.breakpoints.up("sm")]: { padding: "20px" },
minHeight: "auto",
display: "flex",
flexDirection: "column",