diff --git a/web/src/components/ArchivedMemo.tsx b/web/src/components/ArchivedMemo.tsx index 22036791..addc2ede 100644 --- a/web/src/components/ArchivedMemo.tsx +++ b/web/src/components/ArchivedMemo.tsx @@ -57,10 +57,10 @@ const ArchivedMemo: React.FC = (props: Props) => { {t("common.archived-at")} {utils.getDateTimeString(memo.updatedTs)}
- + {t("common.restore")} - + {t("common.delete")} {showConfirmDeleteBtn ? "!" : ""} diff --git a/web/src/components/ChangeMemoCreatedTsDialog.tsx b/web/src/components/ChangeMemoCreatedTsDialog.tsx index 8cf30039..b43e5de1 100644 --- a/web/src/components/ChangeMemoCreatedTsDialog.tsx +++ b/web/src/components/ChangeMemoCreatedTsDialog.tsx @@ -72,14 +72,18 @@ const ChangeMemoCreatedTsDialog: React.FC = (props: Props) => {

THIS IS NOT A NORMAL BEHAVIOR. PLEASE MAKE SURE YOU REALLY NEED IT.

- +
- + {t("common.cancel")} - + {t("common.save")}
diff --git a/web/src/components/ChangeResourceFilenameDialog.tsx b/web/src/components/ChangeResourceFilenameDialog.tsx index 06f82900..f1c5dad2 100644 --- a/web/src/components/ChangeResourceFilenameDialog.tsx +++ b/web/src/components/ChangeResourceFilenameDialog.tsx @@ -68,16 +68,14 @@ const ChangeResourceFilenameDialog: React.FC = (props: Props) => {
- +
- + +
diff --git a/web/src/components/CreateShortcutDialog.tsx b/web/src/components/CreateShortcutDialog.tsx index 21223258..89528390 100644 --- a/web/src/components/CreateShortcutDialog.tsx +++ b/web/src/components/CreateShortcutDialog.tsx @@ -1,14 +1,14 @@ +import dayjs from "dayjs"; import { useCallback, useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { memoService, shortcutService } from "../services"; -import { checkShouldShowMemoWithFilters, filterConsts, getDefaultFilter, relationConsts } from "../helpers/filter"; +import { filterConsts, getDefaultFilter, relationConsts } from "../helpers/filter"; import useLoading from "../hooks/useLoading"; import Icon from "./Icon"; import { generateDialog } from "./Dialog"; import toastHelper from "./Toast"; import Selector from "./common/Selector"; import "../less/create-shortcut-dialog.less"; -import dayjs from "dayjs"; interface Props extends DialogProps { shortcutId?: ShortcutId; @@ -21,10 +21,6 @@ const CreateShortcutDialog: React.FC = (props: Props) => { const requestState = useLoading(false); const { t } = useTranslation(); - const shownMemoLength = memoService.getState().memos.filter((memo) => { - return checkShouldShowMemoWithFilters(memo, filters); - }).length; - useEffect(() => { if (shortcutId) { const shortcutTemp = shortcutService.getShortcutById(shortcutId); @@ -146,10 +142,7 @@ const CreateShortcutDialog: React.FC = (props: Props) => {
- - {shownMemoLength} {t("shortcut-list.eligible-memo")} - -
diff --git a/web/src/components/DailyMemo.tsx b/web/src/components/DailyMemo.tsx index 00125945..38d1c7a7 100644 --- a/web/src/components/DailyMemo.tsx +++ b/web/src/components/DailyMemo.tsx @@ -21,7 +21,7 @@ const DailyMemo: React.FC = (props: Props) => {
- +
diff --git a/web/src/components/Settings/MyAccountSection.tsx b/web/src/components/Settings/MyAccountSection.tsx index 4955a464..20c6bf7f 100644 --- a/web/src/components/Settings/MyAccountSection.tsx +++ b/web/src/components/Settings/MyAccountSection.tsx @@ -35,10 +35,10 @@ const MyAccountSection = () => {
{user.email}
- -
@@ -46,7 +46,7 @@ const MyAccountSection = () => {

Open API

{openAPIRoute}

- + {t("common.reset")} API
diff --git a/web/src/components/UpdateAccountDialog.tsx b/web/src/components/UpdateAccountDialog.tsx index bee6de71..4f124b35 100644 --- a/web/src/components/UpdateAccountDialog.tsx +++ b/web/src/components/UpdateAccountDialog.tsx @@ -87,11 +87,18 @@ const UpdateAccountDialog: React.FC = ({ destroy }: Props) => {
-

Nickname

+

+ Nickname(Display in the banner) +

-

Username

+

+ Username + (Using to sign in) +

-

Email

+

+ Email(Optional) +

diff --git a/web/src/css/tailwind.css b/web/src/css/tailwind.css index b80f077f..9bf98bb2 100644 --- a/web/src/css/tailwind.css +++ b/web/src/css/tailwind.css @@ -14,12 +14,20 @@ } } +.btn-normal { + @apply select-none inline-flex border cursor-pointer px-3 text-sm leading-8 rounded-md hover:opacity-80 hover:shadow; +} + .btn-primary { - @apply select-none inline-flex border border-transparent cursor-pointer px-3 bg-green-600 text-sm leading-8 text-white rounded-md hover:opacity-80; + @apply btn-normal border-transparent bg-green-600 text-white; +} + +.btn-danger { + @apply btn-normal border-red-600 bg-red-50 text-red-600; } .btn-text { - @apply select-none inline-flex border border-transparent cursor-pointer px-2 text-sm text-gray-600 leading-8 hover:opacity-80; + @apply btn-normal text-gray-600 border-none hover:shadow-none; } .input-text { diff --git a/web/src/less/change-memo-created-ts-dialog.less b/web/src/less/change-memo-created-ts-dialog.less index a0424a21..162a543f 100644 --- a/web/src/less/change-memo-created-ts-dialog.less +++ b/web/src/less/change-memo-created-ts-dialog.less @@ -9,36 +9,8 @@ @apply bg-gray-400 text-xs p-2 rounded-lg; } - > .form-label { - @apply flex flex-col justify-start items-start relative w-full leading-relaxed; - - &.input-form-label { - @apply py-3 pb-1; - - > input { - @apply w-full p-2 text-sm leading-6 rounded border border-gray-400 bg-transparent; - } - } - } - > .btns-container { @apply flex flex-row justify-end items-center mt-2 w-full; - - > .btn { - @apply text-sm px-4 py-2 rounded ml-2 bg-gray-400; - - &:hover { - @apply opacity-80; - } - - &.confirm-btn { - @apply bg-green-600 text-white shadow-inner; - } - - &.cancel-btn { - background-color: unset; - } - } } } } diff --git a/web/src/less/change-resource-filename-dialog.less b/web/src/less/change-resource-filename-dialog.less index aedcb36f..56c3d1eb 100644 --- a/web/src/less/change-resource-filename-dialog.less +++ b/web/src/less/change-resource-filename-dialog.less @@ -5,40 +5,8 @@ > .dialog-content-container { @apply flex flex-col justify-start items-start; - > .tip-text { - @apply bg-gray-400 text-xs p-2 rounded-lg; - } - - > .form-label { - @apply flex flex-col justify-start items-start relative w-full leading-relaxed; - - &.input-form-label { - @apply py-3 pb-1; - - > input { - @apply w-full p-2 text-sm leading-6 rounded border border-gray-400 bg-transparent; - } - } - } - > .btns-container { @apply flex flex-row justify-end items-center mt-2 w-full; - - > .btn { - @apply text-sm px-4 py-2 rounded ml-2 bg-gray-400; - - &:hover { - @apply opacity-80; - } - - &.confirm-btn { - @apply bg-green-600 text-white shadow-inner; - } - - &.cancel-btn { - background-color: unset; - } - } } } } diff --git a/web/src/less/settings/my-account-section.less b/web/src/less/settings/my-account-section.less index 5d6a25e8..2f0d701b 100644 --- a/web/src/less/settings/my-account-section.less +++ b/web/src/less/settings/my-account-section.less @@ -3,10 +3,6 @@ @apply w-full font-mono text-sm shadow-inner border py-2 px-3 rounded leading-6 break-all whitespace-pre-wrap; } - > .reset-btn { - @apply mt-2 py-1 px-2 text-sm shadow bg-red-50 border border-red-500 text-red-600 rounded cursor-pointer select-none hover:opacity-80; - } - > .usage-guide-container { @apply flex flex-col justify-start items-start mt-2 w-full;