Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-11-04 15:11:31 +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 10:49:30 +02:00
commit 819a6d2364
No known key found for this signature in database
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/public/app/widgets/bookmark_buttons.js
View File

@ -25,10 +25,12 @@ export default class BookmarkButtons extends FlexContainer {
? new BookmarkFolderWidget(note) ? new BookmarkFolderWidget(note)
: new OpenNoteButtonWidget(note) : new OpenNoteButtonWidget(note)
.class("launcher-button"); .class("launcher-button");
if (!buttonWidget.settings) { if (this.settings.titlePlacement) {
buttonWidget = {}; if (!buttonWidget.settings) {
buttonWidget = {};
}
buttonWidget.settings.titlePlacement = this.settings.titlePlacement;
} }
buttonWidget.settings.titlePlacement = this.settings.titlePlacement;
this.child(buttonWidget); this.child(buttonWidget);

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

@ -528,7 +528,7 @@ html body #left-pane .quick-search:focus-within .search-button:hover,
} }
#left-pane div.tree { #left-pane div.tree {
padding: 0 12px; padding: 3px 6px;
animation: fade-in 200ms ease-in; animation: fade-in 200ms ease-in;
} }
@ -538,9 +538,15 @@ html body #left-pane .quick-search:focus-within .search-button:hover,
cursor: default; cursor: default;
} }
#left-pane .ui-fancytree ul {
padding-left: 1px;
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: 12px; padding-left: 6px;
} }
#left-pane span.fancytree-node.fancytree-active { #left-pane span.fancytree-node.fancytree-active {
@ -693,17 +699,17 @@ html body #left-pane .quick-search:focus-within .search-button:hover,
.tab-row-widget-container { .tab-row-widget-container {
margin-top: calc((var(--tab-bar-height) - var(--tab-height)) / 2); margin-top: calc((var(--tab-bar-height) - var(--tab-height)) / 2);
height: var(--tab-height) !important; height: var(--tab-height) !important;
overflow: hidden;
} }
#root-widget.horizontal-layout .tab-row-container { #root-widget.horizontal-layout .tab-row-container {
padding-top: calc((var(--tab-bar-height) - var(--tab-height))); padding-top: calc((var(--tab-bar-height) - var(--tab-height)));
} }
#root-widget.horizontal-layout .tab-row-widget-container { #root-widget.horizontal-layout .tab-row-widget-container {
margin-top: 0; margin-top: 0;
position: relative; position: relative;
overflow: hidden;
} }
.tab-row-widget .note-tab .note-tab-wrapper { .tab-row-widget .note-tab .note-tab-wrapper {