From 2768b76278fe2fac9fdda1e29f83407f8a620dc1 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 20 Sep 2025 16:36:43 +0300 Subject: [PATCH 01/14] style(next)/horizontal layout: tweak the show/hide tree button --- apps/client/src/stylesheets/theme-next/shell.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/client/src/stylesheets/theme-next/shell.css b/apps/client/src/stylesheets/theme-next/shell.css index 9dbb04c9f..6e46e876a 100644 --- a/apps/client/src/stylesheets/theme-next/shell.css +++ b/apps/client/src/stylesheets/theme-next/shell.css @@ -881,7 +881,10 @@ body.mobile .fancytree-node > span { } .tab-row-container .toggle-button { - margin: 6px 10px !important; + --icon-button-size: 30px; + --icon-button-icon-ratio: .6; + + margin: 3px 6px auto 8px !important; } .tab-row-container { @@ -911,7 +914,7 @@ body.electron.background-effects.layout-horizontal .tab-row-container .toggle-bu bottom: 0; left: -10px; right: -10px; - top: 29px; + top: 32px; height: 1px; border-bottom: 1px solid var(--launcher-pane-horiz-border-color); } From d276cdf5192d4bc713f95db2e57d0e80999abb46 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 20 Sep 2025 17:05:06 +0300 Subject: [PATCH 02/14] style/floating buttons: fix the offset of the "Show buttons" button on canvas notes --- apps/client/src/widgets/FloatingButtons.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/client/src/widgets/FloatingButtons.css b/apps/client/src/widgets/FloatingButtons.css index 41afefed9..f4fc8a092 100644 --- a/apps/client/src/widgets/FloatingButtons.css +++ b/apps/client/src/widgets/FloatingButtons.css @@ -6,8 +6,8 @@ .floating-buttons-children, .show-floating-buttons { position: absolute; - top: 10px; - right: 10px; + top: var(--floating-buttons-vert-offset, 10px); + right: var(--floating-buttons-horiz-offset, 10px); display: flex; flex-direction: row; z-index: 100; @@ -28,8 +28,8 @@ transform: rotate(180deg); } -.type-canvas .floating-buttons-children { - top: 70px; +.type-canvas { + --floating-buttons-vert-offset: 70px; } .type-canvas .floating-buttons-children > * { From 0bb10cf3ee5e47f121dee82ca9078b920eaf8b59 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 20 Sep 2025 21:50:27 +0300 Subject: [PATCH 03/14] style/global menu button: tweak appearance --- .../src/widgets/buttons/global_menu.css | 48 +++++++++++++------ 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/apps/client/src/widgets/buttons/global_menu.css b/apps/client/src/widgets/buttons/global_menu.css index 920308dea..24814e26b 100644 --- a/apps/client/src/widgets/buttons/global_menu.css +++ b/apps/client/src/widgets/buttons/global_menu.css @@ -8,31 +8,49 @@ min-width: 20em; } -.global-menu-button { +button.global-menu-button { + position: relative; width: 100% !important; height: 100% !important; - position: relative; + border: none; padding: 6px; - border: 0; +} + +.global-menu-button svg { + transition: transform 300ms ease-in-out; +} + +.global-menu-button:active svg, +.global-menu-button.show svg { + transform: scale(0.85); } .global-menu-button svg path { fill: var(--launcher-pane-text-color); } -.global-menu-button:hover { border: 0; } -.global-menu-button:hover svg path { - transition: 200ms ease-in-out fill; +.global-menu-button:hover { + border: none; } -.global-menu-button:hover svg path.st0 { fill:#95C980; } -.global-menu-button:hover svg path.st1 { fill:#72B755; } -.global-menu-button:hover svg path.st2 { fill:#4FA52B; } -.global-menu-button:hover svg path.st3 { fill:#EE8C89; } -.global-menu-button:hover svg path.st4 { fill:#E96562; } -.global-menu-button:hover svg path.st5 { fill:#E33F3B; } -.global-menu-button:hover svg path.st6 { fill:#EFB075; } -.global-menu-button:hover svg path.st7 { fill:#E99547; } -.global-menu-button:hover svg path.st8 { fill:#E47B19; } + +.global-menu-button:hover svg path, +.global-menu-button.show svg path { + transition: 300ms linear fill; +} + +.global-menu-button svg path { + transition: fill 1000ms ease-out; +} + +.global-menu-button:is(:hover, .show) svg path.st0 { fill:#95C980; transition-delay: 0ms; } +.global-menu-button:is(:hover, .show) svg path.st1 { fill:#72B755; transition-delay: 75ms; } +.global-menu-button:is(:hover, .show) svg path.st2 { fill:#4FA52B; transition-delay: 150ms; } +.global-menu-button:is(:hover, .show) svg path.st3 { fill:#EE8C89; transition-delay: 225ms; } +.global-menu-button:is(:hover, .show) svg path.st4 { fill:#E96562; transition-delay: 300ms; } +.global-menu-button:is(:hover, .show) svg path.st5 { fill:#E33F3B; transition-delay: 375ms; } +.global-menu-button:is(:hover, .show) svg path.st6 { fill:#EFB075; transition-delay: 450ms; } +.global-menu-button:is(:hover, .show) svg path.st7 { fill:#E99547; transition-delay: 525ms; } +.global-menu-button:is(:hover, .show) svg path.st8 { fill:#E47B19; transition-delay: 600ms; } .global-menu-button-update-available { position: absolute; From 754b95876e04b3d472a80f59bcd76a0416436756 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 20 Sep 2025 22:04:37 +0300 Subject: [PATCH 04/14] style/global menu button: tweak appearance --- apps/client/src/widgets/buttons/global_menu.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/client/src/widgets/buttons/global_menu.css b/apps/client/src/widgets/buttons/global_menu.css index 24814e26b..1faa9d2e0 100644 --- a/apps/client/src/widgets/buttons/global_menu.css +++ b/apps/client/src/widgets/buttons/global_menu.css @@ -43,14 +43,14 @@ button.global-menu-button { } .global-menu-button:is(:hover, .show) svg path.st0 { fill:#95C980; transition-delay: 0ms; } -.global-menu-button:is(:hover, .show) svg path.st1 { fill:#72B755; transition-delay: 75ms; } -.global-menu-button:is(:hover, .show) svg path.st2 { fill:#4FA52B; transition-delay: 150ms; } -.global-menu-button:is(:hover, .show) svg path.st3 { fill:#EE8C89; transition-delay: 225ms; } -.global-menu-button:is(:hover, .show) svg path.st4 { fill:#E96562; transition-delay: 300ms; } -.global-menu-button:is(:hover, .show) svg path.st5 { fill:#E33F3B; transition-delay: 375ms; } -.global-menu-button:is(:hover, .show) svg path.st6 { fill:#EFB075; transition-delay: 450ms; } -.global-menu-button:is(:hover, .show) svg path.st7 { fill:#E99547; transition-delay: 525ms; } -.global-menu-button:is(:hover, .show) svg path.st8 { fill:#E47B19; transition-delay: 600ms; } +.global-menu-button:is(:hover, .show) svg path.st1 { fill:#72B755; transition-delay: 50ms; } +.global-menu-button:is(:hover, .show) svg path.st2 { fill:#4FA52B; transition-delay: 100ms; } +.global-menu-button:is(:hover, .show) svg path.st3 { fill:#EE8C89; transition-delay: 200ms; } +.global-menu-button:is(:hover, .show) svg path.st4 { fill:#E96562; transition-delay: 250ms; } +.global-menu-button:is(:hover, .show) svg path.st5 { fill:#E33F3B; transition-delay: 300ms; } +.global-menu-button:is(:hover, .show) svg path.st6 { fill:#EFB075; transition-delay: 400ms; } +.global-menu-button:is(:hover, .show) svg path.st7 { fill:#E99547; transition-delay: 450ms; } +.global-menu-button:is(:hover, .show) svg path.st8 { fill:#E47B19; transition-delay: 500ms; } .global-menu-button-update-available { position: absolute; From d0d166e4261ecee7d3874e7516951d291f88e091 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 20 Sep 2025 22:07:59 +0300 Subject: [PATCH 05/14] style/global menu button: tweak appearance --- apps/client/src/widgets/buttons/global_menu.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/client/src/widgets/buttons/global_menu.css b/apps/client/src/widgets/buttons/global_menu.css index 1faa9d2e0..2f229ff13 100644 --- a/apps/client/src/widgets/buttons/global_menu.css +++ b/apps/client/src/widgets/buttons/global_menu.css @@ -22,7 +22,7 @@ button.global-menu-button { .global-menu-button:active svg, .global-menu-button.show svg { - transform: scale(0.85); + transform: scale(0.85) rotate(-10deg); } .global-menu-button svg path { From 6745b887fb7885a299a9c16da2f63d7964446ad7 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 20 Sep 2025 22:46:56 +0300 Subject: [PATCH 06/14] style/global menu button: fix the focus indicator --- apps/client/src/widgets/buttons/global_menu.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/client/src/widgets/buttons/global_menu.css b/apps/client/src/widgets/buttons/global_menu.css index 2f229ff13..2145b76f9 100644 --- a/apps/client/src/widgets/buttons/global_menu.css +++ b/apps/client/src/widgets/buttons/global_menu.css @@ -16,12 +16,13 @@ button.global-menu-button { padding: 6px; } -.global-menu-button svg { +.global-menu-button svg > g { + transform-origin: center; transition: transform 300ms ease-in-out; } -.global-menu-button:active svg, -.global-menu-button.show svg { +.global-menu-button:active svg > g, +.global-menu-button.show svg > g{ transform: scale(0.85) rotate(-10deg); } From 25905ebff7c454feaad11f95d126c652b1fef083 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sun, 21 Sep 2025 01:34:11 +0300 Subject: [PATCH 07/14] style/dropdowns: tweak the appearance of keyboard selected items --- apps/client/src/stylesheets/style.css | 6 +++--- apps/client/src/stylesheets/theme-next/base.css | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.css index e1299bca0..2036f0bd8 100644 --- a/apps/client/src/stylesheets/style.css +++ b/apps/client/src/stylesheets/style.css @@ -475,9 +475,9 @@ body #context-menu-container .dropdown-item > span { .dropdown-item.active, .dropdown-item:focus { - color: var(--active-item-text-color) !important; - background-color: var(--active-item-background-color) !important; - border-color: var(--active-item-border-color) !important; + color: var(--active-item-text-color); + background-color: var(--active-item-background-color); + border-color: var(--active-item-border-color); outline: none; } diff --git a/apps/client/src/stylesheets/theme-next/base.css b/apps/client/src/stylesheets/theme-next/base.css index 50bc058a0..9488332bc 100644 --- a/apps/client/src/stylesheets/theme-next/base.css +++ b/apps/client/src/stylesheets/theme-next/base.css @@ -160,6 +160,16 @@ body.mobile .dropdown-submenu .dropdown-toggle { cursor: default !important; } +:root .dropdown-item:focus-visible { + outline: 2px solid var(--input-focus-outline-color) !important; + background-color: transparent; + color: unset; +} + +:root .dropdown-item:active { + background: unset; +} + body.mobile .dropdown-submenu { padding: 0 !important; } From 8b65de24420e64bd26f973b0d81e144e0b30b0dd Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sun, 21 Sep 2025 01:44:08 +0300 Subject: [PATCH 08/14] style/editor forms/text inputs: fix the hover state background color overriding the focused state background color --- apps/client/src/stylesheets/theme-next/forms.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/client/src/stylesheets/theme-next/forms.css b/apps/client/src/stylesheets/theme-next/forms.css index 44a11cbbb..b5cf73428 100644 --- a/apps/client/src/stylesheets/theme-next/forms.css +++ b/apps/client/src/stylesheets/theme-next/forms.css @@ -197,8 +197,8 @@ input[type="password"]:focus, input[type="date"]:focus, input[type="time"]:focus, input[type="datetime-local"]:focus, -:root input.ck.ck-input-text:focus, -:root input.ck.ck-input-number:focus, +:root input.ck.ck-input-text:not([readonly="true"]):focus, +:root input.ck.ck-input-number:not([readonly="true"]):focus, textarea.form-control:focus, textarea:focus, :root textarea.ck.ck-textarea:focus, From fd054693d9baafa689c7910558b2e37933b090ff Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sun, 21 Sep 2025 01:54:44 +0300 Subject: [PATCH 09/14] style(next)/note map: fix the broken padding of the "Fix nodes" button --- apps/client/src/stylesheets/theme-next/pages.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/client/src/stylesheets/theme-next/pages.css b/apps/client/src/stylesheets/theme-next/pages.css index 9816f21fb..11da67ea2 100644 --- a/apps/client/src/stylesheets/theme-next/pages.css +++ b/apps/client/src/stylesheets/theme-next/pages.css @@ -109,6 +109,10 @@ * NOTE MAP */ +.note-detail-note-map .fixnodes-type-switcher .tn-tool-button { + padding: unset; +} + .note-detail-note-map .fixnodes-type-switcher .tn-tool-button.toggled { color: var(--tab-close-button-hover-background); } From 6cfc6509f63fc91cc6c3098aa40e20cc50627e5c Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sun, 21 Sep 2025 02:09:55 +0300 Subject: [PATCH 10/14] style(next)/quick search/results dropdown: add a temporary workaround for the broken backdrop effect when the background effects are active --- apps/client/src/stylesheets/theme-next/shell.css | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/client/src/stylesheets/theme-next/shell.css b/apps/client/src/stylesheets/theme-next/shell.css index 6e46e876a..ecb204bf9 100644 --- a/apps/client/src/stylesheets/theme-next/shell.css +++ b/apps/client/src/stylesheets/theme-next/shell.css @@ -577,15 +577,21 @@ div.quick-search .search-button.show { transition: background-color 100ms ease-out !important; } -/* - * Quick search results - */ - div.quick-search .dropdown-menu { --quick-search-item-delimiter-color: transparent; --menu-item-icon-vert-offset: -.065em; } +/* + * TO FIX: The quick search results dropdown has a backdrop issue with the tree panel + * when background effects are enabled in Electron. + * As a temporary workaround, the backdrop and transparency are disabled for the + * vertical layout. + */ +body.layout-vertical.background-effects div.quick-search .dropdown-menu { + --menu-background-color: var(--menu-background-color-no-backdrop); +} + /* Item */ .quick-search .dropdown-menu *.dropdown-item { padding: 8px 12px !important; From 9fb37968f8f79cc48f48a439b8489f0c1a6f3712 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sun, 21 Sep 2025 02:18:33 +0300 Subject: [PATCH 11/14] style(next)/quick search/results dropdown: temporary workaround - improve appearance --- apps/client/src/stylesheets/theme-next/shell.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/client/src/stylesheets/theme-next/shell.css b/apps/client/src/stylesheets/theme-next/shell.css index ecb204bf9..b4007975c 100644 --- a/apps/client/src/stylesheets/theme-next/shell.css +++ b/apps/client/src/stylesheets/theme-next/shell.css @@ -589,7 +589,9 @@ div.quick-search .dropdown-menu { * vertical layout. */ body.layout-vertical.background-effects div.quick-search .dropdown-menu { - --menu-background-color: var(--menu-background-color-no-backdrop); + --scrollbar-background-color: var(--menu-background-color-no-backdrop); + + background: var(--menu-background-color-no-backdrop) !important; } /* Item */ From 91b6910a9c7dd611a8b36807c7b45ae4c12ece0d Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sun, 21 Sep 2025 02:25:49 +0300 Subject: [PATCH 12/14] style(next)/horizontal layout launcher: increase the contrast of icons for the dark theme --- apps/client/src/stylesheets/theme-next-dark.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/client/src/stylesheets/theme-next-dark.css b/apps/client/src/stylesheets/theme-next-dark.css index 9b1bafaa8..649f13190 100644 --- a/apps/client/src/stylesheets/theme-next-dark.css +++ b/apps/client/src/stylesheets/theme-next-dark.css @@ -152,7 +152,7 @@ --launcher-pane-horiz-border-color: rgb(22, 22, 22); --launcher-pane-horiz-background-color: #282828; - --launcher-pane-horiz-text-color: #909090; + --launcher-pane-horiz-text-color: #c7c7c7; --launcher-pane-horiz-button-hover-color: #ffffff; --launcher-pane-horiz-button-hover-background: #ffffff1c; --launcher-pane-horiz-button-hover-shadow: unset; From 9cde4c26d992dc268ca367e2b8a2e62d01a3b125 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sun, 21 Sep 2025 02:28:27 +0300 Subject: [PATCH 13/14] style(next)/horizontal layout launcher: increase the contrast of icons for the dark theme --- apps/client/src/stylesheets/theme-next-dark.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/client/src/stylesheets/theme-next-dark.css b/apps/client/src/stylesheets/theme-next-dark.css index 649f13190..a621e9daf 100644 --- a/apps/client/src/stylesheets/theme-next-dark.css +++ b/apps/client/src/stylesheets/theme-next-dark.css @@ -152,7 +152,7 @@ --launcher-pane-horiz-border-color: rgb(22, 22, 22); --launcher-pane-horiz-background-color: #282828; - --launcher-pane-horiz-text-color: #c7c7c7; + --launcher-pane-horiz-text-color: #b8b8b8; --launcher-pane-horiz-button-hover-color: #ffffff; --launcher-pane-horiz-button-hover-background: #ffffff1c; --launcher-pane-horiz-button-hover-shadow: unset; From 51692aabd5a51dbcf949225838442b8a90527652 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sun, 21 Sep 2025 03:09:39 +0300 Subject: [PATCH 14/14] style(next)/dropdowns: fix scrollbar broken corners --- apps/client/src/stylesheets/style.css | 2 +- apps/client/src/stylesheets/theme-next/base.css | 4 ---- apps/client/src/stylesheets/theme-next/shell.css | 6 ++---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.css index 2036f0bd8..84276e9c4 100644 --- a/apps/client/src/stylesheets/style.css +++ b/apps/client/src/stylesheets/style.css @@ -363,7 +363,7 @@ button kbd { .tabulator-popup-container { color: var(--menu-text-color) !important; font-size: inherit; - background-color: var(--menu-background-color) !important; + background: var(--menu-background-color) !important; user-select: none; -webkit-user-select: none; --bs-dropdown-zindex: 999; diff --git a/apps/client/src/stylesheets/theme-next/base.css b/apps/client/src/stylesheets/theme-next/base.css index 9488332bc..a1885a9a3 100644 --- a/apps/client/src/stylesheets/theme-next/base.css +++ b/apps/client/src/stylesheets/theme-next/base.css @@ -102,10 +102,6 @@ body.backdrop-effects-disabled { font-size: 0.9rem !important; } -.dropdown-menu { - --scrollbar-background-color: var(--menu-background-color); -} - body.mobile .dropdown-menu { backdrop-filter: var(--dropdown-backdrop-filter); border-radius: var(--dropdown-border-radius); diff --git a/apps/client/src/stylesheets/theme-next/shell.css b/apps/client/src/stylesheets/theme-next/shell.css index b4007975c..4c55486d8 100644 --- a/apps/client/src/stylesheets/theme-next/shell.css +++ b/apps/client/src/stylesheets/theme-next/shell.css @@ -588,10 +588,8 @@ div.quick-search .dropdown-menu { * As a temporary workaround, the backdrop and transparency are disabled for the * vertical layout. */ -body.layout-vertical.background-effects div.quick-search .dropdown-menu { - --scrollbar-background-color: var(--menu-background-color-no-backdrop); - - background: var(--menu-background-color-no-backdrop) !important; +body.layout-vertical.background-effects div.quick-search .dropdown-menu { + --menu-background-color: var(--menu-background-color-no-backdrop) !important; } /* Item */