Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(web): quiet the editor chrome and cool the workspace palette

tianma-if297af42bb152
diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsx
index 548651a6..0796c270 100644
--- a/apps/web/src/components/EditorPane.tsx
+++ b/apps/web/src/components/EditorPane.tsx
@@ -1,4 +1,4 @@
-import { useRef, useState, useEffect, useCallback, useMemo, lazy, Suspense, type CSSProperties, type FocusEvent as ReactFocusEvent, type MouseEvent as ReactMouseEvent, type ReactNode } from "react";
+import { useRef, useState, useEffect, useLayoutEffect, useCallback, useMemo, lazy, Suspense, type CSSProperties, type FocusEvent as ReactFocusEvent, type MouseEvent as ReactMouseEvent, type ReactNode } from "react";
import { useQuery, useQueryClient, useMutation } from "@tanstack/react-query";
import { useEditor, EditorContent, type Editor } from "@tiptap/react";
import { BubbleMenu } from "@tiptap/react/menus";
@@ -37,6 +37,7 @@ import { MemoEditorMetadataRow } from "@/components/MemoEditorMetadataRow";
import { MemoEditorFocusModeButton, MemoEditorTopRowLeading, MemoEditorUpdatedLabel } from "@/components/MemoEditorTopRowLeading";
import { MemoEditorToolbarDivider } from "@/components/MemoEditorToolbarChrome";
import {
+ MEMO_EDITOR_READING_GUTTER_CLASS_NAME,
MEMO_EDITOR_TITLE_REGION_CLASS_NAME,
MEMO_EDITOR_TOP_ROW_CLASS_NAME,
} from "@/components/MemoEditorChromeDensity";
@@ -112,7 +113,7 @@ import { api } from "@/lib/api";
import { isDesktopResourceRuntime, stageDesktopResource, toDesktopResourceDownloadUrl, toDesktopResourceUrl } from "@/lib/desktop-resources";
import { contentReferencesStagedResourceUrl, findMatchingMemoResource, repairMemoStagedResourceUrls, repairTiptapStagedResourceUrls } from "@/lib/staged-resource-repair";
import { cn, formatDateTime, parseTagsText } from "@/lib/utils";
-import { EDITOR_CONTENT_MAX_WIDTH, EDITOR_CONTENT_MAX_WIDTH_COLLAPSED } from "@/lib/workspace-ui";
+import { EDITOR_CONTENT_MAX_WIDTH, EDITOR_CONTENT_MAX_WIDTH_COLLAPSED, EDITOR_OUTLINE_WIDTH } from "@/lib/workspace-ui";
import {
countMemoCharacters,
createEdgeEverDocumentExtensions,
@@ -523,6 +524,19 @@ const RichEditorPane = ({
enabled: noteLinkPickerOpen,
});
const [editorScrollContainer, setEditorScrollContainer] = useState<HTMLDivElement | null>(null);
+ const [editorScrollbarGutter, setEditorScrollbarGutter] = useState(0);
+ useLayoutEffect(() => {
+ const element = editorScrollContainer;
+ if (!element) return;
+ const measure = () => {
+ const reserved = element.offsetWidth - element.clientWidth;
+ setEditorScrollbarGutter(reserved > 1 ? reserved / 2 : 0);
+ };
+ measure();
+ const observer = new ResizeObserver(measure);
+ observer.observe(element);
+ return () => observer.disconnect();
+ }, [editorScrollContainer]);
const setEditorScrollContainerRef = useCallback((element: HTMLDivElement | null) => {
editorScrollContainerRef.current = element;
setEditorScrollContainer(element);
@@ -1274,7 +1288,8 @@ const RichEditorPane = ({
} = useEditorMarkdownMode({
editor,
editorScrollContainerRef,
- effectiveReadOnly,
+ // Reading protection is a view, so it must not block switching back to rich text or Markdown.
+ effectiveReadOnly: readOnly || (isMobileViewport && !mobileEditingActive),
getMemoId: () => memoRef.current?.id,
hydratingRef,
});
@@ -2902,8 +2917,9 @@ const RichEditorPane = ({
if (handledReadingProtectionToggleTokenRef.current === readingProtectionToggleToken) return;
handledReadingProtectionToggleTokenRef.current = readingProtectionToggleToken;
if (editorShortcutBlocked || isMobileViewport || readOnly || !memoRef.current) return;
+ if (isMarkdownMode) handleMarkdownModeChange();
toggleDesktopReadingProtection();
- }, [editorShortcutBlocked, isMobileViewport, readOnly, readingProtectionToggleToken, toggleDesktopReadingProtection]);
+ }, [editorShortcutBlocked, handleMarkdownModeChange, isMarkdownMode, isMobileViewport, readOnly, readingProtectionToggleToken, toggleDesktopReadingProtection]);
useEffect(() => {
if (handledEditorModeToggleTokenRef.current === editorModeToggleToken) {
@@ -2915,8 +2931,35 @@ const RichEditorPane = ({
return;
}
+ if (desktopReadingProtection) {
+ setDesktopReadingProtection(false);
+ writeDesktopReadingProtectionPreference(false);
+ }
handleMarkdownModeChange();
- }, [editorModeToggleToken, editorShortcutBlocked, handleMarkdownModeChange, useMobilePlainTextEditor]);
+ }, [desktopReadingProtection, editorModeToggleToken, editorShortcutBlocked, handleMarkdownModeChange, useMobilePlainTextEditor]);
+
+ const editorView = !isMobileViewport && desktopReadingProtection
+ ? "reading"
+ : useMarkdownSourceEditor
+ ? "markdown"
+ : "rich";
+ const selectEditorView = useCallback((view: "rich" | "markdown" | "reading") => {
+ if (view === "reading") {
+ if (isMarkdownMode) handleMarkdownModeChange();
+ if (!desktopReadingProtection) {
+ setDesktopReadingProtection(true);
+ writeDesktopReadingProtectionPreference(true);
+ }
+ return;
+ }
+
+ if (desktopReadingProtection) {
+ setDesktopReadingProtection(false);
+ writeDesktopReadingProtectionPreference(false);
+ }
+ if (view === "markdown" && !isMarkdownMode) handleMarkdownModeChange();
+ if (view === "rich" && isMarkdownMode) handleMarkdownModeChange();
+ }, [desktopReadingProtection, handleMarkdownModeChange, isMarkdownMode]);
useEffect(() => {
if (handledOutlineToggleTokenRef.current === outlineToggleToken) {
@@ -3481,8 +3524,23 @@ const RichEditorPane = ({
deleteDescription: t("editor.attachmentActions.deleteDescription"),
};
+ const editorColumnMatchesArticle = !useMarkdownSourceEditor;
+ const editorColumnStyle: CSSProperties | undefined = editorColumnMatchesArticle && !desktopFocusMode && editorContentAlignment === "center"
+ ? {
+ maxWidth: editorOutlineCollapsed
+ ? EDITOR_CONTENT_MAX_WIDTH_COLLAPSED
+ : EDITOR_CONTENT_MAX_WIDTH,
+ }
+ : undefined;
+ const savedQuietly = saveState !== "saving"
+ && saveState !== "error"
+ && saveState !== "conflict"
+ && saveState !== "queued"
+ && !hasUnsavedChanges;
+ const saveStatusLabel = `${saveLabel} · ${t("editor.characterCount", { count: characterCount })}`;
+
return (
- <div className="relative flex h-full min-w-0 flex-col bg-card">
+ <div className="relative flex h-full min-w-0 flex-col bg-transparent">
{selectionActionBar}
<ExternalLinkDialog
open={externalLinkDialogOpen}
@@ -3533,8 +3591,26 @@ const RichEditorPane = ({
onInsert={insertMemoLink}
/>
)}
- <header className="shrink-0 border-b border-slate-200 bg-card">
+ <header className="shrink-0 border-b border-[var(--workspace-divider)] bg-transparent">
<div className={MEMO_EDITOR_TOP_ROW_CLASS_NAME}>
+ <div
+ className={cn(
+ "flex min-w-0 flex-1",
+ desktopFocusMode && "mx-auto w-full max-w-[1400px]",
+ editorColumnMatchesArticle && editorContentAlignment === "center" && "justify-center",
+ )}
+ style={editorColumnMatchesArticle ? { paddingLeft: editorScrollbarGutter, paddingRight: editorScrollbarGutter } : undefined}
+ >
+ <div
+ className={cn(
+ "min-w-0 w-full",
+ editorColumnMatchesArticle ? MEMO_EDITOR_READING_GUTTER_CLASS_NAME : "px-3 sm:px-4",
+ "pr-36 sm:!pr-44",
+ (desktopFocusMode || editorColumnStyle) && "mx-auto",
+ desktopFocusMode && "max-w-[960px]",
+ )}
+ style={editorColumnStyle}
+ >
<MemoEditorTopRowLeading
mobileBackButton={(
<Button
@@ -3551,6 +3627,7 @@ const RichEditorPane = ({
)}
titleInput={(
<MemoTitleInput
+ className="px-0"
value={title}
readOnly={effectiveReadOnly}
onValueChange={(nextTitle) => {
@@ -3562,16 +3639,15 @@ const RichEditorPane = ({
/>
)}
/>
+ </div>
+ {editorColumnMatchesArticle && editorContentAlignment === "center" && !desktopFocusMode && !editorOutlineCollapsed ? (
+ <div aria-hidden="true" className="hidden shrink-0 lg:block" style={{ width: `calc(${EDITOR_OUTLINE_WIDTH} + 2rem)` }} />
+ ) : null}
+ </div>
- <div className="flex shrink-0 items-center gap-1">
+ <div className="absolute right-1 top-0 flex h-full shrink-0 items-center gap-1 sm:right-2">
<div className="flex min-w-0 items-center gap-1.5">
<MemoEditorUpdatedLabel updatedLabel={updatedLabel} />
- <span
- className="hidden whitespace-nowrap px-1.5 text-xs tabular-nums text-slate-400 sm:inline-flex"
- title={t("editor.characterCount", { count: characterCount })}
- >
- {t("editor.characterCount", { count: characterCount })}
- </span>
{imageUploadState !== "idle" && (
<span
className={cn(
@@ -3588,13 +3664,16 @@ const RichEditorPane = ({
: t("editor.uploadState.fileUploading")}
</span>
)}
+ <IconTooltip label={saveConflictReason ? `${saveStatusLabel}. ${saveConflictReason}` : saveStatusLabel}>
<m.span
key={`${saveState}-${String(hasUnsavedChanges)}`}
- className={cn("hidden items-center gap-1 rounded-md px-1.5 py-0.5 text-xs font-medium sm:inline-flex", saveStateClassName)}
+ className={cn(
+ "hidden items-center gap-1 rounded-md text-xs font-medium sm:inline-flex",
+ savedQuietly ? "px-1 text-slate-400" : cn("px-1.5 py-0.5", saveStateClassName),
+ )}
role="status"
aria-live="polite"
- title={saveConflictReason ?? undefined}
- aria-label={saveState === "conflict" && saveConflictReason ? `${saveLabel}. ${saveConflictReason}` : undefined}
+ aria-label={saveState === "conflict" && saveConflictReason ? `${saveStatusLabel}. ${saveConflictReason}` : saveStatusLabel}
{...statusSettleMotion}
>
{saveState === "saving" ? (
@@ -3606,8 +3685,9 @@ const RichEditorPane = ({
) : (
<Check className="h-3 w-3" aria-hidden="true" />
)}
- {saveLabel}
+ {savedQuietly ? null : saveLabel}
</m.span>
+ </IconTooltip>
<m.span
key={`${imageUploadState}-${saveState}-${String(hasUnsavedChanges)}`}
className={cn("inline-flex max-w-[5.5rem] truncate rounded-full px-2 py-1 text-xs font-medium sm:hidden", mobileStatusClassName)}
@@ -3628,7 +3708,7 @@ const RichEditorPane = ({
/>
{isMemoShared && !readOnly && (
<Button
- className="h-8 w-8 rounded-full bg-emerald-50 text-emerald-700 ring-1 ring-inset ring-emerald-200 hover:bg-emerald-100 hover:text-emerald-800 focus-visible:ring-emerald-500"
+ className="h-8 w-8 text-slate-700"
size="icon"
variant="ghost"
type="button"
@@ -3703,7 +3783,7 @@ const RichEditorPane = ({
)}
<MemoEditorHeaderActions
moreButtonClassName={cn(!mobileEditingActive && !readOnly && "hidden sm:inline-flex")}
- moreMenuClassName="w-44 rounded-md"
+ moreMenuClassName="w-56 rounded-md"
onOpenExecutionCenter={onOpenExecutionCenter}
onSearch={() => openNoteSearch()}
onSystemInfoOpenChange={setSystemInfoOpen}
@@ -3711,78 +3791,51 @@ const RichEditorPane = ({
<>
{!effectiveReadOnly && (
<IconTooltip label={`${t("aiAssistant.open")} (${formatShortcutBinding(shortcutSettings.openAiAssistant)})`}>
- <Button className="hidden h-8 w-8 text-emerald-600 transition-colors hover:bg-emerald-50 hover:text-emerald-800 focus-visible:ring-2 focus-visible:ring-emerald-300 sm:inline-flex" size="icon" variant="ghost" aria-label={t("aiAssistant.open")} onClick={openAiAssistant}>
+ <Button className="hidden h-8 w-8 text-slate-500 transition-colors hover:bg-slate-100 hover:text-slate-950 focus-visible:ring-2 focus-visible:ring-slate-300 sm:inline-flex" size="icon" variant="ghost" aria-label={t("aiAssistant.open")} onClick={openAiAssistant}>
<Sparkles className="h-4 w-4" strokeWidth={1.75} />
</Button>
</IconTooltip>
)}
- {!isMobileViewport && !useMobilePlainTextEditor && !useMarkdownSourceEditor && (
- <TooltipProvider delayDuration={0} skipDelayDuration={0}>
- <Tooltip>
- <TooltipTrigger asChild>
- <Button
- className={cn(
- "hidden h-8 w-8 text-slate-500 transition-colors hover:bg-slate-100 hover:text-slate-950 focus-visible:ring-2 focus-visible:ring-slate-300 xl:inline-flex",
- phonePreviewOpen && "bg-emerald-50 text-emerald-800 hover:bg-emerald-50 hover:text-emerald-900",
- )}
- size="icon"
- variant="ghost"
- aria-label={phonePreviewOpen ? t("editor.hidePhonePreview") : t("editor.showPhonePreview")}
- aria-pressed={phonePreviewOpen || undefined}
- onClick={() => handlePhonePreviewChange(!phonePreviewOpen)}
- >
- <PhonePreviewGlyph className="h-4 w-4" />
- </Button>
- </TooltipTrigger>
- <TooltipContent side="bottom">
- {phonePreviewOpen ? t("editor.hidePhonePreview") : t("editor.showPhonePreview")}
- </TooltipContent>
- </Tooltip>
- </TooltipProvider>
- )}
- <TooltipProvider delayDuration={0} skipDelayDuration={0}>
- <Tooltip>
- <TooltipTrigger asChild>
- <Button
- className={cn(
- "hidden h-8 w-8 text-slate-500 transition-all hover:bg-slate-100 hover:text-slate-950 focus-visible:ring-2 focus-visible:ring-slate-300 min-[1600px]:inline-flex",
- wechatCopyState === "copying" && "bg-slate-100 text-slate-700",
- wechatCopyState === "copied" && "bg-emerald-100 text-emerald-700 ring-1 ring-emerald-200 hover:bg-emerald-100",
- wechatCopyState === "error" && "bg-rose-100 text-rose-700 ring-1 ring-rose-200 hover:bg-rose-100"
- )}
- size="icon"
- variant="ghost"
- aria-label={t("editor.copyToWeChat")}
- onClick={() => void handleCopyToWeChat()}
- disabled={!editor || useMobilePlainTextEditor || wechatCopyState === "copying"}
- >
- {wechatCopyState === "copying" ? (
- <LoaderCircle className="h-4 w-4 animate-spin" />
- ) : wechatCopyState === "copied" ? (
- <Check className="h-4 w-4" strokeWidth={2.25} />
- ) : wechatCopyState === "error" ? (
- <CircleAlert className="h-4 w-4" strokeWidth={1.75} />
- ) : (
- <WeChatIcon className="h-4 w-4" />
- )}
- </Button>
- </TooltipTrigger>
- <TooltipContent side="bottom">
- {t(wechatCopyState === "copying" ? "editor.copyingToWeChat" : wechatCopyState === "copied" ? "editor.copiedToWeChat" : wechatCopyState === "error" ? "editor.copyToWeChatFailed" : "editor.copyToWeChat")}
- </TooltipContent>
- </Tooltip>
- </TooltipProvider>
</>
)}
- textNoteMenuItems={!effectiveReadOnly ? (
+ textNoteMenuItems={(
+ <>
+ {!isMobileViewport && !useMobilePlainTextEditor && !useMarkdownSourceEditor && (
+ <DropdownMenuItem
+ className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
+ onClick={() => handlePhonePreviewChange(!phonePreviewOpen)}
+ >
+ <PhonePreviewGlyph className="h-4 w-4 text-slate-500" />
+ {phonePreviewOpen ? t("editor.hidePhonePreview") : t("editor.showPhonePreview")}
+ </DropdownMenuItem>
+ )}
<DropdownMenuItem
- className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-emerald-700 hover:bg-emerald-50 cursor-pointer outline-none"
- onClick={openAiAssistant}
+ className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
+ disabled={!editor || useMobilePlainTextEditor || wechatCopyState === "copying"}
+ onClick={() => void handleCopyToWeChat()}
>
- <Sparkles className="h-4 w-4 text-emerald-600" />
- {t("aiAssistant.title")}
+ {wechatCopyState === "copying" ? (
+ <LoaderCircle className="h-4 w-4 animate-spin text-slate-500" />
+ ) : wechatCopyState === "copied" ? (
+ <Check className="h-4 w-4 text-slate-500" />
+ ) : wechatCopyState === "error" ? (
+ <CircleAlert className="h-4 w-4 text-rose-600" />
+ ) : (
+ <WeChatIcon className="h-4 w-4 text-slate-500" />
+ )}
+ {t(wechatCopyState === "copying" ? "editor.copyingToWeChat" : wechatCopyState === "copied" ? "editor.copiedToWeChat" : wechatCopyState === "error" ? "editor.copyToWeChatFailed" : "editor.copyToWeChat")}
</DropdownMenuItem>
- ) : null}
+ {!effectiveReadOnly ? (
+ <DropdownMenuItem
+ className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none sm:hidden"
+ onClick={openAiAssistant}
+ >
+ <Sparkles className="h-4 w-4 text-slate-500" />
+ {t("aiAssistant.title")}
+ </DropdownMenuItem>
+ ) : null}
+ </>
+ )}
moreMenuItems={(
<>
<DropdownMenuItem
@@ -3897,7 +3950,11 @@ const RichEditorPane = ({
</div>
</div>
- <div className={MEMO_EDITOR_TITLE_REGION_CLASS_NAME}>
+ <div
+ className={cn(desktopFocusMode && "mx-auto w-full max-w-[1400px]", editorColumnMatchesArticle && editorContentAlignment === "center" && "flex justify-center")}
+ style={editorColumnMatchesArticle ? { paddingLeft: editorScrollbarGutter, paddingRight: editorScrollbarGutter } : undefined}
+ >
+ <div className={cn(MEMO_EDITOR_TITLE_REGION_CLASS_NAME, useMarkdownSourceEditor && "lg:px-4", "min-w-0 w-full", (desktopFocusMode || editorColumnStyle) && "mx-auto", desktopFocusMode && "max-w-[960px]")} style={editorColumnStyle}>
<MemoEditorMetadataRow
contentMarkdown={currentMarkdownForAi}
disabled={effectiveReadOnly}
@@ -3937,6 +3994,10 @@ const RichEditorPane = ({
</>
)}
/>
+ </div>
+ {editorColumnMatchesArticle && editorContentAlignment === "center" && !desktopFocusMode && !editorOutlineCollapsed ? (
+ <div aria-hidden="true" className="hidden shrink-0 lg:block" style={{ width: `calc(${EDITOR_OUTLINE_WIDTH} + 2rem)` }} />
+ ) : null}
</div>
{noteSearchOpen ? (
<EditorNoteSearchBar
@@ -3958,7 +4019,10 @@ const RichEditorPane = ({
<EditorToolbar
editor={editor}
readOnly={effectiveReadOnly}
+ viewSwitchDisabled={readOnly}
markdownMode={useMarkdownSourceEditor}
+ editorView={editorView}
+ onEditorViewChange={isMobileViewport ? undefined : selectEditorView}
onMarkdownModeChange={handleMarkdownModeChange}
markdownModeShortcut={shortcutSettings.toggleEditorMode}
onPickAttachment={() => fileInputRef.current?.click()}
@@ -4021,7 +4085,7 @@ const RichEditorPane = ({
: {}),
} as CSSProperties}
className={cn(
- "edgeever-editor relative min-h-0 flex-1 bg-card",
+ "edgeever-editor relative min-h-0 flex-1 bg-transparent",
useMobilePlainTextEditor
? "overflow-visible"
: useMarkdownSourceEditor
@@ -4047,7 +4111,7 @@ const RichEditorPane = ({
"flex gap-8 transition-all duration-200",
useMarkdownSourceEditor
? "h-full min-h-0 flex-1 items-stretch px-0 py-0"
- : "min-h-full items-start px-4 py-2 sm:px-7 lg:px-24",
+ : cn("min-h-full items-start py-2", MEMO_EDITOR_READING_GUTTER_CLASS_NAME),
desktopFocusMode
? "mx-auto w-full max-w-[1400px] justify-center"
: editorContentAlignment === "center"
diff --git a/apps/web/src/components/EditorTableMenu.tsx b/apps/web/src/components/EditorTableMenu.tsx
index 537274d6..167de5e2 100644
--- a/apps/web/src/components/EditorTableMenu.tsx
+++ b/apps/web/src/components/EditorTableMenu.tsx
@@ -44,10 +44,10 @@ export const EditorTableMenu = ({ editor, readOnly }: EditorTableMenuProps) => {
<DropdownMenuTrigger asChild>
<button
className={cn(
- "flex h-8 w-8 shrink-0 items-center justify-center rounded-md border transition disabled:pointer-events-none disabled:opacity-40",
+ "flex h-8 w-8 shrink-0 items-center justify-center rounded-md transition disabled:pointer-events-none disabled:opacity-40",
inTable
- ? "border-emerald-200 bg-emerald-50 text-emerald-800"
- : "border-transparent bg-transparent text-slate-700 hover:border-slate-200 hover:bg-slate-50"
+ ? "bg-slate-200/80 text-slate-900"
+ : "bg-transparent text-slate-500 hover:bg-slate-100 hover:text-slate-800"
)}
type="button"
aria-label={t("editorToolbar.table")}
diff --git a/apps/web/src/components/EditorToolbar.tsx b/apps/web/src/components/EditorToolbar.tsx
index 6c61b2a2..468fc1e1 100644
--- a/apps/web/src/components/EditorToolbar.tsx
+++ b/apps/web/src/components/EditorToolbar.tsx
@@ -21,11 +21,24 @@ import {
Sigma,
ChevronDown,
ChevronUp,
+ BookOpen,
+ FileCode2,
+ Palette,
+ Type,
} from "lucide-react";
import { cn } from "@/lib/utils";
import { MEMO_EDITOR_TOOLBAR_COLLAPSED_CLASS_NAME } from "@/components/MemoEditorChromeDensity";
import { MemoEditorToolbarDivider, MemoEditorToolbarRow } from "@/components/MemoEditorToolbarChrome";
import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from "@/components/ui/select";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuLabel,
+ DropdownMenuRadioGroup,
+ DropdownMenuRadioItem,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import {
EDITOR_HEADING_LEVELS,
@@ -64,10 +77,10 @@ const EditorToolbarButton = ({
<TooltipTrigger asChild>
<button
className={cn(
- "flex h-8 w-8 shrink-0 items-center justify-center rounded-md border text-slate-700 transition disabled:pointer-events-none disabled:opacity-40",
+ "flex h-8 w-8 shrink-0 items-center justify-center rounded-md text-slate-500 transition disabled:pointer-events-none disabled:opacity-40",
active
- ? "border-emerald-200 bg-emerald-50 text-emerald-800"
- : "border-transparent bg-transparent hover:border-slate-200 hover:bg-slate-50"
+ ? "bg-slate-200/80 text-slate-900"
+ : "bg-transparent hover:bg-slate-100 hover:text-slate-800"
)}
type="button"
aria-label={title}
@@ -147,10 +160,21 @@ const toggleListAtSelection = (editor: Editor, listType: "bulletList" | "ordered
}
};
+export type EditorViewMode = "rich" | "markdown" | "reading";
+
+const EDITOR_VIEW_MODES = [
+ { value: "rich", labelKey: "editorToolbar.richText", icon: Type },
+ { value: "markdown", labelKey: "editorToolbar.markdown", icon: FileCode2 },
+ { value: "reading", labelKey: "editorToolbar.reading", icon: BookOpen },
+] as const satisfies ReadonlyArray<{ value: EditorViewMode; labelKey: string; icon: typeof Type }>;
+
export const EditorToolbar = ({
editor,
readOnly,
markdownMode = false,
+ editorView = "rich",
+ onEditorViewChange,
+ viewSwitchDisabled = false,
onMarkdownModeChange,
markdownModeShortcut,
onPickAttachment,
@@ -162,6 +186,10 @@ export const EditorToolbar = ({
editor: Editor | null;
readOnly: boolean;
markdownMode?: boolean;
+ editorView?: EditorViewMode;
+ onEditorViewChange?: (view: EditorViewMode) => void;
+ /** Trash and other hard locks. Reading mode must not disable the view switch. */
+ viewSwitchDisabled?: boolean;
onMarkdownModeChange?: () => void;
markdownModeShortcut?: ShortcutBinding;
onPickAttachment?: () => void;
@@ -198,6 +226,8 @@ export const EditorToolbar = ({
const codeBlockLanguage = editorReady
? getCodeBlockLanguageValue(editor.getAttributes("codeBlock").language)
: "plaintext";
+ const activeEditorView = onEditorViewChange ? editorView : markdownMode ? "markdown" : "rich";
+ const showFormattingTools = activeEditorView === "rich";
useEffect(() => {
const controls = controlsRef.current;
@@ -293,7 +323,7 @@ export const EditorToolbar = ({
return (
<TooltipProvider delayDuration={0} skipDelayDuration={0}>
<div
- className="relative min-w-0 max-w-full border-t border-slate-100 bg-card"
+ className="relative min-w-0 max-w-full border-t border-[var(--workspace-divider)] bg-transparent"
role="toolbar"
aria-label={t("editorToolbar.toolbar")}
>
@@ -305,17 +335,31 @@ export const EditorToolbar = ({
!expanded && MEMO_EDITOR_TOOLBAR_COLLAPSED_CLASS_NAME
)}
>
- {onMarkdownModeChange && (
+ {onEditorViewChange ? (
+ <>
+ <div className="flex shrink-0 items-center" role="group" aria-label={t("editorToolbar.viewMode")}>
+ {EDITOR_VIEW_MODES.map((mode) => (
+ <EditorToolbarButton
+ key={mode.value}
+ title={mode.value === "markdown" && markdownModeShortcutLabel
+ ? `${t(mode.labelKey)} (${markdownModeShortcutLabel})`
+ : t(mode.labelKey)}
+ active={activeEditorView === mode.value}
+ disabled={viewSwitchDisabled}
+ onClick={() => onEditorViewChange(mode.value)}
+ >
+ <mode.icon className="h-4 w-4" />
+ </EditorToolbarButton>
+ ))}
+ </div>
+ <MemoEditorToolbarDivider className="hidden sm:block" />
+ </>
+ ) : onMarkdownModeChange ? (
<>
<Tooltip>
<TooltipTrigger asChild>
<button
- className={cn(
- "flex h-8 shrink-0 items-center rounded-md border px-2.5 text-xs font-medium transition-colors disabled:pointer-events-none disabled:opacity-40",
- markdownMode
- ? "border-emerald-200 bg-emerald-50 text-emerald-800"
- : "border-slate-200/80 bg-card text-slate-700 hover:border-slate-300 hover:bg-slate-50"
- )}
+ className="flex h-8 w-8 shrink-0 items-center justify-center rounded-md text-slate-500 transition hover:bg-slate-100 hover:text-slate-800 disabled:pointer-events-none disabled:opacity-40"
type="button"
aria-label={markdownMode ? t("editorToolbar.richText") : t("editorToolbar.markdown")}
aria-pressed={markdownMode}
@@ -323,7 +367,7 @@ export const EditorToolbar = ({
onMouseDown={(event) => event.preventDefault()}
onClick={onMarkdownModeChange}
>
- {markdownMode ? t("editorToolbar.switchToRichText") : t("editorToolbar.switchToMarkdown")}
+ {markdownMode ? <Type className="h-4 w-4" /> : <FileCode2 className="h-4 w-4" />}
</button>
</TooltipTrigger>
<TooltipContent side="bottom" className="flex items-center gap-2">
@@ -337,7 +381,7 @@ export const EditorToolbar = ({
</Tooltip>
<MemoEditorToolbarDivider className="hidden sm:block" />
</>
- )}
+ ) : null}
{onPickAttachment && (
<>
<EditorToolbarButton
@@ -379,72 +423,68 @@ export const EditorToolbar = ({
<MemoEditorToolbarDivider className="hidden sm:block" />
</>
)}
- {markdownMode ? (
- <Select
- value={markdownThemePreference}
- onValueChange={(value) => setMarkdownTheme(value as typeof markdownThemePreference)}
- >
- <SelectTrigger
- aria-label={t("editorToolbar.markdownTheme")}
- className="h-8 w-[11.5rem] shrink-0 whitespace-nowrap border-slate-200 bg-card text-xs text-slate-800 [&>span]:truncate [&>span]:whitespace-nowrap"
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <button
+ className="flex h-8 w-8 shrink-0 items-center justify-center rounded-md text-slate-500 transition hover:bg-slate-100 hover:text-slate-800 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-slate-300"
+ type="button"
+ aria-label={t("editorToolbar.appearance")}
+ onMouseDown={(event) => event.preventDefault()}
>
- <SelectValue />
- </SelectTrigger>
- <SelectContent className="bg-card border border-slate-200 rounded-md py-1 shadow-md">
- {MARKDOWN_THEME_PREFERENCES.map((theme) => (
- <SelectItem key={theme} value={theme} className="text-xs leading-5">
- {t(`settings.markdownThemes.${theme}`)}
- </SelectItem>
- ))}
- </SelectContent>
- </Select>
- ) : (
+ <Palette className="h-4 w-4" />
+ </button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="start" className="max-h-80 w-52 overflow-y-auto border border-slate-200 bg-card py-1 shadow-md">
+ {markdownMode ? (
+ <>
+ <DropdownMenuLabel className="text-xs text-slate-500">{t("editorToolbar.markdownTheme")}</DropdownMenuLabel>
+ <DropdownMenuRadioGroup
+ value={markdownThemePreference}
+ onValueChange={(value) => setMarkdownTheme(value as typeof markdownThemePreference)}
+ >
+ {MARKDOWN_THEME_PREFERENCES.map((theme) => (
+ <DropdownMenuRadioItem key={theme} value={theme} className="text-xs leading-5">
+ {t(`settings.markdownThemes.${theme}`)}
+ </DropdownMenuRadioItem>
+ ))}
+ </DropdownMenuRadioGroup>
+ </>
+ ) : (
+ <>
+ <DropdownMenuLabel className="text-xs text-slate-500">{t("editorToolbar.editorTheme")}</DropdownMenuLabel>
+ <DropdownMenuRadioGroup value={editorTheme} onValueChange={(value) => setEditorTheme(value)}>
+ {namedEditorThemes.map((theme) => (
+ <DropdownMenuRadioItem key={theme} value={theme} className="text-xs leading-5">
+ {t(`settings.editorThemes.${theme}`)}
+ </DropdownMenuRadioItem>
+ ))}
+ {customEditorThemes.map((theme) => (
+ <DropdownMenuRadioItem key={theme.id} value={theme.id} className="text-xs leading-5">
+ {localizeStoredCustomThemeName(theme.name, {
+ defaultName: t("settings.customEditorTheme.defaultName"),
+ newName: (index) => t("settings.customEditorTheme.newName", { n: index }),
+ })}
+ </DropdownMenuRadioItem>
+ ))}
+ </DropdownMenuRadioGroup>
+ <DropdownMenuSeparator />
+ <DropdownMenuLabel className="text-xs text-slate-500">{t("editorToolbar.blockStyle")}</DropdownMenuLabel>
+ <DropdownMenuRadioGroup value={blockValue} onValueChange={(value) => setBlock(value)}>
+ <DropdownMenuRadioItem value="paragraph" className="text-xs leading-5" disabled={disabled}>
+ {t("editorToolbar.paragraph")}
+ </DropdownMenuRadioItem>
+ {EDITOR_HEADING_LEVELS.map((level) => (
+ <DropdownMenuRadioItem key={level} value={`heading-${level}`} className="text-xs leading-5" disabled={disabled}>
+ {t(`editorToolbar.heading${level}`)}
+ </DropdownMenuRadioItem>
+ ))}
+ </DropdownMenuRadioGroup>
+ </>
+ )}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ {showFormattingTools ? (
<>
- <Select
- value={editorTheme}
- onValueChange={(value) => setEditorTheme(value)}
- >
- <SelectTrigger
- aria-label={t("editorToolbar.editorTheme")}
- className="h-8 w-[6.5rem] shrink-0 whitespace-nowrap border-slate-200 bg-card text-xs text-slate-800 [&>span]:truncate [&>span]:whitespace-nowrap"
- >
- <SelectValue />
- </SelectTrigger>
- <SelectContent className="min-w-[10rem] bg-card border border-slate-200 rounded-md py-1 shadow-md">
- {namedEditorThemes.map((theme) => (
- <SelectItem key={theme} value={theme} className="text-xs leading-5">
- {t(`settings.editorThemes.${theme}`)}
- </SelectItem>
- ))}
- {customEditorThemes.map((theme) => (
- <SelectItem key={theme.id} value={theme.id} className="text-xs leading-5">
- {localizeStoredCustomThemeName(theme.name, {
- defaultName: t("settings.customEditorTheme.defaultName"),
- newName: (index) => t("settings.customEditorTheme.newName", { n: index }),
- })}
- </SelectItem>
- ))}
- </SelectContent>
- </Select>
- <MemoEditorToolbarDivider className="hidden sm:block" />
- <Select
- value={blockValue}
- disabled={disabled}
- onValueChange={(value) => setBlock(value)}
- >
- <SelectTrigger className="h-8 w-20 shrink-0 whitespace-nowrap border-slate-200 bg-card text-xs text-slate-800 [&>span]:truncate [&>span]:whitespace-nowrap">
- <SelectValue placeholder={t("editorToolbar.paragraph")} />
- </SelectTrigger>
- <SelectContent className="bg-card border border-slate-200 rounded-md py-1 shadow-md">
- <SelectItem value="paragraph" className="text-xs leading-5">{t("editorToolbar.paragraph")}</SelectItem>
- {EDITOR_HEADING_LEVELS.map((level) => (
- <SelectItem key={level} value={`heading-${level}`} className="text-xs leading-5">
- {t(`editorToolbar.heading${level}`)}
- </SelectItem>
- ))}
- </SelectContent>
- </Select>
-
<MemoEditorToolbarDivider className="hidden sm:block" />
<EditorToolbarButton
title={t("editorToolbar.undo")}
@@ -586,14 +626,14 @@ export const EditorToolbar = ({
</EditorToolbarButton>
<EditorTableMenu editor={editor} readOnly={readOnly} />
</>
- )}
+ ) : null}
</MemoEditorToolbarRow>
{hasOverflow && (
<div className="absolute right-3 top-2 z-20 flex h-8 items-center bg-gradient-to-l from-card via-card to-transparent pl-5 sm:right-4 sm:top-0.5">
<Tooltip>
<TooltipTrigger asChild>
<button
- className="flex h-8 w-8 items-center justify-center rounded-md border border-slate-200 bg-card text-slate-700 shadow-sm transition hover:border-slate-300 hover:bg-slate-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-emerald-500/30"
+ className="flex h-8 w-8 items-center justify-center rounded-md bg-card text-slate-500 transition hover:bg-slate-100 hover:text-slate-800 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-slate-300"
type="button"
aria-expanded={expanded}
aria-label={t(expanded ? "editorToolbar.showLess" : "editorToolbar.showMore")}
diff --git a/apps/web/src/components/MemoCard.tsx b/apps/web/src/components/MemoCard.tsx
index 8a1495ae..5b1a36c2 100644
--- a/apps/web/src/components/MemoCard.tsx
+++ b/apps/web/src/components/MemoCard.tsx
@@ -333,14 +333,14 @@ export const MemoCard = ({
draggable={!isTrashView}
onDragStart={handleDragStart}
className={cn(
- "edgeever-memo-divider group relative overflow-hidden border border-slate-100 bg-card transition lg:rounded-none lg:border-x-0 lg:border-t-0 lg:border-slate-200 lg:shadow-none transition-all duration-200 select-none",
- isLast && "lg:border-b-0",
- listDensity === "compact" ? "rounded-md shadow-none" : "rounded-lg shadow-[0_4px_16px_rgba(15,23,42,0.045)]",
+ "edgeever-memo-divider group relative overflow-hidden border border-slate-100 bg-card transition lg:my-0.5 lg:rounded-lg lg:border lg:border-transparent lg:bg-transparent lg:shadow-none transition-all duration-200 select-none",
+ isLast && "lg:border-b-transparent",
+ listDensity === "compact" ? "rounded-md shadow-none" : "rounded-lg shadow-[0_4px_16px_rgba(15,23,42,0.045)] lg:shadow-none",
!selectionMode && selected
- ? "edgeever-workspace-selection-desktop"
+ ? "lg:border-[var(--workspace-divider)] lg:bg-[var(--workspace-editor)] lg:shadow-[0_1px_2px_rgba(15,23,32,0.06)]"
: checked
- ? "edgeever-workspace-selection-desktop bg-slate-50 ring-1 ring-slate-200 lg:ring-0"
- : "active:bg-slate-50 lg:hover:bg-slate-50"
+ ? "bg-slate-50 ring-1 ring-slate-200 lg:border-[var(--workspace-divider)] lg:bg-[var(--workspace-selection)] lg:ring-0"
+ : "active:bg-slate-50 lg:hover:bg-white/70"
)}
>
<div className={cn("flex min-h-[132px] items-center", listDensity === "compact" && "min-h-[84px] lg:min-h-[76px]")}>
@@ -422,7 +422,7 @@ export const MemoCard = ({
) : (
<div
className={cn(
- "line-clamp-2 min-h-10 text-xs leading-relaxed text-slate-600",
+ "line-clamp-2 min-h-10 text-xs leading-relaxed text-slate-500",
listDensity === "compact" && "line-clamp-1 min-h-0"
)}
>
@@ -438,7 +438,7 @@ export const MemoCard = ({
{memo.tags.slice(0, 3).map((tag) => (
<span
key={tag}
- className="rounded-[3px] bg-slate-100 px-1.5 py-0.5 text-xs font-medium tracking-tight text-slate-600"
+ className="text-xs tracking-tight text-slate-400"
>
#{tag}
</span>
@@ -448,9 +448,8 @@ export const MemoCard = ({
{!selectionMode && (
<div
className={cn(
- "mr-3 mt-4 hidden shrink-0 flex-col gap-1 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100 lg:flex",
- selected && "opacity-100",
- listDensity === "compact" && "lg:mt-3"
+ "mr-2 mt-3 hidden shrink-0 flex-col gap-1 opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover:opacity-100 lg:flex",
+ listDensity === "compact" && "lg:mt-2"
)}
>
<Tooltip><TooltipTrigger asChild><button
diff --git a/apps/web/src/components/MemoEditorChromeDensity.ts b/apps/web/src/components/MemoEditorChromeDensity.ts
index a45aee35..f76cc37c 100644
--- a/apps/web/src/components/MemoEditorChromeDensity.ts
+++ b/apps/web/src/components/MemoEditorChromeDensity.ts
@@ -1,5 +1,7 @@
+export const MEMO_EDITOR_READING_GUTTER_CLASS_NAME = "px-4 sm:px-7 lg:px-24";
+
export const MEMO_EDITOR_TOP_ROW_CLASS_NAME =
- "flex min-h-12 items-center justify-between gap-2 border-b border-slate-100 px-3 py-2 sm:min-h-9 sm:px-4 sm:py-0.5";
+ "relative flex min-h-12 items-center justify-between gap-2 border-b border-slate-100 py-2 sm:min-h-9 sm:py-0.5";
export const MEMO_EDITOR_TOOLBAR_PADDING_CLASS_NAME =
"px-3 py-2 sm:px-4 sm:py-0.5";
@@ -9,4 +11,4 @@ export const MEMO_EDITOR_TOOLBAR_COLLAPSED_CLASS_NAME =
"max-h-12 overflow-hidden sm:max-h-9";
export const MEMO_EDITOR_TITLE_REGION_CLASS_NAME =
- "space-y-1.5 px-5 pb-2.5 pt-2.5 sm:space-y-3 sm:px-6 sm:pb-4 sm:pt-4 lg:space-y-0 lg:py-0";
+ `space-y-1 pb-2 pt-1 sm:pb-2 sm:pt-1 ${MEMO_EDITOR_READING_GUTTER_CLASS_NAME}`;
diff --git a/apps/web/src/components/MemoEditorHeaderActions.test.mjs b/apps/web/src/components/MemoEditorHeaderActions.test.mjs
index 53880ce8..85cb1868 100644
--- a/apps/web/src/components/MemoEditorHeaderActions.test.mjs
+++ b/apps/web/src/components/MemoEditorHeaderActions.test.mjs
@@ -17,7 +17,7 @@ describe("shared memo editor header actions", () => {
expect(actionsSource).toContain("<GitHubRepositoryLink");
expect(actionsSource).toContain("<SystemInfoDialog");
expect(actionsSource).toContain("<ExecutionCenterButton");
- expect(actionsSource).toContain("<ThemeToggle />");
+ expect(actionsSource).toContain("setPreference(nextTheme)");
expect(actionsSource).toContain("<MoreHorizontal");
});
@@ -64,20 +64,19 @@ describe("shared memo editor header actions", () => {
expect(toolbarChromeSource).toContain("MEMO_EDITOR_TOOLBAR_PADDING_CLASS_NAME");
expect(editorToolbarSource).toContain("MEMO_EDITOR_TOOLBAR_COLLAPSED_CLASS_NAME");
expect(editorToolbarSource).toContain('item.classList.toggle("invisible", wrapped)');
- expect(densitySource).toContain("sm:min-h-9 sm:px-4 sm:py-0.5");
+ expect(densitySource).toContain("sm:min-h-9 sm:py-0.5");
expect(densitySource).toContain("sm:px-4 sm:py-0.5");
expect(densitySource).toContain("max-h-12 overflow-hidden sm:max-h-9");
expect(densitySource.match(/MEMO_EDITOR_TOP_ROW_CLASS_NAME =\s*"([^"]+)"/)?.[1]).not.toContain("sm:px-7");
expect(densitySource.match(/MEMO_EDITOR_TOOLBAR_PADDING_CLASS_NAME =\s*"([^"]+)"/)?.[1]).not.toContain("sm:px-7");
- expect(densitySource).toContain("sm:px-6 sm:pb-4 sm:pt-4 lg:space-y-0 lg:py-0");
- expect(densitySource.match(/MEMO_EDITOR_TITLE_REGION_CLASS_NAME =\s*"([^"]+)"/)?.[1]).not.toContain("lg:px-24");
+ expect(densitySource).toContain("px-4 sm:px-7 lg:px-24");
expect(densitySource).not.toContain("min-[1600px]:flex");
});
- test("keeps the notebook row aligned with the note title while the body keeps its reading gutter", () => {
- expect(editorSource).toContain("min-h-full items-start px-4 py-2 sm:px-7 lg:px-24");
- expect(densitySource).toContain("sm:px-6 sm:pb-4 sm:pt-4 lg:space-y-0 lg:py-0");
- expect(densitySource.match(/MEMO_EDITOR_TITLE_REGION_CLASS_NAME =\s*"([^"]+)"/)?.[1]).not.toContain("lg:px-24");
+ test("aligns the note title, notebook row, and article on one reading gutter", () => {
+ expect(editorSource).toContain("MEMO_EDITOR_READING_GUTTER_CLASS_NAME");
+ expect(densitySource).toContain('export const MEMO_EDITOR_READING_GUTTER_CLASS_NAME = "px-4 sm:px-7 lg:px-24"');
+ expect(densitySource).toContain("MEMO_EDITOR_READING_GUTTER_CLASS_NAME");
expect(editorSource).toContain("overflow-y-auto lg:[scrollbar-gutter:stable_both-edges]");
});
});
diff --git a/apps/web/src/components/MemoEditorHeaderActions.tsx b/apps/web/src/components/MemoEditorHeaderActions.tsx
index 58c645e8..16c13513 100644
--- a/apps/web/src/components/MemoEditorHeaderActions.tsx
+++ b/apps/web/src/components/MemoEditorHeaderActions.tsx
@@ -1,10 +1,10 @@
import { useState, type ReactNode } from "react";
-import { Info, MoreHorizontal, Search } from "lucide-react";
+import { Info, MoonStar, MoreHorizontal, Search, SunMedium } from "lucide-react";
import { useTranslation } from "react-i18next";
import { ExecutionCenterButton } from "@/components/execution/ExecutionCenterButton";
import { GitHubRepositoryLink } from "@/components/GitHubRepositoryLink";
import { SystemInfoDialog } from "@/components/SystemInfoDialog";
-import { ThemeToggle } from "@/components/ThemeToggle";
+import { useAppearanceTheme } from "@/components/ThemeProvider";
import { Button } from "@/components/ui/button";
import {
DropdownMenu,
@@ -14,7 +14,6 @@ import {
} from "@/components/ui/dropdown-menu";
import { useDeployedUpdateNotice } from "@/hooks/useDeployedUpdateNotice";
import { cn } from "@/lib/utils";
-import { IconTooltip } from "./editor/EditorPaneChrome";
export const MemoEditorHeaderActions = ({
moreButtonClassName,
@@ -38,6 +37,9 @@ export const MemoEditorHeaderActions = ({
const { t } = useTranslation();
const [systemInfoOpen, setSystemInfoOpen] = useState(false);
const { unseen: deployedUpdateUnseen } = useDeployedUpdateNotice();
+ const { resolvedTheme, setPreference } = useAppearanceTheme();
+ const nextTheme = resolvedTheme === "dark" ? "light" : "dark";
+ const themeLabel = nextTheme === "dark" ? t("settings.themeToggleToDark") : t("settings.themeToggleToLight");
const handleSystemInfoOpenChange = (open: boolean) => {
setSystemInfoOpen(open);
onSystemInfoOpenChange?.(open);
@@ -45,43 +47,19 @@ export const MemoEditorHeaderActions = ({
return (
<>
- <IconTooltip label={t("editor.searchCurrentMemo")}>
- <Button
- className="hidden h-8 w-8 text-slate-500 transition-colors hover:bg-slate-100 hover:text-slate-950 focus-visible:ring-2 focus-visible:ring-slate-300 sm:inline-flex"
- size="icon"
- variant="ghost"
- aria-label={t("editor.searchCurrentMemo")}
- onClick={onSearch}
- >
- <Search className="h-4 w-4" strokeWidth={1.75} />
- </Button>
- </IconTooltip>
{textNoteActions}
- <GitHubRepositoryLink className="hidden h-8 w-8 justify-center rounded-md text-slate-500 transition-colors hover:bg-slate-100 hover:text-slate-950 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-emerald-500/70 min-[1600px]:inline-flex" iconClassName="h-4 w-4" />
- <IconTooltip label={t("systemInfo.title")}>
- <Button
- className="relative hidden h-8 w-8 text-slate-500 transition-colors hover:bg-slate-100 hover:text-slate-950 focus-visible:ring-2 focus-visible:ring-emerald-500/70 min-[1600px]:inline-flex"
- size="icon"
- variant="ghost"
- aria-label={t("systemInfo.title")}
- onClick={() => handleSystemInfoOpenChange(true)}
- >
- <Info className="h-4 w-4" strokeWidth={1.75} />
- {deployedUpdateUnseen ? <span className="absolute right-1 top-1 h-1.5 w-1.5 rounded-full bg-emerald-500 ring-2 ring-white" /> : null}
- </Button>
- </IconTooltip>
<ExecutionCenterButton className="h-8 w-8" onClick={onOpenExecutionCenter} />
- <ThemeToggle />
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
- className={moreButtonClassName}
+ className={cn("relative", moreButtonClassName)}
size="icon"
variant="ghost"
title={t("editor.more")}
aria-label={t("editor.moreAria")}
>
<MoreHorizontal className="h-4 w-4" />
+ {deployedUpdateUnseen ? <span className="absolute right-1 top-1 h-1.5 w-1.5 rounded-full bg-emerald-500 ring-2 ring-white" /> : null}
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent
@@ -96,9 +74,23 @@ export const MemoEditorHeaderActions = ({
<Search className="h-4 w-4 text-slate-500" />
{t("editor.searchCurrentMemo")}
</DropdownMenuItem>
+ <DropdownMenuItem
+ className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
+ onClick={() => setPreference(nextTheme)}
+ >
+ {resolvedTheme === "dark" ? <SunMedium className="h-4 w-4 text-slate-500" /> : <MoonStar className="h-4 w-4 text-slate-500" />}
+ {themeLabel}
+ </DropdownMenuItem>
+ <GitHubRepositoryLink
+ showTooltip={false}
+ className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 outline-none hover:bg-slate-50"
+ iconClassName="h-4 w-4 text-slate-500"
+ >
+ {t("common.githubRepository")}
+ </GitHubRepositoryLink>
{moreMenuItems}
<DropdownMenuItem
- className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none min-[1600px]:hidden"
+ className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
onClick={() => handleSystemInfoOpenChange(true)}
>
<span className="relative flex h-4 w-4 shrink-0 items-center justify-center">
diff --git a/apps/web/src/components/MemoListPane.tsx b/apps/web/src/components/MemoListPane.tsx
index 628897b6..9c7f22dc 100644
--- a/apps/web/src/components/MemoListPane.tsx
+++ b/apps/web/src/components/MemoListPane.tsx
@@ -52,7 +52,6 @@ import {
Copy,
} from "lucide-react";
import { Button } from "@/components/ui/button";
-import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
import {
DropdownMenu,
DropdownMenuContent,
@@ -1201,171 +1200,6 @@ export const MemoListPane = ({
</div>
</div>
- <div className="mb-3 hidden flex-wrap items-center justify-between gap-2 lg:flex">
- <div className="flex min-w-0 flex-wrap items-center gap-1">
- <Button
- size="icon"
- variant="ghost"
- title={t("memoList.selectMemo")}
- aria-label={t("memoList.selectMemo")}
- onClick={onEnterSelectionMode}
- disabled={!canEnterSelectionMode}
- >
- <CheckSquare className="h-4 w-4" />
- </Button>
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <button
- className={cn(
- "flex h-8 w-8 shrink-0 items-center justify-center rounded-md border text-xs font-medium transition-all duration-200 outline-none",
- filterMode === "all"
- ? "border-slate-200 bg-card text-slate-600 hover:bg-slate-50 hover:text-slate-900"
- : "border-slate-300 bg-slate-100 text-slate-900 hover:bg-slate-200"
- )}
- title={t("memoList.filterTitle", { label: activeFilterLabel })}
- >
- {getMobileFilterIcon(filterMode)}
- </button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" className="w-44 bg-card border border-slate-200 rounded-md py-1 shadow-md">
- {filterOptions.map((option: any) => (
- <DropdownMenuItem
- key={option.value}
- className={cn(
- "flex h-9 w-full items-center gap-2 px-3 text-left text-sm cursor-pointer outline-none",
- filterMode === option.value ? "bg-slate-100 text-slate-900" : "text-slate-700 hover:bg-slate-50"
- )}
- onClick={() => handleFilterModeChange(option.value)}
- >
- {getMobileFilterIcon(option.value)}
- <span className="min-w-0 flex-1 truncate">{option.label}</span>
- </DropdownMenuItem>
- ))}
- </DropdownMenuContent>
- </DropdownMenu>
-
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <button
- className="flex h-8 w-8 shrink-0 items-center justify-center rounded-md border border-slate-200 bg-card text-xs font-medium text-slate-600 transition hover:bg-slate-50 hover:text-slate-900 outline-none"
- title={t("memoList.sortTitle", { label: activeSortLabel })}
- >
- <ArrowDownWideNarrow className="h-4 w-4" />
- </button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" className="w-44 bg-card border border-slate-200 rounded-md py-1 shadow-md">
- {memoSortOptions.map((option: any) => (
- <DropdownMenuItem
- key={option.value}
- className={cn(
- "flex h-9 w-full items-center gap-2 px-3 text-left text-sm cursor-pointer outline-none",
- sortMode === option.value ? "bg-slate-100 text-slate-900" : "text-slate-700 hover:bg-slate-50"
- )}
- onClick={() => onSortModeChange(option.value)}
- >
- <span className="min-w-0 flex-1 truncate">{option.label}</span>
- </DropdownMenuItem>
- ))}
- </DropdownMenuContent>
- </DropdownMenu>
-
- <ToggleGroup
- className="h-8 shrink-0 overflow-hidden rounded-md border border-border bg-card"
- type="single"
- value={listDensity}
- onValueChange={(value) => {
- if (value) {
- handleListDensityChange(value as MemoListDensity);
- }
- }}
- >
- <ToggleGroupItem
- className="rounded-none border-0"
- size="icon"
- title={t("memoList.previewList")}
- value="preview"
- aria-label={t("memoList.previewList")}
- >
- <LayoutList className="h-4 w-4" />
- </ToggleGroupItem>
- <ToggleGroupItem
- className="rounded-none border-0 border-l border-border"
- size="icon"
- title={t("memoList.compactList")}
- value="compact"
- aria-label={t("memoList.compactList")}
- >
- <List className="h-4 w-4" />
- </ToggleGroupItem>
- </ToggleGroup>
- </div>
- <div className="flex shrink-0 items-center gap-1">
- <Button
- size="icon"
- variant="ghost"
- title={syncMemosTitle}
- aria-label={syncMemosTitle}
- disabled={!canSyncMemos || isSyncingMemos}
- onClick={onSyncMemos}
- >
- <RefreshCw className={cn("h-4 w-4", isSyncingMemos && "animate-spin")} />
- </Button>
- {view === "trash" && (
- <Button
- size="sm"
- variant="danger"
- title={t("memoList.emptyTrashTitle")}
- onClick={onEmptyTrash}
- >
- <Trash2 className="h-4 w-4" />
- {t("memoList.emptyTrash")}
- </Button>
- )}
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- size="icon"
- variant="ghost"
- title={t("memoList.more")}
- aria-label={t("memoList.moreActions")}
- >
- <MoreHorizontal className="h-4 w-4" />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end" className="w-40 bg-card border border-slate-200 rounded-md py-1 shadow-md">
- <DropdownMenuItem
- className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
- onClick={onOpenTags}
- >
- <Tag className="h-4 w-4 text-slate-500" />
- {t("memoList.tags")}
- </DropdownMenuItem>
- <DropdownMenuItem
- className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
- onClick={onOpenAssets}
- >
- <Paperclip className="h-4 w-4 text-slate-500" />
- {t("memoList.assets")}
- </DropdownMenuItem>
- <DropdownMenuItem
- className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
- onClick={view === "trash" ? onEmptyTrash : onOpenTrash}
- >
- <Trash2 className="h-4 w-4 text-rose-700" />
- {view === "trash" ? t("memoList.emptyTrash") : t("memoList.trash")}
- </DropdownMenuItem>
- <DropdownMenuItem
- className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
- onClick={onOpenSettings}
- >
- <KeyRound className="h-4 w-4 text-slate-500" />
- MCP Token
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- </div>
- </div>
-
<div className={cn("items-center gap-2", mobileSearchActive ? "hidden lg:flex" : "flex")}>
<div
className={cn(
@@ -1409,6 +1243,120 @@ export const MemoListPane = ({
</button>
)}
</div>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ className="hidden lg:inline-flex"
+ size="icon"
+ variant="ghost"
+ title={t("memoList.more")}
+ aria-label={t("memoList.moreActions")}
+ >
+ <MoreHorizontal className="h-4 w-4" />
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end" className="w-52 border border-slate-200 bg-card py-1 shadow-md">
+ <DropdownMenuItem
+ className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
+ disabled={!canEnterSelectionMode}
+ onClick={onEnterSelectionMode}
+ >
+ <CheckSquare className="h-4 w-4 text-slate-500" />
+ {t("memoList.selectMemo")}
+ </DropdownMenuItem>
+ <DropdownMenuSub>
+ <DropdownMenuSubTrigger className="text-sm">{t("memoList.filterTitle", { label: activeFilterLabel })}</DropdownMenuSubTrigger>
+ <DropdownMenuSubContent className="w-44 border border-slate-200 bg-card py-1 shadow-md">
+ {filterOptions.map((option: any) => (
+ <DropdownMenuItem
+ key={option.value}
+ className={cn(
+ "flex h-9 w-full items-center gap-2 px-3 text-left text-sm cursor-pointer outline-none",
+ filterMode === option.value ? "bg-slate-100 text-slate-900" : "text-slate-700 hover:bg-slate-50",
+ )}
+ onClick={() => handleFilterModeChange(option.value)}
+ >
+ {getMobileFilterIcon(option.value)}
+ <span className="min-w-0 flex-1 truncate">{option.label}</span>
+ </DropdownMenuItem>
+ ))}
+ </DropdownMenuSubContent>
+ </DropdownMenuSub>
+ <DropdownMenuSub>
+ <DropdownMenuSubTrigger className="text-sm">{t("memoList.sortTitle", { label: activeSortLabel })}</DropdownMenuSubTrigger>
+ <DropdownMenuSubContent className="w-44 border border-slate-200 bg-card py-1 shadow-md">
+ {memoSortOptions.map((option: any) => (
+ <DropdownMenuItem
+ key={option.value}
+ className={cn(
+ "flex h-9 w-full items-center gap-2 px-3 text-left text-sm cursor-pointer outline-none",
+ sortMode === option.value ? "bg-slate-100 text-slate-900" : "text-slate-700 hover:bg-slate-50",
+ )}
+ onClick={() => onSortModeChange(option.value)}
+ >
+ <span className="min-w-0 flex-1 truncate">{option.label}</span>
+ </DropdownMenuItem>
+ ))}
+ </DropdownMenuSubContent>
+ </DropdownMenuSub>
+ <DropdownMenuSub>
+ <DropdownMenuSubTrigger className="text-sm">{listDensity === "compact" ? t("memoList.compactList") : t("memoList.previewList")}</DropdownMenuSubTrigger>
+ <DropdownMenuSubContent className="w-40 border border-slate-200 bg-card py-1 shadow-md">
+ <DropdownMenuItem
+ className={cn("text-sm", listDensity === "preview" && "bg-slate-100 text-slate-900")}
+ onClick={() => handleListDensityChange("preview")}
+ >
+ <LayoutList className="h-4 w-4 text-slate-500" />
+ {t("memoList.previewList")}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ className={cn("text-sm", listDensity === "compact" && "bg-slate-100 text-slate-900")}
+ onClick={() => handleListDensityChange("compact")}
+ >
+ <List className="h-4 w-4 text-slate-500" />
+ {t("memoList.compactList")}
+ </DropdownMenuItem>
+ </DropdownMenuSubContent>
+ </DropdownMenuSub>
+ <DropdownMenuItem
+ className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
+ disabled={!canSyncMemos || isSyncingMemos}
+ onClick={onSyncMemos}
+ >
+ <RefreshCw className={cn("h-4 w-4 text-slate-500", isSyncingMemos && "animate-spin")} />
+ {syncMemosTitle}
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
+ onClick={onOpenTags}
+ >
+ <Tag className="h-4 w-4 text-slate-500" />
+ {t("memoList.tags")}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
+ onClick={onOpenAssets}
+ >
+ <Paperclip className="h-4 w-4 text-slate-500" />
+ {t("memoList.assets")}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
+ onClick={view === "trash" ? onEmptyTrash : onOpenTrash}
+ >
+ <Trash2 className="h-4 w-4 text-rose-700" />
+ {view === "trash" ? t("memoList.emptyTrash") : t("memoList.trash")}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ className="flex h-9 w-full items-center gap-2 px-3 text-left text-sm text-slate-700 hover:bg-slate-50 cursor-pointer outline-none"
+ onClick={onOpenSettings}
+ >
+ <KeyRound className="h-4 w-4 text-slate-500" />
+ MCP Token
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
<div className="flex shrink-0 items-center gap-2 lg:hidden">
{mobileFilterOptions.map((option: any) => (
<button
@@ -1469,7 +1417,7 @@ export const MemoListPane = ({
<div
ref={setListScrollNode}
- className="relative min-h-0 flex-1 overflow-y-auto p-3 pb-[calc(7rem+env(safe-area-inset-bottom))] lg:px-0 lg:pb-3 lg:[scrollbar-gutter:stable_both-edges]"
+ className="relative min-h-0 flex-1 overflow-y-auto p-3 pb-[calc(7rem+env(safe-area-inset-bottom))] lg:px-2 lg:py-2 lg:pb-3 lg:[scrollbar-gutter:stable_both-edges]"
>
{isLoading || (isRefreshing && memos.length === 0) ? (
<div className="px-2 py-4 text-sm text-slate-500">{t("memoList.fetchingLatest")}</div>
diff --git a/apps/web/src/components/MemoTitleInput.test.mjs b/apps/web/src/components/MemoTitleInput.test.mjs
index c32fd8be..1359bfa2 100644
--- a/apps/web/src/components/MemoTitleInput.test.mjs
+++ b/apps/web/src/components/MemoTitleInput.test.mjs
@@ -8,7 +8,7 @@ const diagramSource = readFileSync(new URL("./DiagramEditorPane.tsx", import.met
describe("shared memo title input", () => {
test("owns the title appearance and input constraints", () => {
expect(componentSource).toContain("text-sm font-semibold");
- expect(componentSource).toContain("sm:text-[15px]");
+ expect(componentSource).toContain("sm:text-base");
expect(componentSource).not.toContain("lg:text-[26px]");
expect(componentSource).toContain("focus-visible:bg-muted");
expect(componentSource).toContain("maxLength={160}");
diff --git a/apps/web/src/components/MemoTitleInput.tsx b/apps/web/src/components/MemoTitleInput.tsx
index e540c46d..2883cedc 100644
--- a/apps/web/src/components/MemoTitleInput.tsx
+++ b/apps/web/src/components/MemoTitleInput.tsx
@@ -23,7 +23,7 @@ export const MemoTitleInput = ({
{...props}
aria-label={ariaLabel ?? placeholder}
className={cn(
- "block w-full rounded-md border-0 bg-transparent px-2 py-1 text-sm font-semibold leading-tight text-slate-900 outline-none transition placeholder:text-slate-300 hover:bg-slate-100/60 focus-visible:bg-muted focus-visible:shadow-[inset_3px_0_0_var(--brand-green)] read-only:text-slate-600 read-only:hover:bg-transparent read-only:focus-visible:bg-transparent read-only:focus-visible:shadow-none sm:text-[15px]",
+ "block w-full rounded-md border-0 bg-transparent px-2 py-1 text-sm font-semibold leading-tight text-slate-900 outline-none transition placeholder:text-slate-300 hover:bg-slate-100/60 focus-visible:bg-muted focus-visible:shadow-[inset_3px_0_0_var(--brand-green)] read-only:text-slate-600 read-only:hover:bg-transparent read-only:focus-visible:bg-transparent read-only:focus-visible:shadow-none sm:text-base",
className
)}
maxLength={160}
diff --git a/apps/web/src/components/SystemInfoAccess.test.mjs b/apps/web/src/components/SystemInfoAccess.test.mjs
index 0eacb202..5d7c16c4 100644
--- a/apps/web/src/components/SystemInfoAccess.test.mjs
+++ b/apps/web/src/components/SystemInfoAccess.test.mjs
@@ -7,8 +7,9 @@ const settingsPaneSource = readFileSync(new URL("./SettingsPane.tsx", import.met
describe("system information access", () => {
test("keeps a compact-workspace entry in the editor overflow menu", () => {
expect(headerActionsSource).toMatch(
- /<DropdownMenuItem[\s\S]*?min-\[1600px\]:hidden[\s\S]*?handleSystemInfoOpenChange\(true\)[\s\S]*?systemInfo\.title[\s\S]*?<\/DropdownMenuItem>/,
+ /<DropdownMenuItem[\s\S]*?handleSystemInfoOpenChange\(true\)[\s\S]*?systemInfo\.title[\s\S]*?<\/DropdownMenuItem>/,
);
+ expect(headerActionsSource).not.toContain("min-[1600px]:inline-flex");
});
test("does not duplicate the entry in desktop settings", () => {
diff --git a/apps/web/src/components/ThemeProvider.tsx b/apps/web/src/components/ThemeProvider.tsx
index 8e6d9b46..c9dda8b4 100644
--- a/apps/web/src/components/ThemeProvider.tsx
+++ b/apps/web/src/components/ThemeProvider.tsx
@@ -157,7 +157,7 @@ const MARKDOWN_THEME_STORAGE_KEY = "edgeever.markdown-theme";
const EDITOR_THEME_STORAGE_KEY = "edgeever.editor-theme";
const CUSTOM_EDITOR_THEME_STORAGE_KEY = "edgeever.custom-editor-theme";
const CUSTOM_EDITOR_THEMES_STORAGE_KEY = "edgeever.custom-editor-themes";
-const LIGHT_THEME_COLOR = "#f8f9fa";
+const LIGHT_THEME_COLOR = "#eef1f4";
const DARK_THEME_COLOR = "#101311";
const AppearanceThemeContext = createContext<AppearanceThemeContextValue | null>(null);
const MermaidThemeContext = createContext<MermaidThemeContextValue | null>(null);
diff --git a/apps/web/src/lib/ui-palette.test.mjs b/apps/web/src/lib/ui-palette.test.mjs
index 77b0c4f1..5eed1f31 100644
--- a/apps/web/src/lib/ui-palette.test.mjs
+++ b/apps/web/src/lib/ui-palette.test.mjs
@@ -17,12 +17,12 @@ describe("application color system", () => {
expect(contrastRatio("#11694a", "#f0f8f4")).toBeGreaterThanOrEqual(4.5);
});
- test("keeps the light workspace achromatic while preserving text hierarchy", () => {
- expect(globals).toContain("--workspace-canvas: #f8f9fa;");
- expect(globals).toContain("--workspace-sidebar: #f8f9fa;");
- expect(globals).toContain("--workspace-memo-list: #fafafa;");
+ test("keeps the light workspace on a cool gray palette while preserving text hierarchy", () => {
+ expect(globals).toContain("--workspace-canvas: #eef1f4;");
+ expect(globals).toContain("--workspace-sidebar: #e7ebef;");
+ expect(globals).toContain("--workspace-memo-list: #f4f6f8;");
expect(globals).toContain("--workspace-editor: #ffffff;");
- expect(globals).toContain("--workspace-selection: #edf0f2;");
+ expect(globals).toContain("--workspace-selection: #dde3e9;");
expect(globals).toContain("--slate-500-rgb: 115 115 115;");
expect(globals).toContain("--slate-950-rgb: 10 10 10;");
expect(globals).toContain("--amber-50-rgb: 255 251 235;");
diff --git a/apps/web/src/styles/editor-typography.test.mjs b/apps/web/src/styles/editor-typography.test.mjs
index 7ecdd5bb..ce3bcbb5 100644
--- a/apps/web/src/styles/editor-typography.test.mjs
+++ b/apps/web/src/styles/editor-typography.test.mjs
@@ -19,8 +19,8 @@ const declarationsForSelector = (source, selectorSuffix) =>
describe("editor typography contract", () => {
test("keeps the shared body rhythm compact", () => {
- expect(MEMO_CONTENT_STYLE.body.lineHeight / MEMO_CONTENT_STYLE.body.fontSize).toBe(1.6);
- expect(MEMO_CONTENT_STYLE.body.paragraphSpacing).toBe(6);
+ expect(MEMO_CONTENT_STYLE.body.lineHeight / MEMO_CONTENT_STYLE.body.fontSize).toBe(1.625);
+ expect(MEMO_CONTENT_STYLE.body.paragraphSpacing).toBe(8);
});
test("configures punctuation squeezing and overflow wrapping for body text", () => {
diff --git a/apps/web/src/styles/globals.css b/apps/web/src/styles/globals.css
index 648c61ab..af86fbf6 100644
--- a/apps/web/src/styles/globals.css
+++ b/apps/web/src/styles/globals.css
@@ -285,13 +285,13 @@ html.dark[data-edgeever-environment="demo"] body::after {
--brand-green-800-rgb: 17 83 60;
--brand-green-900-rgb: 15 68 50;
--brand-green-950-rgb: 7 37 28;
- --workspace-canvas: #f8f9fa;
- --workspace-sidebar: #f8f9fa;
- --workspace-memo-list: #fafafa;
+ --workspace-canvas: #eef1f4;
+ --workspace-sidebar: #e7ebef;
+ --workspace-memo-list: #f4f6f8;
--workspace-editor: #ffffff;
- --workspace-divider: #e9ebed;
- --workspace-memo-divider: #edf0f2;
- --workspace-selection: #edf0f2;
+ --workspace-divider: #e1e5ea;
+ --workspace-memo-divider: #e6eaee;
+ --workspace-selection: #dde3e9;
--tooltip-bg: #1a1f1c;
--tooltip-fg: #f4f7f5;
--scrollbar-thumb: rgb(115 115 115 / 0.28);
@@ -332,9 +332,9 @@ html.dark[data-edgeever-environment="demo"] body::after {
--rose-950-rgb: 76 5 25;
--blue-600-rgb: 37 99 235;
--dark-surface-rgb: 255 255 255;
- --editor-body-font-size: 0.9375rem;
+ --editor-body-font-size: 1rem;
--edgeever-system-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Noto Sans SC", Inter, ui-sans-serif, system-ui, sans-serif;
- --editor-body-line-height: 1.6;
+ --editor-body-line-height: 1.625;
--editor-paragraph-spacing: 0.35rem;
--memo-content-divider-color: rgb(var(--brand-green-300-rgb));
--memo-content-divider-spacing: 1.5rem;
@@ -884,6 +884,7 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
margin: 0;
color: #27272a;
font-size: var(--editor-body-font-size);
+ letter-spacing: -0.005em;
line-height: var(--editor-body-line-height);
min-height: 100%;
outline: none;
@@ -1253,21 +1254,21 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
}
.ProseMirror h1 {
- font-size: 1.875rem;
- font-weight: 700;
+ font-size: 1.5rem;
+ font-weight: 650;
line-height: 1.28;
- letter-spacing: -0.022em;
+ letter-spacing: -0.02em;
margin: 0 0 0.85rem;
- color: #0f172a;
+ color: #1a1d21;
}
.ProseMirror h2 {
- font-size: 1.375rem;
+ font-size: 1.25rem;
font-weight: 650;
line-height: 1.32;
letter-spacing: -0.015em;
margin: 1.4rem 0 0.6rem;
- color: #0f172a;
+ color: #1a1d21;
}
.ProseMirror h3 {
@@ -1276,7 +1277,7 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
line-height: 1.38;
letter-spacing: -0.01em;
margin: 1.15rem 0 0.5rem;
- color: #1e293b;
+ color: #24282e;
}
.ProseMirror h4 {
@@ -1622,21 +1623,21 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
.ProseMirror blockquote {
margin: 0 0 1rem;
- border-left: 3px solid var(--brand-green);
- border-radius: 1px 4px 4px 1px;
- padding: 0.35rem 0.5rem 0.35rem 0.85rem;
- color: #334155;
- background: color-mix(in srgb, var(--brand-green) 4%, transparent);
+ border: 0;
+ border-radius: 8px;
+ padding: 0.75rem 1rem;
+ color: #3d4450;
+ background: #f3f5f7;
}
.ProseMirror code {
- border: 1px solid #d4ebdc;
+ border: 1px solid #e1e5ea;
border-radius: 4px;
- background: #f2f9f5;
+ background: #f3f5f7;
padding: 0.12rem 0.38rem;
font-size: 0.875em;
font-weight: 550;
- color: #0d5f3a;
+ color: #3d4450;
font-family: "JetBrains Mono", "Fira Code", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
}
@@ -2590,14 +2591,14 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
:root.dark .ProseMirror blockquote {
color: hsl(var(--foreground));
- background: color-mix(in srgb, var(--brand-green) 7%, transparent);
+ background: rgb(255 255 255 / 0.05);
}
:root.dark .ProseMirror code,
:root.dark .markdown-content code {
- border-color: rgb(var(--brand-green-rgb) / 0.28);
- background: rgb(var(--brand-green-rgb) / 0.1);
- color: var(--brand-green-text);
+ border-color: rgb(255 255 255 / 0.12);
+ background: rgb(255 255 255 / 0.06);
+ color: hsl(var(--foreground));
}
:root.dark .ProseMirror pre,
diff --git a/apps/web/src/styles/mobile-markdown-editor.css b/apps/web/src/styles/mobile-markdown-editor.css
index a15013ec..f5e54a66 100644
--- a/apps/web/src/styles/mobile-markdown-editor.css
+++ b/apps/web/src/styles/mobile-markdown-editor.css
@@ -631,11 +631,11 @@ html.dark .edgeever-mobile-tiptap-content a:hover {
}
.edgeever-mobile-tiptap-content blockquote {
- border-left: 3px solid #16a06e;
- border-radius: 1px 4px 4px 1px;
- padding: 0.35rem 0.5rem 0.35rem 0.85rem;
- color: #334155;
- background: color-mix(in srgb, #16a06e 4%, transparent);
+ border: 0;
+ border-radius: 8px;
+ padding: 0.75rem 1rem;
+ color: #3d4450;
+ background: #f3f5f7;
margin: 0 0 0.85em;
}
@@ -655,13 +655,13 @@ html.dark .edgeever-mobile-tiptap-content a:hover {
}
.edgeever-mobile-tiptap-content code {
- border: 1px solid #d4ebdc;
+ border: 1px solid #e1e5ea;
border-radius: 4px;
- background: #f2f9f5;
+ background: #f3f5f7;
padding: 0.12rem 0.38rem;
font-size: 0.875em;
font-weight: 550;
- color: #0d5f3a;
+ color: #3d4450;
font-family: "JetBrains Mono", "Fira Code", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
}
@@ -926,8 +926,8 @@ html.dark .edgeever-mobile-tiptap-content a:hover {
}
:root.dark .edgeever-mobile-tiptap-content blockquote {
- color: #cbd5e1;
- background: color-mix(in srgb, #16a06e 7%, transparent);
+ color: #e7e5e4;
+ background: rgb(255 255 255 / 0.05);
}
:root.dark .edgeever-mobile-tiptap-content th {
@@ -936,9 +936,9 @@ html.dark .edgeever-mobile-tiptap-content a:hover {
}
:root.dark .edgeever-mobile-tiptap-content code {
- border-color: rgba(22, 160, 110, 0.28);
- background: rgba(22, 160, 110, 0.12);
- color: #6ee7b7;
+ border-color: rgb(255 255 255 / 0.12);
+ background: rgb(255 255 255 / 0.06);
+ color: #e7e5e4;
}
:root.dark .edgeever-mobile-tiptap-content .edgeever-code-source {
diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.ts
index 6c9ef174..6151cbf5 100644
--- a/packages/shared/src/i18n/en-US.ts
+++ b/packages/shared/src/i18n/en-US.ts
@@ -2133,6 +2133,10 @@ export const enUS = {
deleteTable: "Delete table",
markdown: "Switch to Markdown source",
richText: "Switch to rich text",
+ reading: "Reading",
+ viewMode: "Note view",
+ appearance: "Appearance and style",
+ blockStyle: "Paragraph style",
markdownSource: "Markdown source",
markdownTheme: "Markdown source theme",
editorTheme: "Editor theme",
diff --git a/packages/shared/src/i18n/ja.ts b/packages/shared/src/i18n/ja.ts
index 9adbac94..406395af 100644
--- a/packages/shared/src/i18n/ja.ts
+++ b/packages/shared/src/i18n/ja.ts
@@ -2133,6 +2133,10 @@ export const ja = {
deleteTable: "表を削除",
markdown: "Markdown ソースに切り替え",
richText: "リッチテキストに切り替え",
+ reading: "閲覧",
+ viewMode: "ノートの表示",
+ appearance: "外観とスタイル",
+ blockStyle: "段落スタイル",
markdownSource: "Markdown ソース",
markdownTheme: "Markdown ソースのテーマ",
editorTheme: "エディタテーマ",
diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.ts
index f9c7e08f..a99025a2 100644
--- a/packages/shared/src/i18n/zh-CN.ts
+++ b/packages/shared/src/i18n/zh-CN.ts
@@ -2131,6 +2131,10 @@ export const zhCN = {
deleteTable: "删除表格",
markdown: "切换到 Markdown 源码",
richText: "切换到富文本编辑",
+ reading: "阅读",
+ viewMode: "笔记视图",
+ appearance: "外观与样式",
+ blockStyle: "段落样式",
markdownSource: "Markdown 源码",
markdownTheme: "Markdown 源码主题",
editorTheme: "编辑器主题",
diff --git a/packages/shared/src/memo-content-style.test.mjs b/packages/shared/src/memo-content-style.test.mjs
index 40c05ed8..3c0b3182 100644
--- a/packages/shared/src/memo-content-style.test.mjs
+++ b/packages/shared/src/memo-content-style.test.mjs
@@ -3,7 +3,7 @@ import { MEMO_CONTENT_STYLE } from "./memo-content-style.ts";
describe("shared memo content style", () => {
test("matches the established mobile PWA reading scale", () => {
- expect(MEMO_CONTENT_STYLE.body).toEqual({ fontSize: 15, lineHeight: 24, paragraphSpacing: 6 });
+ expect(MEMO_CONTENT_STYLE.body).toEqual({ fontSize: 16, lineHeight: 26, paragraphSpacing: 8 });
expect(MEMO_CONTENT_STYLE.divider).toEqual({
color: { dark: "#4ade80", light: "#66ca80" },
marginVertical: 24,
diff --git a/packages/shared/src/memo-content-style.ts b/packages/shared/src/memo-content-style.ts
index df10bff8..60e78a0b 100644
--- a/packages/shared/src/memo-content-style.ts
+++ b/packages/shared/src/memo-content-style.ts
@@ -1,8 +1,8 @@
export const MEMO_CONTENT_STYLE = {
body: {
- fontSize: 15,
- lineHeight: 24,
- paragraphSpacing: 6,
+ fontSize: 16,
+ lineHeight: 26,
+ paragraphSpacing: 8,
},
divider: {
color: {