Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-01 04:32:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/native_window_buttons

Browse Source
This commit is contained in:
Elian Doran 2024-12-01 17:14:02 +02:00
commit e9aba033a1
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/app/widgets/type_widgets/options/code_notes/code_mime_types.js
View File

@ -62,14 +62,14 @@ export default class CodeMimeTypesOptions extends OptionsWidget {
const groupedMimeTypes = groupMimeTypesAlphabetically(ungroupedMimeTypes); const groupedMimeTypes = groupMimeTypesAlphabetically(ungroupedMimeTypes);
// Plain text is displayed at the top intentionally. // 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)) { for (const [ initial, mimeTypes ] of Object.entries(groupedMimeTypes)) {
const $section = $("<section>"); const $section = $("<section>");
$section.append($("<h5>").text(initial)); $section.append($("<h5>").text(initial));
for (const mimeType of mimeTypes) { for (const mimeType of mimeTypes) {
$section.append(buildSelectionForMimeType(mimeType)); $section.append(buildSelectionForMimeType.call(this, mimeType));
} }
this.$mimeTypes.append($section); this.$mimeTypes.append($section);

7
src/public/stylesheets/theme-next.css
View File

@ -266,6 +266,7 @@
--left-pane-item-selected-action-button-hover-shadow: 2px 2px 10px rgba(0, 0, 0, .25); --left-pane-item-selected-action-button-hover-shadow: 2px 2px 10px rgba(0, 0, 0, .25);
--launcher-pane-background-color: #1a1a1a; --launcher-pane-background-color: #1a1a1a;
--launcher-pane-horizontal-background-color: #282828;
--launcher-pane-text-color: #909090; --launcher-pane-text-color: #909090;
--launcher-pane-button-hover-color: #ffffff; --launcher-pane-button-hover-color: #ffffff;
--launcher-pane-button-hover-background: #ffffff1c; --launcher-pane-button-hover-background: #ffffff1c;
@ -539,14 +540,12 @@ html body #left-pane .quick-search:focus-within .search-button:hover,
} }
#left-pane .ui-fancytree ul { #left-pane .ui-fancytree ul {
padding-left: 1px; padding-left: 10px;
margin-left: 14px;
border-left: 1px solid var(--subtle-border-color);
} }
/* The root element of the tree */ /* The root element of the tree */
#left-pane .fancytree-container > li:first-child > span { #left-pane .fancytree-container > li:first-child > span {
padding-left: 6px; padding-left: 12px;
} }
#left-pane span.fancytree-node.fancytree-active { #left-pane span.fancytree-node.fancytree-active {

8
src/services/hidden_subtree.ts
View File

@ -54,7 +54,7 @@ enum Command {
* duplicate subtrees. This way, all instances will generate the same structure with the same IDs. * 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 { function buildHiddenSubtreeDefinition(): Item {
return { return {
@ -288,11 +288,11 @@ function checkHiddenSubtree(force = false, extraOpts: CheckHiddenExtraOpts = {})
return; return;
} }
if (force) { if (!hiddenSubtreeDefinition || force) {
HIDDEN_SUBTREE_DEFINITION = buildHiddenSubtreeDefinition(); hiddenSubtreeDefinition = buildHiddenSubtreeDefinition();
} }
checkHiddenSubtreeRecursively('root', HIDDEN_SUBTREE_DEFINITION, extraOpts); checkHiddenSubtreeRecursively('root', hiddenSubtreeDefinition, extraOpts);
} }
function checkHiddenSubtreeRecursively(parentNoteId: string, item: Item, extraOpts: CheckHiddenExtraOpts = {}) { function checkHiddenSubtreeRecursively(parentNoteId: string, item: Item, extraOpts: CheckHiddenExtraOpts = {}) {