gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 03:29:02 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

close down dropdown menus on click + smaller tweaks

Browse Source
This commit is contained in:
zadam 2020-08-28 14:52:38 +02:00
parent 9873dd1242
commit 8259b4a32c
7 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -55,7 +55,7 @@
"mime-types": "2.1.27", "mime-types": "2.1.27",
"multer": "1.4.2", "multer": "1.4.2",
"node-abi": "2.19.1", "node-abi": "2.19.1",
"open": "7.2.0", "open": "7.2.1",
"portscanner": "2.2.0", "portscanner": "2.2.0",
"rand-token": "1.0.1", "rand-token": "1.0.1",
"request": "^2.88.2", "request": "^2.88.2",

2
src/public/app/layouts/desktop_extra_window_layout.js
View File

@ -32,7 +32,7 @@ export default class DesktopExtraWindowLayout {
.child(new FlexContainer('column').id('center-pane').css('flex-grow', '1') .child(new FlexContainer('column').id('center-pane').css('flex-grow', '1')
.child(new FlexContainer('row').class('title-row') .child(new FlexContainer('row').class('title-row')
.overflowing() .overflowing()
.cssBlock('.title-row > * { margin: 5px; }') .cssBlock('.title-row > * { margin: 5px 5px 0 5px; }')
.child(new NoteTitleWidget()) .child(new NoteTitleWidget())
.child(new RunScriptButtonsWidget().hideInZenMode()) .child(new RunScriptButtonsWidget().hideInZenMode())
.child(new NoteTypeWidget().hideInZenMode()) .child(new NoteTypeWidget().hideInZenMode())

2
src/public/app/layouts/desktop_main_window_layout.js
View File

@ -130,7 +130,7 @@ export default class DesktopMainWindowLayout {
) )
.child(new FlexContainer('column').id('center-pane') .child(new FlexContainer('column').id('center-pane')
.child(new FlexContainer('row').class('title-row') .child(new FlexContainer('row').class('title-row')
.cssBlock('.title-row > * { margin: 5px; }') .cssBlock('.title-row > * { margin: 5px 5px 0 5px; }')
.overflowing() .overflowing()
.child(new NoteTitleWidget()) .child(new NoteTitleWidget())
.child(new RunScriptButtonsWidget().hideInZenMode()) .child(new RunScriptButtonsWidget().hideInZenMode())

6
src/public/app/widgets/attribute_list.js
View File

@ -57,11 +57,11 @@ const TPL = `
} }
.attr-expander:not(.error):hover hr { .attr-expander:not(.error):hover hr {
border-color: black; border-color: var(--main-text-color);
} }
.attr-expander:not(.error):hover .attr-expander-text { .attr-expander:hover .attr-expander-text {
color: black; color: var(--main-text-color);
} }
</style> </style>

3
src/public/app/widgets/global_menu.js
View File

@ -120,5 +120,8 @@ export default class GlobalMenuWidget extends BasicWidget {
this.$widget.find(".logout-button").toggle(!utils.isElectron()); this.$widget.find(".logout-button").toggle(!utils.isElectron());
this.$widget.find(".open-dev-tools-button").toggle(utils.isElectron()); this.$widget.find(".open-dev-tools-button").toggle(utils.isElectron());
this.$widget.on('click', '.dropdown-item',
() => this.$widget.find('.dropdown-toggle').dropdown('toggle'));
} }
} }

3
src/public/app/widgets/note_actions.js
View File

@ -114,6 +114,9 @@ export default class NoteActionsWidget extends TabAwareWidget {
this.$unprotectButton = this.$widget.find(".unprotect-button"); this.$unprotectButton = this.$widget.find(".unprotect-button");
this.$unprotectButton.on('click', () => protectedSessionService.protectNote(this.noteId, false, false)); this.$unprotectButton.on('click', () => protectedSessionService.protectNote(this.noteId, false, false));
this.$widget.on('click', '.dropdown-item',
() => this.$widget.find('.dropdown-toggle').dropdown('toggle'));
} }
refreshWithNote(note) { refreshWithNote(note) {

2
src/public/app/widgets/type_widgets/book.js
View File

@ -42,7 +42,7 @@ const TPL = `
.note-detail-book { .note-detail-book {
height: 100%; height: 100%;
padding: 10px; padding: 0 10px 10px 10px;
position: relative; position: relative;
} }