From a8fd80eccd3add8ee5d76c8a066eed6922929587 Mon Sep 17 00:00:00 2001 From: Yukon <126093594+baseGame@users.noreply.github.com> Date: Wed, 14 Oct 2026 13:35:28 +0800 Subject: [PATCH 1/9] Restyle app chrome to match the HTML UI demo Align light-theme tokens, menu/status bars, session toolbars, Home cards/tree, and shared path inputs with the standalone HTML demo density and colors. Keep session handlers and Rust core untouched. --- src/layouts/AppLayout.vue | 82 ++++++------ src/styles/main.css | 202 ++++++++++++++++-------------- src/views/FolderCompareView.vue | 18 +-- src/views/FolderMergeView.vue | 30 ++--- src/views/FolderSyncView.vue | 26 ++-- src/views/HexCompareView.vue | 6 +- src/views/HomeView.vue | 186 ++++++++++++++------------- src/views/MediaCompareView.vue | 2 +- src/views/PictureCompareView.vue | 4 +- src/views/RegistryCompareView.vue | 4 +- src/views/TableCompareView.vue | 4 +- src/views/TextCompareView.vue | 4 +- src/views/TextEditView.vue | 4 +- src/views/TextMergeView.vue | 2 +- src/views/TextPatchView.vue | 4 +- src/views/VersionCompareView.vue | 4 +- 16 files changed, 300 insertions(+), 282 deletions(-) diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue index 671d3fa9..b544c7e9 100644 --- a/src/layouts/AppLayout.vue +++ b/src/layouts/AppLayout.vue @@ -2273,10 +2273,10 @@ const sourceSessionTypes = new Set([ min-width: 0; padding: 0; overflow: visible; - border-bottom: 1px solid #a0a0a0; + border-bottom: 1px solid #dcdcdc; - /* Capture title band ~#f0f0f0; menu row paints white over row 2. */ - background: #f0f0f0; + /* HTML demo menu band */ + background: #f0f3f9; } .menu-panel { @@ -2287,15 +2287,15 @@ const sourceSessionTypes = new Set([ display: grid; box-sizing: border-box; width: max-content; - min-width: 24rem; - max-width: min(36rem, calc(100vw - 24px)); + min-width: 280px; + max-width: min(360px, calc(100vw - 24px)); max-height: calc(100vh - 72px); - padding: 2px; + padding: 4px 0; overflow: hidden auto; border: 1px solid #a0a0a0; border-radius: 0; - background: var(--app-canvas); - box-shadow: 0 4px 12px rgb(25 28 30 / 0.16); + background: #f2f2f2; + box-shadow: 2px 2px 8px rgb(0 0 0 / 0.18); } /* Do not inherit .menus > button max-width: 9em — that crushed panel labels (#624). */ @@ -2346,7 +2346,7 @@ const sourceSessionTypes = new Set([ } .menu-panel button:hover { - background: var(--app-primary-soft); + background: #cce8ff; } .menu-panel button:disabled, @@ -2372,9 +2372,9 @@ const sourceSessionTypes = new Set([ } .menu-bar[data-menu-chrome='capture-1to1-residual'] .menus > .menu-group > button.active { - background: #c8e4ff; + background: #cce8ff; color: #000000; - box-shadow: inset 0 0 0 1px #89bdea; + box-shadow: inset 0 0 0 1px #99c9ef; } .menu-bar[data-menu-sep='capture-1to1-residual'] .menu-separator { @@ -2461,10 +2461,10 @@ const sourceSessionTypes = new Set([ gap: 0; min-width: 0; height: 24px; - padding: 0 2px; + padding: 0 4px; overflow: visible; - border-top: 1px solid #d0d0d0; - background: #ffffff; + border-top: 1px solid #dcdcdc; + background: #f0f3f9; } .menu-group { @@ -2503,7 +2503,7 @@ const sourceSessionTypes = new Set([ .menus > .menu-group > button:hover, .menus > .menu-group > button.active, .chrome-button:hover { - background: #eef4ff; + background: #dce8f8; } .top-actions { @@ -2708,7 +2708,7 @@ const sourceSessionTypes = new Set([ } .tab-strip[data-tab-strip-density='capture-1to1-residual'] { - background: #f0f0f0; + background: #f0f3f9; } .tab-strip[data-tab-strip-density='capture-1to1-residual'] .tab-chip { @@ -2888,15 +2888,15 @@ const sourceSessionTypes = new Set([ grid-template-columns: repeat(4, minmax(0, 1fr)); align-items: stretch; min-width: 0; - height: 19.5px; - min-height: 19.5px; + height: 26px; + min-height: 26px; padding: 0; - border-top: 1px solid #a0a0a0; - background: #f0f0f0; - color: #000000; - font-family: 'Segoe UI', 'Microsoft YaHei', sans-serif; + border-top: 1px solid #b8b8b8; + background: #d4d4d4; + color: #1a1a1a; + font-family: 'Segoe UI', 'Microsoft YaHei UI', 'PingFang SC', sans-serif; font-size: 11px; - line-height: 18px; + line-height: 24px; } .status-bar[data-status-band='capture-1to1-residual'] .status-bar-pane { @@ -2911,10 +2911,10 @@ const sourceSessionTypes = new Set([ .status-bar[data-chrome-kind='folder-pair'] { /* Capture Folder Compare panes (DPR≈2): 222 | 131 | 222.5 | 39 | 222 | 131 | fr */ grid-template-columns: 222px 131px 222.5px 39px 222px 131px minmax(0, 1fr); - height: 19.5px; - min-height: 19.5px; + height: 26px; + min-height: 26px; font-size: 11px; - line-height: 18px; + line-height: 24px; } .status-bar[data-chrome-kind='folder-pair'] .status-bar-pane { @@ -2933,10 +2933,10 @@ const sourceSessionTypes = new Set([ .status-bar[data-chrome-kind='folder-sync'] { /* Capture Folder Sync panes (DPR≈2): 266.5 | 268.5 | 118 | 268 | fr */ grid-template-columns: 266.5px 268.5px 118px 268px minmax(0, 1fr); - height: 19.5px; - min-height: 19.5px; + height: 26px; + min-height: 26px; font-size: 11px; - line-height: 18px; + line-height: 24px; } .status-bar[data-chrome-kind='folder-sync'] .status-bar-pane { @@ -2958,10 +2958,10 @@ const sourceSessionTypes = new Set([ 0, 1fr ); - height: 19.5px; - min-height: 19.5px; + height: 26px; + min-height: 26px; font-size: 11px; - line-height: 18px; + line-height: 24px; } .status-bar[data-chrome-kind='folder-merge'] .status-bar-pane { @@ -2986,10 +2986,10 @@ const sourceSessionTypes = new Set([ .status-bar[data-chrome-kind='table-session'], .status-bar[data-chrome-kind='registry-session'], .status-bar[data-chrome-kind='clipboard-session'] { - height: 19.5px; - min-height: 19.5px; + height: 26px; + min-height: 26px; font-size: 11px; - line-height: 18px; + line-height: 24px; } .status-bar[data-chrome-kind='text-session'] .status-bar-pane, @@ -3037,10 +3037,10 @@ const sourceSessionTypes = new Set([ .status-bar[data-chrome-kind='text-edit-session'] { grid-template-columns: 91.5px minmax(0, 1fr); - height: 19.5px; - min-height: 19.5px; + height: 26px; + min-height: 26px; font-size: 11px; - line-height: 18px; + line-height: 24px; } .status-bar[data-chrome-kind='text-edit-session'] .status-bar-pane { @@ -3275,15 +3275,15 @@ html[data-show-sidebar='1'] .sidebar { .app-shell-dense-chrome:has(.status-bar[data-chrome-kind='folder-sync']), .app-shell-dense-chrome:has(.status-bar[data-chrome-kind='folder-merge']), .app-shell-dense-chrome:has(.status-bar[data-chrome-kind$='-session']) { - /* Single capture menu row; status track toward capture ~19.5px (DPR≈2). */ - grid-template-rows: 23.5px minmax(0, 1fr) 19.5px; + /* Dense menu row; status track matches HTML demo ~26px. */ + grid-template-rows: 23.5px minmax(0, 1fr) 26px; } .app-shell:not(.app-shell-dense-chrome):has(.status-bar[data-chrome-kind='folder-pair']), .app-shell:not(.app-shell-dense-chrome):has(.status-bar[data-chrome-kind='folder-sync']), .app-shell:not(.app-shell-dense-chrome):has(.status-bar[data-chrome-kind='folder-merge']), .app-shell:not(.app-shell-dense-chrome):has(.status-bar[data-chrome-kind$='-session']) { - grid-template-rows: 48px minmax(0, 1fr) 19.5px; + grid-template-rows: 48px minmax(0, 1fr) 26px; } .app-shell-dense-chrome .menu-bar { diff --git a/src/styles/main.css b/src/styles/main.css index c091051a..2db9c32b 100644 --- a/src/styles/main.css +++ b/src/styles/main.css @@ -1,37 +1,42 @@ :root { color-scheme: light; + /* Aligned with standalone HTML demo chrome tokens (css/demo.css). */ --app-bg: #ffffff; --app-canvas: #ffffff; --app-surface: #f0f0f0; --app-surface-low: #ececec; --app-surface-muted: #e6e6e6; - --app-surface-container: #eeeeee; + --app-surface-container: #f9f9f9; --app-surface-high: #dedede; - --app-surface-highest: #c7dff6; - --app-border: #c0c0c0; - --app-border-soft: rgb(176 182 190 / 0.62); - --app-text: #111111; - --app-text-muted: #3f3f46; - --app-text-faint: #737373; - --app-primary: #2b75bd; - --app-primary-strong: #66b9ff; - --app-primary-soft: #c8e4ff; - --app-status: #f0f0f0; - --app-status-text: #111111; + --app-surface-highest: #cce8ff; + --app-border: #c8c8c8; + --app-border-soft: #dcdcdc; + --app-text: #1a1a1a; + --app-text-muted: #666666; + --app-text-faint: #888888; + --app-primary: #0078d4; + --app-primary-strong: #0563c1; + --app-primary-soft: #cce8ff; + --app-status: #d4d4d4; + --app-status-text: #1a1a1a; + --app-menu: #f0f3f9; + --app-title: #f1f3f9; + --app-sidebar: #f5f5f5; + --app-row-hover: #f0f7ff; + --app-row-sel: #cce8ff; --diff-added-bg: #f4fff4; --diff-added-fg: #005f18; --diff-deleted-bg: #ffe3e3; - --diff-deleted-fg: #e00000; + --diff-deleted-fg: #c00000; --diff-modified-bg: #ffe3e3; - --diff-modified-fg: #e00000; + --diff-modified-fg: #c00000; --diff-conflict-bg: #f0ddff; --diff-conflict-fg: #8a158a; --diff-gutter-bg: #efefef; - --font-mono: 'JetBrains Mono', 'Cascadia Mono', consolas, monospace; - --app-font-family: - 'Segoe UI', 'PingFang SC', 'Microsoft YaHei', ui-sans-serif, system-ui, sans-serif; - --app-font-size: 18px; + --font-mono: 'Consolas', 'Cascadia Mono', 'Menlo', monospace; + --app-font-family: 'Segoe UI', 'Microsoft YaHei UI', 'PingFang SC', system-ui, sans-serif; + --app-font-size: 13px; } html[data-theme='dark'] { @@ -148,8 +153,8 @@ select { } .workbench-shell-single-session .bc-session-toolbar { - min-height: 39.5px; - border-bottom: 1px solid #a0a0a0; + min-height: 56px; + border-bottom: 1px solid #c8c8c8; background: #f0f0f0; } @@ -158,18 +163,18 @@ select { } .workbench-shell-single-session .bc-toolbar-command { - min-width: 59px; - height: 37.5px; - padding: 1px 2px 2px; + min-width: 52px; + height: 48px; + padding: 2px 6px; } .workbench-shell-single-session .bc-session-toolbar-compact { - min-height: 32px; + min-height: 40px; } .workbench-shell-single-session .bc-session-toolbar-compact .bc-toolbar-command { - min-width: 40px; - height: 32px; + min-width: 44px; + height: 36px; } .app-shell-single-session .tab-strip { @@ -189,9 +194,9 @@ select { .app-shell-single-session .folder-toolbar .path-pair { gap: 0 !important; - min-height: 20px !important; - padding: 0 1px !important; - border-bottom: 1px solid #a0a0a0 !important; + min-height: 28px !important; + padding: 4px 8px !important; + border-bottom: 1px solid #c8c8c8 !important; background: #f0f0f0 !important; } @@ -210,8 +215,8 @@ select { .app-shell-single-session .folder-toolbar .path-pair .path-field-row > input, .app-shell-single-session .folder-toolbar .path-pair .path-field-row > .path-input { - height: 16.5px !important; - min-height: 16.5px !important; + height: 24px !important; + min-height: 24px !important; border-radius: 0 !important; font-size: 12px !important; } @@ -322,15 +327,15 @@ select { .bc-session-toolbar { display: flex; align-items: stretch; - gap: 0; + gap: 2px; min-width: 0; - min-height: 39.5px; - padding: 1px 2px; + min-height: 56px; + padding: 4px 8px; overflow: auto hidden; - border-bottom: 1px solid #a0a0a0; + border-bottom: 1px solid #c8c8c8; - /* Capture MainBar band is white, not app-surface gray */ - background: #ffffff; + /* Demo toolbar band */ + background: #f0f0f0; } /* Text Merge capture MainBar wraps to ~2×38px (~83px CSS at DPR≈2) instead of horizontal-only scroll. */ @@ -423,25 +428,26 @@ select { .bc-toolbar-command { display: grid; - grid-template-rows: 20px auto; - align-content: center; - justify-items: center; - box-sizing: border-box; + grid-template-rows: 22px auto; flex: 0 0 auto; + gap: 2px; width: auto; - min-width: 59px; + min-width: 52px; max-width: 88px; - height: 37.5px; - padding: 1px 2px 2px; + height: 48px; + padding: 2px 6px; overflow: hidden; - border: 0; - border-right: 0; + border: 1px solid transparent; + border-radius: 3px; background: transparent; color: #1a1a1a; font-size: 11px; line-height: 12px; white-space: nowrap; cursor: default; + align-content: center; + justify-items: center; + box-sizing: border-box; } .bc-toolbar-command > span, @@ -456,14 +462,16 @@ select { /* Capture MainBar active: ~#cce8ff fill, ~#a5c7f7 edge */ .bc-toolbar-command-active { - border-radius: 2px; + border-radius: 3px; + border-color: #99c9ef; background: #cce8ff; - box-shadow: inset 0 0 0 1px #a5c7f7; + box-shadow: none; } .bc-toolbar-command:hover:not(:disabled) { - border-radius: 2px; - background: #e5f2fc; + border-radius: 3px; + border-color: #c8c8c8; + background: #e8e8e8; } .bc-toolbar-command-active:hover:not(:disabled) { @@ -491,15 +499,15 @@ select { } .bc-session-toolbar-compact { - min-height: 39.5px; + min-height: 40px; } .bc-session-toolbar-compact .bc-toolbar-command { - grid-template-rows: 20px auto; - min-width: 48px; + grid-template-rows: 18px auto; + min-width: 44px; max-width: 80px; - height: 37.5px; - padding: 1px 2px; + height: 36px; + padding: 1px 4px; font-size: 10px; line-height: 11px; } @@ -1172,8 +1180,8 @@ select { flex: 1 1 auto !important; width: auto !important; min-width: 0 !important; - height: 16.5px !important; - min-height: 16.5px !important; + height: 24px !important; + min-height: 24px !important; padding: 0 4px !important; overflow: hidden !important; font-size: 12px !important; @@ -1470,7 +1478,7 @@ select { } .folder-filter-pattern { - height: 16.5px !important; + height: 24px !important; padding: 0 6px !important; border: 1px solid #a0a0a0 !important; border-radius: 0 !important; @@ -1490,15 +1498,15 @@ select { .folder-filter-strip-btn { display: grid !important; - grid-template-rows: 20px auto !important; + grid-template-rows: 22px auto !important; align-content: center !important; justify-items: center !important; box-sizing: border-box !important; - width: 59px !important; - min-width: 59px !important; - max-width: 59px !important; - height: 37.5px !important; - padding: 1px 2px 2px !important; + width: 52px !important; + min-width: 52px !important; + max-width: 72px !important; + height: 48px !important; + padding: 2px 6px !important; border: 0 !important; border-right: 1px solid #c0c0c0 !important; background: transparent !important; @@ -1624,7 +1632,7 @@ select { .split-pane-header, .pane-header, .metadata-header { - min-height: 16.5px !important; + min-height: 24px !important; padding: 1px 3px !important; border-color: #c7cbd1 !important; border-radius: 0 !important; @@ -1964,7 +1972,7 @@ html[data-show-path-bars='0'] .path-pair-bar { } .folder-compare-view .tree-row.selected { - background: #a8cdf1 !important; + background: #cce8ff !important; outline: 0 !important; } @@ -2049,7 +2057,7 @@ html[data-show-path-bars='0'] .path-pair-bar { } .folder-sync-view .sync-row-selected { - background: #a8cdf1 !important; + background: #cce8ff !important; } .folder-sync-view .folder-session-log { @@ -2093,7 +2101,7 @@ html[data-show-path-bars='0'] .path-pair-bar { .folder-merge-view .merge-plan-row.selected { outline: 0 !important; - background: #a8cdf1 !important; + background: #cce8ff !important; } .folder-merge-view .folder-session-log { @@ -2411,8 +2419,8 @@ html[data-show-path-bars='0'] .path-pair-bar { } .picture-compare-view .picture-path-panel input { - height: 16.5px !important; - min-height: 16.5px !important; + height: 24px !important; + min-height: 24px !important; padding: 0 4px !important; font-size: 12px !important; } @@ -2724,8 +2732,8 @@ html[data-show-path-bars='0'] .path-pair-bar { } .media-compare-view .media-path-panel input { - height: 16.5px !important; - min-height: 16.5px !important; + height: 24px !important; + min-height: 24px !important; padding: 0 4px !important; border-radius: 0 !important; font-size: 12px !important; @@ -2958,8 +2966,8 @@ html[data-show-path-bars='0'] .path-pair-bar { } .version-compare-view .version-path-panel input { - height: 16.5px !important; - min-height: 16.5px !important; + height: 24px !important; + min-height: 24px !important; padding: 0 6px !important; border: 1px solid #a0a0a0 !important; border-radius: 0 !important; @@ -3167,8 +3175,8 @@ html[data-show-path-bars='0'] .path-pair-bar { } .registry-compare-view .path-field-row .path-input { - height: 16.5px !important; - min-height: 16.5px !important; + height: 24px !important; + min-height: 24px !important; } .registry-compare-view .registry-input-panel textarea { @@ -3672,7 +3680,7 @@ html[data-show-path-bars='0'] .path-pair-bar { } .text-compare-view .bc-path-row input { - height: 16.5px !important; + height: 24px !important; padding: 0 4px !important; font-size: 12px !important; } @@ -3825,7 +3833,7 @@ html[data-show-path-bars='0'] .path-pair-bar { } .text-merge-view .output-path-input { - height: 16.5px !important; + height: 24px !important; padding: 0 4px !important; border-radius: 0 !important; font-size: 12px !important; @@ -3954,8 +3962,8 @@ html[data-show-path-bars='0'] .path-pair-bar { } .folder-sync-view .path-field-row .path-input { - height: 16.5px !important; - min-height: 16.5px !important; + height: 24px !important; + min-height: 24px !important; } .folder-sync-view .sync-setting-actions { @@ -4088,26 +4096,26 @@ html[data-show-path-bars='0'] .path-pair-bar { .folder-sync-view .folder-filter-chrome[data-filters-align='capture-1to1-residual'] { gap: 4px 6px !important; - min-height: 37.5px !important; + min-height: 48px !important; } .folder-sync-view .folder-filter-chrome { - min-height: 37.5px !important; + min-height: 48px !important; padding: 0 4px !important; border-bottom: 1px solid #a0a0a0 !important; background: #f0f0f0 !important; } .folder-sync-view .folder-filter-chrome[data-sync-filters-place='capture-1to1-residual'] { - min-height: 37.5px !important; + min-height: 48px !important; background: #f0f0f0 !important; } .folder-sync-view .sync-filter-pattern-field .folder-filter-pattern[data-sync-pattern-place='capture-1to1-residual'] { - height: 16.5px !important; - min-height: 16.5px !important; + height: 24px !important; + min-height: 24px !important; padding: 0 6px !important; border-radius: 0 !important; font-size: 12px !important; @@ -4128,8 +4136,8 @@ html[data-show-path-bars='0'] .path-pair-bar { } .folder-merge-view .merge-paths input { - height: 16.5px !important; - min-height: 16.5px !important; + height: 24px !important; + min-height: 24px !important; padding: 0 4px !important; border-radius: 2px !important; font-size: 11px !important; @@ -4146,8 +4154,8 @@ html[data-show-path-bars='0'] .path-pair-bar { .folder-merge-view .merge-to-chrome .path-input, .folder-merge-view .merge-to-chrome input[type='text'] { - height: 16.5px !important; - min-height: 16.5px !important; + height: 24px !important; + min-height: 24px !important; padding: 0 4px !important; font-size: 11px !important; } @@ -4184,8 +4192,8 @@ html[data-show-path-bars='0'] .path-pair-bar { .n-button[data-testid='folder-merge-same-ok'] { width: 64.5px !important; min-width: 64.5px !important; - height: 37.5px !important; - min-height: 37.5px !important; + height: 48px !important; + min-height: 48px !important; padding: 0 4px !important; font-size: 11px !important; } @@ -4195,8 +4203,8 @@ html[data-show-path-bars='0'] .path-pair-bar { .n-button[data-testid='folder-merge-peek'] { width: 59px !important; min-width: 59px !important; - height: 37.5px !important; - min-height: 37.5px !important; + height: 48px !important; + min-height: 48px !important; padding: 0 4px !important; font-size: 11px !important; } @@ -4478,8 +4486,8 @@ html[data-show-path-bars='0'] .path-pair-bar { } .text-edit-view .path-input { - height: 16.5px !important; - min-height: 16.5px !important; + height: 24px !important; + min-height: 24px !important; } .text-edit-view .toolbar-button { @@ -4547,8 +4555,8 @@ html[data-show-path-bars='0'] .path-pair-bar { .text-patch-view .path-field-row input, .text-patch-view .path-field-row .path-input { - height: 16.5px !important; - min-height: 16.5px !important; + height: 24px !important; + min-height: 24px !important; padding: 0 4px !important; border-radius: 0 !important; font-size: 12px !important; diff --git a/src/views/FolderCompareView.vue b/src/views/FolderCompareView.vue index 5d38ca32..b368d1cd 100644 --- a/src/views/FolderCompareView.vue +++ b/src/views/FolderCompareView.vue @@ -5077,7 +5077,7 @@ onUnmounted(() => { .path-pair input { width: 100%; min-width: 0; - height: 16.5px; + height: 24px; padding: 0 4px; overflow: hidden; border: 1px solid var(--app-border); @@ -5156,14 +5156,14 @@ onUnmounted(() => { .folder-filter-strip-btn { display: grid; - grid-template-rows: 20px auto; + grid-template-rows: 22px auto; align-content: center; justify-items: center; box-sizing: border-box; - width: 59px; - min-width: 59px; - max-width: 59px; - height: 37.5px; + width: 52px; + min-width: 52px; + max-width: 72px; + height: 48px; padding: 1px 2px 2px; border: 0; border-right: 1px solid #c0c0c0; @@ -5206,7 +5206,7 @@ onUnmounted(() => { .folder-filter-pattern { flex: 1 1 180px; min-width: 120px; - height: 16.5px; + height: 24px; padding: 0 6px; border: 1px solid #a0a0a0; border-radius: 0; @@ -5231,7 +5231,7 @@ onUnmounted(() => { .manual-alignment-tools select { min-width: 220px; - height: 16.5px; + height: 24px; padding: 0 4px; border: 1px solid var(--app-border); border-radius: 0; @@ -5658,7 +5658,7 @@ onUnmounted(() => { } .tree-row.selected { - background: #a8cdf1; + background: #cce8ff; outline: 0; } diff --git a/src/views/FolderMergeView.vue b/src/views/FolderMergeView.vue index e40184a4..fec59a57 100644 --- a/src/views/FolderMergeView.vue +++ b/src/views/FolderMergeView.vue @@ -2990,8 +2990,8 @@ h1 { .merge-paths input { width: 100%; - height: 16.5px; - min-height: 16.5px; + height: 24px; + min-height: 24px; padding: 0 4px; overflow: hidden; border: 1px solid var(--app-border); @@ -3041,8 +3041,8 @@ h1 { .merge-to-path .path-input, .merge-to-path input { - height: 16.5px; - min-height: 16.5px; + height: 24px; + min-height: 24px; padding: 0 4px; font-size: 11px; } @@ -3051,8 +3051,8 @@ h1 { :deep(.n-button[data-testid='folder-merge-same-ok']) { width: 64.5px; min-width: 64.5px; - height: 37.5px; - min-height: 37.5px; + height: 48px; + min-height: 48px; padding: 0 4px; border-radius: 0; font-size: 11px; @@ -3062,8 +3062,8 @@ h1 { :deep(.n-button[data-testid='folder-merge-peek']) { width: 59px; min-width: 59px; - height: 37.5px; - min-height: 37.5px; + height: 48px; + min-height: 48px; padding: 0 4px; border-radius: 0; font-size: 11px; @@ -3387,7 +3387,7 @@ h1 { .merge-plan-row.selected { outline: 0; - background: #a8cdf1; + background: #cce8ff; } .folder-session-log { @@ -3508,14 +3508,14 @@ h1 { .folder-filter-strip-btn { display: grid; - grid-template-rows: 20px auto; + grid-template-rows: 22px auto; align-content: center; justify-items: center; box-sizing: border-box; - width: 59px; - min-width: 59px; - max-width: 59px; - height: 37.5px; + width: 52px; + min-width: 52px; + max-width: 72px; + height: 48px; padding: 1px 4px 2px; border: 0; border-right: 1px solid #c0c0c0; @@ -3558,7 +3558,7 @@ h1 { .folder-filter-pattern { flex: 1 1 auto; min-width: 0; - height: 16.5px; + height: 24px; padding: 0 6px; border: 1px solid #c0c0c0; border-radius: 0; diff --git a/src/views/FolderSyncView.vue b/src/views/FolderSyncView.vue index 63757e28..1808cd77 100644 --- a/src/views/FolderSyncView.vue +++ b/src/views/FolderSyncView.vue @@ -2451,8 +2451,8 @@ h1 { .path-field-row .path-input { flex: 1; min-width: 0; - height: 16.5px; - min-height: 16.5px; + height: 24px; + min-height: 24px; } .sync-settings { @@ -2471,8 +2471,8 @@ h1 { .sync-filter-pattern-field .folder-filter-pattern { width: 100%; - height: 16.5px; - min-height: 16.5px; + height: 24px; + min-height: 24px; padding: 0 6px; border: 1px solid #c0c0c0; border-radius: 0; @@ -2496,7 +2496,7 @@ h1 { .sync-settings input, .sync-settings select { width: 100%; - height: 16.5px; + height: 24px; padding: 0 4px; border: 1px solid var(--app-border); border-radius: 2px; @@ -2808,7 +2808,7 @@ h1 { } .sync-row-selected { - background: #a8cdf1; + background: #cce8ff; } .folder-session-log { @@ -2910,7 +2910,7 @@ h1 { .folder-filter-chrome { align-items: center; - min-height: 37.5px; + min-height: 48px; padding: 0 4px; border-bottom: 1px solid #a0a0a0; background: #f0f0f0; @@ -2934,14 +2934,14 @@ h1 { .folder-filter-strip-btn { display: grid; - grid-template-rows: 20px auto; + grid-template-rows: 22px auto; align-content: center; justify-items: center; box-sizing: border-box; - width: 59px; - min-width: 59px; - max-width: 59px; - height: 37.5px; + width: 52px; + min-width: 52px; + max-width: 72px; + height: 48px; padding: 1px 4px 2px; border: 0; border-right: 1px solid #c0c0c0; @@ -2984,7 +2984,7 @@ h1 { .folder-filter-pattern { flex: 1 1 auto; min-width: 0; - height: 16.5px; + height: 24px; padding: 0 6px; border: 1px solid #c0c0c0; border-radius: 0; diff --git a/src/views/HexCompareView.vue b/src/views/HexCompareView.vue index cf4f2675..e1071d84 100644 --- a/src/views/HexCompareView.vue +++ b/src/views/HexCompareView.vue @@ -1627,8 +1627,8 @@ h2 { .hex-wrap-controls button { width: 100%; min-width: 0; - height: 16.5px; - min-height: 16.5px; + height: 24px; + min-height: 24px; padding: 0 6px; border: 1px solid #a0a0a0; border-radius: 0; @@ -2008,7 +2008,7 @@ h2 { .hex-path-field .path-input { flex: 1 1 auto; min-width: 0; - height: 16.5px; + height: 24px; padding: 0 4px; border: 1px solid #a0a0a0; border-radius: 0; diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 7c9a7be9..da0205f9 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -651,7 +651,7 @@ onMounted(() => {