diff --git a/e2e/help.spec.ts b/e2e/help.spec.ts index 19f52d750..a820819ac 100644 --- a/e2e/help.spec.ts +++ b/e2e/help.spec.ts @@ -9,7 +9,7 @@ test("Help popup", async ({ page, context }) => { const popupPromise = page.waitForEvent("popup"); await app.currentNoteSplit.press("F1"); - await page.getByRole("link", { name: "online↗" }).click(); + await page.getByRole("link", { name: "online" }).click(); const popup = await popupPromise; expect(popup.url()).toBe("https://triliumnext.github.io/Docs/"); }); diff --git a/src/public/app/services/note_list_renderer.ts b/src/public/app/services/note_list_renderer.ts index 2e6652b0f..06d2c1a48 100644 --- a/src/public/app/services/note_list_renderer.ts +++ b/src/public/app/services/note_list_renderer.ts @@ -151,7 +151,7 @@ const TPL = `
-
+
diff --git a/src/public/app/widgets/attachment_detail.js b/src/public/app/widgets/attachment_detail.js index 263722018..8aa6b5824 100644 --- a/src/public/app/widgets/attachment_detail.js +++ b/src/public/app/widgets/attachment_detail.js @@ -119,15 +119,16 @@ export default class AttachmentDetailWidget extends BasicWidget { this.$wrapper.addClass(this.isFullDetail ? "full-detail" : "list-view"); if (!this.isFullDetail) { - this.$wrapper.find(".attachment-title").append( - await linkService.createLink(this.attachment.ownerId, { - title: this.attachment.title, - viewScope: { - viewMode: "attachments", - attachmentId: this.attachment.attachmentId - } - }) - ); + const $link = await linkService.createLink(this.attachment.ownerId, { + title: this.attachment.title, + viewScope: { + viewMode: "attachments", + attachmentId: this.attachment.attachmentId + } + }); + $link.addClass("use-tn-links"); + + this.$wrapper.find(".attachment-title").append($link); } else { this.$wrapper.find(".attachment-title").text(this.attachment.title); } diff --git a/src/public/app/widgets/bookmark_switch.js b/src/public/app/widgets/bookmark_switch.js index acf940c7a..1bd28ccd2 100644 --- a/src/public/app/widgets/bookmark_switch.js +++ b/src/public/app/widgets/bookmark_switch.js @@ -15,11 +15,11 @@ export default class BookmarkSwitchWidget extends SwitchWidget { doRender() { super.doRender(); - this.$switchOnName.text(t("bookmark_switch.bookmark")); - this.$switchOnButton.attr("title", t("bookmark_switch.bookmark_this_note")); + this.switchOnName = t("bookmark_switch.bookmark"); + this.switchOnTooltip = t("bookmark_switch.bookmark_this_note"); - this.$switchOffName.text(t("bookmark_switch.bookmark")); - this.$switchOffButton.attr("title", t("bookmark_switch.remove_bookmark")); + this.switchOffName = t("bookmark_switch.bookmark"); + this.switchOffTooltip = t("bookmark_switch.remove_bookmark"); } async toggle(state) { @@ -33,8 +33,7 @@ export default class BookmarkSwitchWidget extends SwitchWidget { async refreshWithNote(note) { const isBookmarked = !!note.getParentBranches().find((b) => b.parentNoteId === "_lbBookmarks"); - this.$switchOn.toggle(!isBookmarked); - this.$switchOff.toggle(isBookmarked); + this.isToggled = isBookmarked; } entitiesReloadedEvent({ loadResults }) { diff --git a/src/public/app/widgets/dialogs/about.js b/src/public/app/widgets/dialogs/about.js index db3fe4c5e..918e725af 100644 --- a/src/public/app/widgets/dialogs/about.js +++ b/src/public/app/widgets/dialogs/about.js @@ -17,7 +17,7 @@ const TPL = ` - + @@ -38,7 +38,7 @@ const TPL = ` - + @@ -82,6 +82,7 @@ export default class AboutDialog extends BasicWidget { this.$dataDirectory.html( $("", { href: "#", + class: "tn-link", text: appInfo.dataDirectory }) ); diff --git a/src/public/app/widgets/dialogs/bulk_actions.js b/src/public/app/widgets/dialogs/bulk_actions.js index af9b4616b..41ff5e3b0 100644 --- a/src/public/app/widgets/dialogs/bulk_actions.js +++ b/src/public/app/widgets/dialogs/bulk_actions.js @@ -12,21 +12,21 @@ const TPL = ` .bulk-actions-dialog .modal-body h4:not(:first-child) { margin-top: 20px; } - + .bulk-actions-dialog .bulk-available-action-list button { padding: 2px 7px; margin-right: 10px; margin-bottom: 5px; } - + .bulk-actions-dialog .bulk-existing-action-list { width: 100%; } - + .bulk-actions-dialog .bulk-existing-action-list td { padding: 7px; } - + .bulk-actions-dialog .bulk-existing-action-list .button-column { /* minimal width so that table remains static sized and most space remains for middle column with settings */ width: 50px; @@ -45,8 +45,10 @@ const TPL = `

${t("bulk_actions.affected_notes")}: 0

- - +

${t("bulk_actions.available_actions")}

diff --git a/src/public/app/widgets/dialogs/delete_notes.ts b/src/public/app/widgets/dialogs/delete_notes.ts index abf3907d3..19331641d 100644 --- a/src/public/app/widgets/dialogs/delete_notes.ts +++ b/src/public/app/widgets/dialogs/delete_notes.ts @@ -34,13 +34,17 @@ const TPL = `
- - +
- - +
diff --git a/src/public/app/widgets/dialogs/export.js b/src/public/app/widgets/dialogs/export.js index 438d4eca5..5bc9b3707 100644 --- a/src/public/app/widgets/dialogs/export.js +++ b/src/public/app/widgets/dialogs/export.js @@ -14,17 +14,17 @@ const TPL = ` padding-top: 10px; padding-bottom: 10px; } - + .export-dialog .export-form .format-choice { padding-left: 40px; display: none; } - + .export-dialog .export-form .opml-versions { padding-left: 60px; display: none; } - + .export-dialog .export-form .form-check-label { padding: 2px; } @@ -39,7 +39,7 @@ const TPL = `
-
${t("about.homepage")}https://github.com/TriliumNext/Noteshttps://github.com/TriliumNext/Notes
${t("about.app_version")}
${t("about.build_revision")}
").text(formatDateTime(token.utcDateCreated))) .append( $("").append( - $(``).on("click", () => this.renameToken(token.etapiTokenId, token.name)), - $(``).on("click", () => this.deleteToken(token.etapiTokenId, token.name)) + $(``).on("click", () => this.renameToken(token.etapiTokenId, token.name)), + $(``).on("click", () => this.deleteToken(token.etapiTokenId, token.name)) ) ) ); diff --git a/src/public/app/widgets/type_widgets/options/images/images.ts b/src/public/app/widgets/type_widgets/options/images/images.ts index e33fb3a18..b7acdd1d8 100644 --- a/src/public/app/widgets/type_widgets/options/images/images.ts +++ b/src/public/app/widgets/type_widgets/options/images/images.ts @@ -13,7 +13,7 @@ const TPL = `

${t("images.images_section_title")}

-