Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-13 08:45:50 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
zadam
2023-01-02 22:53:03 +01:00
parent d2b906bc1b 291ef87c9b
commit 957640f163
10 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/public/app/widgets/buttons/abstract_button.js
View File

@@ -1,8 +1,8 @@
import NoteContextAwareWidget from "../note_context_aware_widget.js";
const TPL = `<button class="button-widget no-print" data-toggle="tooltip">
<span class="bx"></span>
</button>`;
const TPL = `<button class="button-widget bx"
data-toggle="tooltip"
title=""></button>`;
export default class AbstractButtonWidget extends NoteContextAwareWidget {
isEnabled() {
@@ -22,7 +22,6 @@ export default class AbstractButtonWidget extends NoteContextAwareWidget {
doRender() {
this.$widget = $(TPL);
this.$iconSpan = this.$widget.find("span");
if (this.settings.onContextMenu) {
this.$widget.on("contextmenu", e => {
@@ -52,9 +51,9 @@ export default class AbstractButtonWidget extends NoteContextAwareWidget {
}
refreshIcon() {
for (const className of this.$iconSpan[0].classList) {
for (const className of this.$widget[0].classList) {
if (className.startsWith("bx-")) {
this.$iconSpan.removeClass(className);
this.$widget.removeClass(className);
}
}
@@ -62,7 +61,7 @@ export default class AbstractButtonWidget extends NoteContextAwareWidget {
? this.settings.icon()
: this.settings.icon;
this.$iconSpan.addClass(icon);
this.$widget.addClass(icon);
}
initialRenderCompleteEvent() {

6
src/public/app/widgets/buttons/edit_button.js
View File

@@ -39,12 +39,10 @@ export default class EditButton extends OnClickButtonWidget {
// make the edit button stand out on the first display, otherwise
// it's difficult to notice that the note is readonly
if (this.isVisible() && !wasVisible) {
this.$iconSpan.addClass("bx-tada");
this.$widget.css("transform", "scale(2)");
this.$widget.addClass("bx-tada bx-lg");
setTimeout(() => {
this.$iconSpan.removeClass("bx-tada bx-lg");
this.$widget.css("transform", "scale(1)");
this.$widget.removeClass("bx-tada bx-lg");
}, 1700);
}
}

2
src/public/app/widgets/buttons/global_menu.js
View File

@@ -21,12 +21,12 @@ const TPL = `
background-position: 50% 45%;
width: 100%;
height: 100%;
position: relative;
}
.global-menu-button:hover {
background-image: url("${window.glob.assetPath}/images/icon-color.png");
border: 0;
}
.global-menu-button-update-available {