YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: update checkbox source

Browse Source
This commit is contained in:
Steven
2024-10-27 10:19:06 +08:00
parent 963706aebd
commit f373d8e88c
11 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/package.json
View File

@ -19,7 +19,7 @@
"@mui/joy": "5.0.0-beta.48",
"@radix-ui/react-popover": "^1.1.2",
"@reduxjs/toolkit": "^2.3.0",
"@usememos/mui": "0.0.1-alpha.10",
"@usememos/mui": "0.0.1-alpha.14",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"copy-to-clipboard": "^3.3.3",

10
web/pnpm-lock.yaml generated
View File

@ -39,8 +39,8 @@ importers:
specifier: ^2.3.0
version: 2.3.0(react-redux@9.1.2(@types/react@18.3.12)(react@18.3.1)(redux@5.0.1))(react@18.3.1)
'@usememos/mui':
specifier: 0.0.1-alpha.10
version: 0.0.1-alpha.10(lucide-react@0.453.0(react@18.3.1))(postcss@8.4.47)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwind-merge@2.5.4)(tailwindcss@3.4.14)
specifier: 0.0.1-alpha.14
version: 0.0.1-alpha.14(lucide-react@0.453.0(react@18.3.1))(postcss@8.4.47)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwind-merge@2.5.4)(tailwindcss@3.4.14)
class-variance-authority:
specifier: ^0.7.0
version: 0.7.0
@ -1409,8 +1409,8 @@ packages:
'@ungap/structured-clone@1.2.0':
resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
'@usememos/mui@0.0.1-alpha.10':
resolution: {integrity: sha512-jyEQ4sgmYCxOWEyuUat7MqQN7Gy4PohQxnLvIje0upqu2zT2AaI0GhOPs/t2HkYK09tFXLAVnhp2I+6jBBhfIg==}
'@usememos/mui@0.0.1-alpha.14':
resolution: {integrity: sha512-KzLIWkTPVisukxfa6j9LtCmlJpO3QxOe9JFwUDV6AkIqw4QKkVK6Rl+DZu8N9uKSoAiNbg6gbu9vj+Ox3crmug==}
peerDependencies:
lucide-react: ^0.453.0
postcss: ^8.4.47
@ -4642,7 +4642,7 @@ snapshots:
'@ungap/structured-clone@1.2.0': {}
'@usememos/mui@0.0.1-alpha.10(lucide-react@0.453.0(react@18.3.1))(postcss@8.4.47)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwind-merge@2.5.4)(tailwindcss@3.4.14)':
'@usememos/mui@0.0.1-alpha.14(lucide-react@0.453.0(react@18.3.1))(postcss@8.4.47)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwind-merge@2.5.4)(tailwindcss@3.4.14)':
dependencies:
lucide-react: 0.453.0(react@18.3.1)
postcss: 8.4.47

2
web/src/components/MemoContent/TaskListItem.tsx
View File

@ -1,4 +1,4 @@
import { Checkbox } from "@mui/joy";
import { Checkbox } from "@usememos/mui";
import clsx from "clsx";
import { useContext, useState } from "react";
import { markdownServiceClient } from "@/grpcweb";

6
web/src/components/MemoEditor/ActionButton/AddMemoRelationPopover.tsx
View File

@ -1,5 +1,5 @@
import { Autocomplete, AutocompleteOption, Checkbox, Chip } from "@mui/joy";
import { Button } from "@usememos/mui";
import { Autocomplete, AutocompleteOption, Chip } from "@mui/joy";
import { Button, Checkbox } from "@usememos/mui";
import { uniqBy } from "lodash-es";
import { LinkIcon } from "lucide-react";
import React, { useContext, useState } from "react";
@ -130,7 +130,7 @@ const AddMemoRelationPopover = (props: Props) => {
return (
<Popover open={popoverOpen} onOpenChange={setPopoverOpen}>
<PopoverTrigger>
<Button className="px-2" variant="plain">
<Button size="sm" variant="plain">
<LinkIcon className="w-5 h-5 mx-auto" />
</Button>
</PopoverTrigger>

2
web/src/components/MemoEditor/ActionButton/LocationSelector.tsx
View File

@ -95,7 +95,7 @@ const LocationSelector = (props: Props) => {
return (
<Popover open={popoverOpen} onOpenChange={setPopoverOpen}>
<PopoverTrigger>
<Button className="group px-2" variant="plain">
<Button className="group" size="sm" variant="plain">
<MapPinIcon className="w-5 h-5 mx-auto shrink-0" />
{props.location && (
<>

1
web/src/components/MemoEditor/ActionButton/MarkdownMenu.tsx
View File

@ -65,7 +65,6 @@ const MarkdownMenu = (props: Props) => {
root: {
size: "sm",
variant: "plain",
className: "px-2",
},
}}
>

1
web/src/components/MemoEditor/ActionButton/TagSelector.tsx
View File

@ -47,7 +47,6 @@ const TagSelector = (props: Props) => {
root: {
size: "sm",
variant: "plain",
className: "px-2",
},
}}
>

2
web/src/components/MemoEditor/ActionButton/UploadResourceButton.tsx
View File

@ -66,7 +66,7 @@ const UploadResourceButton = () => {
};
return (
<Button className="px-2 relative" size="sm" variant="plain" disabled={state.uploadingFlag}>
<Button className="relative" size="sm" variant="plain" disabled={state.uploadingFlag}>
<PaperclipIcon className="w-5 h-5 mx-auto" />
<input
className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"

4
web/src/components/MemoEditor/index.tsx
View File

@ -465,7 +465,9 @@ const MemoEditor = (props: Props) => {
<div className="w-full flex flex-row justify-between items-center py-3 dark:border-t-zinc-500">
<div className="relative flex flex-row justify-start items-center" onFocus={(e) => e.stopPropagation()}>
<Select
className="!text-sm"
variant="plain"
size="md"
value={state.memoVisibility}
startDecorator={<VisibilityIcon visibility={state.memoVisibility} />}
onChange={(_, visibility) => {
@ -475,7 +477,7 @@ const MemoEditor = (props: Props) => {
}}
>
{[Visibility.PRIVATE, Visibility.PROTECTED, Visibility.PUBLIC].map((item) => (
<Option key={item} value={item} className="whitespace-nowrap">
<Option key={item} value={item} className="whitespace-nowrap !text-sm">
{t(`memo.visibility.${convertVisibilityToString(item).toLowerCase()}` as any)}
</Option>
))}

11
web/src/components/PasswordSignInForm.tsx
View File

@ -1,5 +1,5 @@
import { Checkbox, Input } from "@mui/joy";
import { Button } from "@usememos/mui";
import { Input } from "@mui/joy";
import { Button, Checkbox } from "@usememos/mui";
import { LoaderIcon } from "lucide-react";
import { ClientError } from "nice-grpc-web";
import { useEffect, useState } from "react";
@ -101,12 +101,7 @@ const PasswordSignInForm = () => {
</div>
</div>
<div className="flex flex-row justify-start items-center w-full mt-6">
<Checkbox
className="dark:!text-gray-400"
label={t("common.remember-me")}
checked={remember}
onChange={(e) => setRemember(e.target.checked)}
/>
<Checkbox label={t("common.remember-me")} checked={remember} onChange={(e) => setRemember(e.target.checked)} />
</div>
<div className="flex flex-row justify-end items-center w-full mt-6">
<Button

1
web/src/pages/SignIn.tsx
View File

@ -97,7 +97,6 @@ const SignIn = () => {
{identityProviderList.map((identityProvider) => (
<Button
key={identityProvider.name}
color="primary"
variant="outlined"
fullWidth
onClick={() => handleSignInWithIdentityProvider(identityProvider)}