Skip to content

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

fix(editor): harmonize image controls with neutral UI

tianma-if5c23144d0cea
diff --git a/apps/web/src/components/editor/ResizableImage.tsx b/apps/web/src/components/editor/ResizableImage.tsx
index d42529e7..99e1c87a 100644
--- a/apps/web/src/components/editor/ResizableImage.tsx
+++ b/apps/web/src/components/editor/ResizableImage.tsx
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState, type MouseEvent, type Pointer
import { mergeAttributes } from "@tiptap/core";
import Image from "@tiptap/extension-image";
import { NodeViewWrapper, ReactNodeViewRenderer, useEditorState, type NodeViewProps } from "@tiptap/react";
-import { AlignLeft, AlignCenter, AlignRight, Maximize2 } from "lucide-react";
+import { AlignLeft, AlignCenter, AlignRight, Maximize2, MoveHorizontal } from "lucide-react";
import { useTranslation } from "react-i18next";
import { getImageReferrerPolicy, IMAGE_GALLERY_NODE_TYPE, imageAlignmentMargins, parseImageAlignment, type ImageAlignment } from "@edgeever/shared";
import {
@@ -349,6 +349,19 @@ const ResizableImageNodeView = ({
<TooltipContent side="top">{t(`editor.imageAlignments.${value}`)}</TooltipContent>
</Tooltip>
))}
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <button
+ type="button"
+ className="edgeever-image-resize-handle"
+ aria-label={t("editor.resizeImage")}
+ onPointerDown={startResize}
+ >
+ <MoveHorizontal aria-hidden="true" className="h-4 w-4" />
+ </button>
+ </TooltipTrigger>
+ <TooltipContent side="top">{t("editor.resizeImage")}</TooltipContent>
+ </Tooltip>
</div>
</TooltipProvider>
{canGroupAdjacentImages ? (
@@ -362,19 +375,6 @@ const ResizableImageNodeView = ({
<span>{t("editor.imageGallery.group")}</span>
</button>
) : null}
- <TooltipProvider delayDuration={0} skipDelayDuration={0}>
- <Tooltip>
- <TooltipTrigger asChild>
- <button
- type="button"
- className="edgeever-image-resize-handle"
- aria-label={t("editor.resizeImage")}
- onPointerDown={startResize}
- />
- </TooltipTrigger>
- <TooltipContent side="top">{t("editor.resizeImage")}</TooltipContent>
- </Tooltip>
- </TooltipProvider>
</>)}
</div>
<div ref={actionsRef} className="edgeever-image-resource-actions" />
diff --git a/apps/web/src/styles/globals.css b/apps/web/src/styles/globals.css
index 5b59f691..e3df2a3b 100644
--- a/apps/web/src/styles/globals.css
+++ b/apps/web/src/styles/globals.css
@@ -1981,12 +1981,12 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
height: auto;
object-fit: contain;
margin: 1rem 0;
- border: 1px solid var(--brand-green-border);
+ border: 1px solid hsl(var(--border));
border-radius: 8px;
}
.ProseMirror img.ProseMirror-selectednode {
- outline: 2px solid var(--brand-green);
+ outline: 2px solid rgb(var(--slate-500-rgb) / 0.6);
outline-offset: 3px;
}
@@ -1998,7 +1998,7 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
height: clamp(12rem, 42vw, 28rem);
overflow: hidden;
margin: 1rem 0;
- border: 1px solid var(--brand-green-border);
+ border: 1px solid hsl(var(--border));
border-radius: 8px;
background:
linear-gradient(110deg, transparent 24%, rgb(255 255 255 / 0.72) 42%, transparent 60%) -18rem 0 / 18rem 100% no-repeat,
@@ -2038,9 +2038,9 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
transform: translateX(-50%);
border: 1px solid rgb(var(--slate-300-rgb) / 0.8);
border-radius: 999px;
- background: rgb(255 255 255 / 0.92);
+ background: hsl(var(--card));
padding: 0.4rem 0.75rem;
- color: #475569;
+ color: hsl(var(--foreground));
box-shadow: 0 4px 16px rgb(15 23 42 / 0.12);
font-size: 0.75rem;
font-weight: 600;
@@ -2051,8 +2051,8 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
.ProseMirror .edgeever-image-upload-placeholder__spinner {
width: 0.85rem;
height: 0.85rem;
- border: 2px solid rgb(var(--brand-green-rgb) / 0.2);
- border-top-color: var(--brand-green);
+ border: 2px solid rgb(var(--slate-500-rgb) / 0.2);
+ border-top-color: rgb(var(--slate-500-rgb));
border-radius: 999px;
animation: edgeever-image-placeholder-spin 700ms linear infinite;
}
@@ -2065,7 +2065,7 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
min-height: 3.5rem;
margin: 0.5rem 0;
padding: 0.75rem 1rem;
- border: 1px solid var(--brand-green-border);
+ border: 1px solid hsl(var(--border));
border-radius: 0.75rem;
background: rgb(var(--slate-100-rgb) / 0.55);
box-shadow: 0 1px 3px rgb(15 23 42 / 0.08);
@@ -2077,7 +2077,7 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
flex: none;
width: 1.4rem;
height: 1.4rem;
- color: var(--brand-green);
+ color: rgb(var(--slate-500-rgb));
}
.ProseMirror .edgeever-file-upload-placeholder__icon svg {
@@ -2137,7 +2137,7 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
}
.ProseMirror .edgeever-image-node.is-selected img {
- outline: 2px solid var(--brand-green);
+ outline: 2px solid rgb(var(--slate-500-rgb) / 0.6);
outline-offset: 3px;
}
@@ -2151,11 +2151,11 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
margin-top: 0.5rem;
align-items: center;
gap: 0.35rem;
- border: 1px solid rgba(var(--brand-green-200-rgb), 0.95);
+ border: 1px solid hsl(var(--border));
border-radius: 8px;
background: hsl(var(--card));
padding: 0.3rem;
- box-shadow: 0 10px 28px rgba(15, 23, 42, 0.16);
+ box-shadow: 0 10px 28px rgba(15, 23, 42, 0.1);
line-height: 1;
color: hsl(var(--foreground));
font-family: var(--ui-font-family, Inter, ui-sans-serif, system-ui, sans-serif);
@@ -2175,7 +2175,7 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
.ProseMirror .edgeever-image-resource-actions:not(:empty) {
width: 100%;
- border-top: 1px solid rgba(var(--brand-green-200-rgb), 0.95);
+ border-top: 1px solid hsl(var(--border));
padding-top: 0.3rem;
}
@@ -2184,11 +2184,11 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
right: 0.5rem;
top: 0.5rem;
z-index: 2;
- border: 1px solid rgba(var(--brand-green-200-rgb), 0.95);
+ border: 1px solid hsl(var(--border));
border-radius: 8px;
- background: rgba(255, 255, 255, 0.94);
+ background: hsl(var(--card));
padding: 0.3rem;
- box-shadow: 0 10px 28px rgba(15, 23, 42, 0.16);
+ box-shadow: 0 10px 28px rgba(15, 23, 42, 0.1);
line-height: 1;
opacity: 0;
pointer-events: none;
@@ -2286,7 +2286,7 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
}
.ProseMirror .edgeever-image-gallery__group + .edgeever-image-gallery__group {
- border-inline-start: 1px solid rgba(var(--brand-green-200-rgb), 0.95);
+ border-inline-start: 1px solid hsl(var(--border));
padding-inline-start: 0.25rem;
}
@@ -2299,11 +2299,11 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
margin-bottom: 0.5rem;
align-items: center;
gap: 0.25rem;
- border: 1px solid rgba(var(--brand-green-200-rgb), 0.95);
+ border: 1px solid hsl(var(--border));
border-radius: 8px;
- background: rgba(255, 255, 255, 0.96);
+ background: hsl(var(--card));
padding: 0.3rem;
- box-shadow: 0 10px 28px rgba(15, 23, 42, 0.16);
+ box-shadow: 0 10px 28px rgba(15, 23, 42, 0.1);
}
.ProseMirror .edgeever-image-gallery__button {
@@ -2311,21 +2311,24 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
height: 2rem;
border-radius: 6px;
padding: 0 0.5rem;
- color: #475569;
+ color: hsl(var(--foreground));
font-size: 0.75rem;
font-weight: 650;
line-height: 1;
}
-.ProseMirror .edgeever-image-gallery__button:hover,
+.ProseMirror .edgeever-image-gallery__button:hover {
+ background: var(--workspace-hover);
+}
+
.ProseMirror .edgeever-image-gallery__button:focus-visible,
.ProseMirror .edgeever-image-gallery__button.is-active {
- background: var(--brand-green-muted);
- color: var(--brand-green-text);
+ background: color-mix(in srgb, var(--workspace-selection) 65%, hsl(var(--card)));
+ color: hsl(var(--foreground));
}
.ProseMirror .edgeever-image-gallery__button:focus-visible {
- outline: 2px solid var(--brand-green);
+ outline: 2px solid rgb(var(--slate-500-rgb));
outline-offset: 1px;
}
@@ -2350,17 +2353,17 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
align-items: center;
justify-content: center;
border-radius: 6px;
- color: #475569;
+ color: hsl(var(--foreground));
}
.ProseMirror .edgeever-image-preview-button:hover,
.ProseMirror .edgeever-image-preview-button:focus-visible {
- background: var(--brand-green-muted);
- color: var(--brand-green-text);
+ background: var(--workspace-hover);
+ color: hsl(var(--foreground));
}
.ProseMirror .edgeever-image-preview-button:focus-visible {
- outline: 2px solid var(--brand-green);
+ outline: 2px solid rgb(var(--slate-500-rgb));
outline-offset: 2px;
}
@@ -2393,17 +2396,22 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
align-items: center;
justify-content: center;
border-radius: 6px;
- color: #475569;
+ color: hsl(var(--foreground));
+}
+
+.ProseMirror .edgeever-image-alignment:hover {
+ background: var(--workspace-hover);
}
-.ProseMirror .edgeever-image-alignment:hover,
.ProseMirror .edgeever-image-alignment.is-active {
- background: var(--brand-green-muted);
- color: var(--brand-green-text);
+ background: color-mix(in srgb, var(--workspace-selection) 65%, hsl(var(--card)));
+ color: hsl(var(--foreground));
}
-.ProseMirror .edgeever-image-alignment:focus-visible {
- outline: 2px solid var(--brand-green);
+.ProseMirror .edgeever-image-alignment:focus-visible,
+.ProseMirror .edgeever-image-preset:focus-visible,
+.ProseMirror .edgeever-image-resize-handle:focus-visible {
+ outline: 2px solid rgb(var(--slate-500-rgb));
outline-offset: 2px;
}
@@ -2414,29 +2422,36 @@ html[data-edgeever-extension-theme] .edgeever-memo-divider {
align-items: center;
justify-content: center;
border-radius: 6px;
- color: #475569;
+ color: hsl(var(--foreground));
font-size: 0.75rem;
font-weight: 700;
}
-.ProseMirror .edgeever-image-preset:hover,
+.ProseMirror .edgeever-image-preset:hover {
+ background: var(--workspace-hover);
+}
+
.ProseMirror .edgeever-image-preset.is-active {
- background: var(--brand-green-muted);
- color: var(--brand-green-text);
+ background: color-mix(in srgb, var(--workspace-selection) 65%, hsl(var(--card)));
+ color: hsl(var(--foreground));
}
.ProseMirror .edgeever-image-resize-handle {
- width: 1.75rem;
- height: 1.75rem;
+ display: inline-flex;
+ width: 2rem;
+ height: 2rem;
+ flex: 0 0 2rem;
+ align-items: center;
+ justify-content: center;
border-radius: 6px;
- background:
- linear-gradient(135deg, transparent 46%, var(--brand-green) 48%, var(--brand-green) 54%, transparent 56%),
- linear-gradient(135deg, transparent 62%, rgba(var(--brand-green-600-rgb), 0.8) 64%, rgba(var(--brand-green-600-rgb), 0.8) 70%, transparent 72%);
+ background: transparent;
+ color: hsl(var(--foreground));
cursor: ew-resize;
+ touch-action: none;
}
.ProseMirror .edgeever-image-resize-handle:hover {
- background-color: var(--brand-green-muted);
+ background-color: var(--workspace-hover);
}
.ProseMirror.edgeever-note-rich-editor p.is-empty::before {