diff --git a/apps/client/src/stylesheets/theme-next-dark.css b/apps/client/src/stylesheets/theme-next-dark.css index dbecf4631..150a3ffc6 100644 --- a/apps/client/src/stylesheets/theme-next-dark.css +++ b/apps/client/src/stylesheets/theme-next-dark.css @@ -74,11 +74,12 @@ --select-arrow-svg: url("data:image/svg+xml,"); --select-group-heading-text-color: gray; - --link-hover-background: #ffffff26; - --link-hover-color: white; + --link-color: #95c3d9; + --link-hover-background: #75c2e324; + --link-hover-color: var(--link-color); --hover-item-text-color: #efefef; - --hover-item-background-color: #ffffff24; + --hover-item-background-color: #ffffff16; --hover-item-border-color: transparent; --active-item-text-color: var(--left-pane-text-color); @@ -170,7 +171,7 @@ --protected-session-active-icon-color: #8edd8e; --sync-status-error-pulse-color: #f47871; - --classic-toolbar-vert-layout-background-color: var(--main-background-color); + --classic-toolbar-vert-layout-background-color: #ffffff0d; --classic-toolbar-horiz-layout-background-color: var(--main-background-color); --center-pane-vert-layout-background-color-bgfx: #0c0c0c69; @@ -202,6 +203,12 @@ --badge-background-color: #ffffff1a; --badge-text-color: var(--muted-text-color); + --badge-temporaraily-editable-background-color: #297331; + --badge-read-only-background-color: #af4340; + --badge-share-background-color: #4d4d4d; + --badge-clipped-note-background-color: #295773; + --badge-execute-background-color: #604180; + --note-icon-background-color: #444444; --note-icon-color: #d4d4d4; --note-icon-hover-background-color: #555555; @@ -234,8 +241,6 @@ --selection-background-color: #3399FF70; - --link-color: lightskyblue; - --mermaid-theme: dark; --code-block-box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.6); diff --git a/apps/client/src/stylesheets/theme-next-light.css b/apps/client/src/stylesheets/theme-next-light.css index c40b4c5ed..c5828ab17 100644 --- a/apps/client/src/stylesheets/theme-next-light.css +++ b/apps/client/src/stylesheets/theme-next-light.css @@ -74,8 +74,9 @@ --select-arrow-svg: url("data:image/svg+xml,"); --select-group-heading-text-color: gray; - --link-hover-background: #00000012; - --link-hover-color: black; + --link-color: #0076af; + --link-hover-background: #3c7fa017; + --link-hover-color: var(--link-color); --hover-item-text-color: black; --hover-item-background-color: #0000001a; @@ -194,6 +195,12 @@ --badge-background-color: #00000011; --badge-text-color: var(--muted-text-color); + --badge-temporaraily-editable-background-color: #35a64c; + --badge-read-only-background-color: #c8302c; + --badge-share-background-color: #6b6b6b; + --badge-clipped-note-background-color: #2284c0; + --badge-execute-background-color: #7b47af; + --note-icon-background-color: #4f4f4f; --note-icon-color: white; --note-icon-hover-background-color: #737373; @@ -232,8 +239,6 @@ --selection-background-color: #3399FF70; - --link-color: blue; - --mermaid-theme: default; --code-block-box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.1), 0px 0px 2px rgba(0, 0, 0, 0.2); diff --git a/apps/client/src/stylesheets/theme-next/forms.css b/apps/client/src/stylesheets/theme-next/forms.css index 2d87245d7..abe65e911 100644 --- a/apps/client/src/stylesheets/theme-next/forms.css +++ b/apps/client/src/stylesheets/theme-next/forms.css @@ -637,8 +637,8 @@ body a.tn-link:visited, border-radius: 4px; background: var(--background); color: var(--link-color); - font-weight: normal; - text-decoration: underline; + font-weight: 500; + text-decoration: none; transition: background-color 200ms ease-out, @@ -657,6 +657,7 @@ body a.tn-link:hover, box-shadow: 0 0 0 4px var(--link-hover-background); --background: var(--link-hover-background); color: var(--link-hover-color); + text-decoration: underline; transition: background-color 100ms ease-in, diff --git a/apps/client/src/translations/cn/translation.json b/apps/client/src/translations/cn/translation.json index 47ad9e2d4..4ff56779b 100644 --- a/apps/client/src/translations/cn/translation.json +++ b/apps/client/src/translations/cn/translation.json @@ -1551,7 +1551,11 @@ }, "highlights_list_2": { "title": "高亮列表", - "options": "选项" + "options": "选项", + "title_with_count_other": "{{count}} 处高亮", + "modal_title": "配置高亮列表", + "menu_configure": "配置高亮列表...", + "no_highlights": "未找到高亮内容。" }, "quick-search": { "placeholder": "快速搜索", @@ -1622,7 +1626,8 @@ }, "toc": { "table_of_contents": "目录", - "options": "选项" + "options": "选项", + "no_headings": "无标题。" }, "watched_file_update_status": { "file_last_modified": "文件 最后修改时间为 。", @@ -2189,5 +2194,11 @@ "hoisted_badge": "聚焦", "create_new_note": "新建子笔记", "empty_hide_archived_notes": "隐藏已存档的笔记" + }, + "right_pane": { + "empty_button": "隐藏面板", + "toggle": "切换右侧面板", + "custom_widget_go_to_source": "跳转到源码", + "empty_message": "这篇笔记没有展示内容" } } diff --git a/apps/client/src/translations/ja/translation.json b/apps/client/src/translations/ja/translation.json index fd47a4347..b4478749c 100644 --- a/apps/client/src/translations/ja/translation.json +++ b/apps/client/src/translations/ja/translation.json @@ -387,7 +387,7 @@ "show_toc": "目次を表示" }, "show_highlights_list_widget_button": { - "show_highlights_list": "ハイライト一覧を表示" + "show_highlights_list": "ハイライトリストを表示" }, "relation_map_buttons": { "zoom_out_title": "ズームアウト", @@ -919,7 +919,7 @@ "underline": "下線", "color": "カラーテキスト", "bg_color": "背景色付きテキスト", - "visibility_title": "ハイライトリスト表示", + "visibility_title": "ハイライトリストの表示", "visibility_description": "#hideHighlightWidget ラベルを追加することで、ノートごとにハイライトウィジェットを非表示にできます。", "shortcut_info": "設定 -> ショートカット（右ペイン切り替え）で、右ペイン（ハイライトを含む）を素早く切り替えるキーボードショートカットを設定できます。" }, @@ -932,7 +932,8 @@ }, "toc": { "table_of_contents": "目次", - "options": "オプション" + "options": "オプション", + "no_headings": "見出しはありません。" }, "text_auto_read_only_size": { "title": "自動読み取り専用のサイズ", @@ -1201,7 +1202,11 @@ }, "highlights_list_2": { "title": "ハイライトリスト", - "options": "オプション" + "options": "オプション", + "title_with_count_other": "{{count}} ハイライト", + "modal_title": "ハイライトリストの設定", + "menu_configure": "ハイライトリストの設定...", + "no_highlights": "ハイライトが見つかりません。" }, "quick-search": { "placeholder": "クイック検索", @@ -2189,5 +2194,11 @@ "scroll_to_top_title": "ノートの先頭にジャンプ", "create_new_note": "新しい子ノートを作成", "empty_hide_archived_notes": "アーカイブされたノートを非表示" + }, + "right_pane": { + "empty_message": "このノートには何も表示されません", + "empty_button": "パネルを非表示", + "toggle": "右パネルを切り替え", + "custom_widget_go_to_source": "ソースコードへ移動" } } diff --git a/apps/client/src/translations/tw/translation.json b/apps/client/src/translations/tw/translation.json index 286144632..43aa33dfa 100644 --- a/apps/client/src/translations/tw/translation.json +++ b/apps/client/src/translations/tw/translation.json @@ -690,7 +690,8 @@ "convert_into_attachment_successful": "筆記 '{{title}}' 已成功轉換為附件。", "convert_into_attachment_prompt": "確定要將筆記 '{{title}}' 轉換為父級筆記的附件嗎？", "print_pdf": "匯出為 PDF…", - "open_note_on_server": "在伺服器上開啟筆記" + "open_note_on_server": "在伺服器上開啟筆記", + "view_revisions": "筆記歷史版本..." }, "onclick_button": { "no_click_handler": "按鈕元件'{{componentId}}'沒有定義點擊時的處理方式" diff --git a/apps/client/src/widgets/layout/NoteBadges.css b/apps/client/src/widgets/layout/NoteBadges.css index fa3bc504f..39fafd90e 100644 --- a/apps/client/src/widgets/layout/NoteBadges.css +++ b/apps/client/src/widgets/layout/NoteBadges.css @@ -11,11 +11,11 @@ --badge-radius: 12px; .ext-badge { - &.temporarily-editable-badge { --color: #4fa52b; } - &.read-only-badge { --color: #e33f3b; } - &.share-badge { --color: #3b82f6; } - &.clipped-note-badge { --color: #57a2a5; } - &.execute-badge { --color: #f59e0b; } + &.temporarily-editable-badge {--color: var(--badge-temporaraily-editable-background-color)} + &.read-only-badge {--color: var(--badge-read-only-background-color);} + &.share-badge {--color: var(--badge-share-background-color);} + &.clipped-note-badge {--color: var(--badge-clipped-note-background-color);} + &.execute-badge {--color: var(--badge-execute-background-color);} } .dropdown-badge { diff --git a/apps/client/src/widgets/note_title.css b/apps/client/src/widgets/note_title.css index fe3e0e912..637661095 100644 --- a/apps/client/src/widgets/note_title.css +++ b/apps/client/src/widgets/note_title.css @@ -80,6 +80,18 @@ body.experimental-feature-new-layout { .ext-badge .text { display: none; } + + .ext-badge { + --size: 2em; + width: var(--size); + height: var(--size); + padding: 0; + + .bx { + opacity: 1; + margin: 0; + } + }; } } diff --git a/apps/client/src/widgets/react/Badge.css b/apps/client/src/widgets/react/Badge.css index cf8542a11..cf661b4f9 100644 --- a/apps/client/src/widgets/react/Badge.css +++ b/apps/client/src/widgets/react/Badge.css @@ -1,15 +1,20 @@ .ext-badge { display: flex; + height: 1.9em; align-items: center; - padding: 2px 6px; + justify-content: center; border-radius: var(--badge-radius); + padding-inline: 8px; font-size: 0.75em; + letter-spacing: .2pt; background-color: var(--color, transparent); color: white; min-width: 0; flex-shrink: 1; + white-space: collapse; - &.clickable { + &.clickable, + .dropdown-badge & { cursor: pointer; &:hover { @@ -17,12 +22,20 @@ } } + .bx { + font-size: 1.2em; + margin-inline-end: 4px; + opacity: .6; + } + a { color: inherit !important; text-decoration: none; } > * { + display: flex; + align-items: center; min-width: 0; overflow: hidden; text-overflow: ellipsis; diff --git a/apps/client/src/widgets/react/Badge.tsx b/apps/client/src/widgets/react/Badge.tsx index f45f377e5..e76700b61 100644 --- a/apps/client/src/widgets/react/Badge.tsx +++ b/apps/client/src/widgets/react/Badge.tsx @@ -36,7 +36,7 @@ export function Badge({ icon, className, text, tooltip, href, ...containerProps }); const content = <> - {icon && <> } + {icon && } {text} ; diff --git a/apps/server/etapi.openapi.yaml b/apps/server/etapi.openapi.yaml index 12567c410..a3990754a 100644 --- a/apps/server/etapi.openapi.yaml +++ b/apps/server/etapi.openapi.yaml @@ -268,6 +268,7 @@ paths: enum: - html - markdown + - share default: html get: description: Exports ZIP file export of a given note subtree. To export whole document, use "root" for noteId