From b7487461fe4e30122dc87ea8929a0d6312494676 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 1 Dec 2024 17:00:36 +0200 Subject: [PATCH 1/4] fix(server): hidden subtree not initializing due to missing translations --- src/services/hidden_subtree.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/services/hidden_subtree.ts b/src/services/hidden_subtree.ts index 584803a2f..3f0c01bdb 100644 --- a/src/services/hidden_subtree.ts +++ b/src/services/hidden_subtree.ts @@ -54,7 +54,7 @@ enum Command { * duplicate subtrees. This way, all instances will generate the same structure with the same IDs. */ -let HIDDEN_SUBTREE_DEFINITION = buildHiddenSubtreeDefinition(); +let hiddenSubtreeDefinition: Item; function buildHiddenSubtreeDefinition(): Item { return { @@ -288,11 +288,11 @@ function checkHiddenSubtree(force = false, extraOpts: CheckHiddenExtraOpts = {}) return; } - if (force) { - HIDDEN_SUBTREE_DEFINITION = buildHiddenSubtreeDefinition(); + if (!hiddenSubtreeDefinition || force) { + hiddenSubtreeDefinition = buildHiddenSubtreeDefinition(); } - checkHiddenSubtreeRecursively('root', HIDDEN_SUBTREE_DEFINITION, extraOpts); + checkHiddenSubtreeRecursively('root', hiddenSubtreeDefinition, extraOpts); } function checkHiddenSubtreeRecursively(parentNoteId: string, item: Item, extraOpts: CheckHiddenExtraOpts = {}) { From 958f436cb4506ba917f497f02f9a4fdbc77f1604 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 1 Dec 2024 17:03:52 +0200 Subject: [PATCH 2/4] style(next): add color for horizontal launcher bark on dark mode --- src/public/stylesheets/theme-next.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/public/stylesheets/theme-next.css b/src/public/stylesheets/theme-next.css index ff824c870..bc94c91a2 100644 --- a/src/public/stylesheets/theme-next.css +++ b/src/public/stylesheets/theme-next.css @@ -266,6 +266,7 @@ --left-pane-item-selected-action-button-hover-shadow: 2px 2px 10px rgba(0, 0, 0, .25); --launcher-pane-background-color: #1a1a1a; + --launcher-pane-horizontal-background-color: #282828; --launcher-pane-text-color: #909090; --launcher-pane-button-hover-color: #ffffff; --launcher-pane-button-hover-background: #ffffff1c; From cd01e149e01f95f01300eed8f8bab86b22b89f78 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 1 Dec 2024 17:04:13 +0200 Subject: [PATCH 3/4] Revert "style(next): experimental tree lines" This reverts commit 0dbe88092e7e80762008baa8c582c596f4a4155d. --- src/public/stylesheets/theme-next.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/public/stylesheets/theme-next.css b/src/public/stylesheets/theme-next.css index bc94c91a2..d7658a636 100644 --- a/src/public/stylesheets/theme-next.css +++ b/src/public/stylesheets/theme-next.css @@ -540,14 +540,12 @@ html body #left-pane .quick-search:focus-within .search-button:hover, } #left-pane .ui-fancytree ul { - padding-left: 1px; - margin-left: 14px; - border-left: 1px solid var(--subtle-border-color); + padding-left: 10px; } /* The root element of the tree */ #left-pane .fancytree-container > li:first-child > span { - padding-left: 6px; + padding-left: 12px; } #left-pane span.fancytree-node.fancytree-active { From 1e41245ef7ca2be2a5d7f1f90baa22dc35e0809b Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 1 Dec 2024 17:08:28 +0200 Subject: [PATCH 4/4] fix(settings): unable to set mimetype --- .../type_widgets/options/code_notes/code_mime_types.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/public/app/widgets/type_widgets/options/code_notes/code_mime_types.js b/src/public/app/widgets/type_widgets/options/code_notes/code_mime_types.js index 40244f69d..300dee9b7 100644 --- a/src/public/app/widgets/type_widgets/options/code_notes/code_mime_types.js +++ b/src/public/app/widgets/type_widgets/options/code_notes/code_mime_types.js @@ -62,14 +62,14 @@ export default class CodeMimeTypesOptions extends OptionsWidget { const groupedMimeTypes = groupMimeTypesAlphabetically(ungroupedMimeTypes); // Plain text is displayed at the top intentionally. - this.$mimeTypes.append(buildSelectionForMimeType(plainTextMimeType)); + this.$mimeTypes.append(buildSelectionForMimeType.call(this, plainTextMimeType)); for (const [ initial, mimeTypes ] of Object.entries(groupedMimeTypes)) { const $section = $("
"); $section.append($("
").text(initial)); for (const mimeType of mimeTypes) { - $section.append(buildSelectionForMimeType(mimeType)); + $section.append(buildSelectionForMimeType.call(this, mimeType)); } this.$mimeTypes.append($section);