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

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

Browse Source
This commit is contained in:
Elian Doran 2024-12-07 03:35:40 +02:00
commit cf128c1275
No known key found for this signature in database
4 changed files with 69 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package-lock.json generated
View File

@ -41,7 +41,7 @@
"express-partial-content": "1.0.2",
"express-rate-limit": "7.4.1",
"express-session": "1.18.1",
"force-graph": "1.46.0",
"force-graph": "1.47.0",
"fs-extra": "11.2.0",
"helmet": "7.1.0",
"html": "1.0.0",
@ -9163,9 +9163,10 @@
}
},
"node_modules/force-graph": {
"version": "1.46.0",
"resolved": "https://registry.npmjs.org/force-graph/-/force-graph-1.46.0.tgz",
"integrity": "sha512-RR4XIsMgKMquEmN6me2MoDeqMr85Cv1cpXDFha6gwEczaaC3RWDH4YmXQXnI8/egRiIKFMq4HKjBjWXZwyy/9Q==",
"version": "1.47.0",
"resolved": "https://registry.npmjs.org/force-graph/-/force-graph-1.47.0.tgz",
"integrity": "sha512-2R6q3cLPuUzltGA+uYlmV/1cU4Fc/+jwU+0RiwLlUAh/geBmxfV3S1bpZxJ47UMMgD5Op+g0MlxNiJ62LAjQCQ==",
"license": "MIT",
"dependencies": {
"@tweenjs/tween.js": "18 - 25",
"accessor-fn": "1",
@ -9179,7 +9180,7 @@
"d3-selection": "2 - 3",
"d3-zoom": "2 - 3",
"index-array-by": "1",
"kapsule": "^1.14",
"kapsule": "^1.16",
"lodash-es": "4"
},
"engines": {
@ -11570,9 +11571,10 @@
}
},
"node_modules/kapsule": {
"version": "1.14.5",
"resolved": "https://registry.npmjs.org/kapsule/-/kapsule-1.14.5.tgz",
"integrity": "sha512-H0iSpTynUzZw3tgraDmReprpFRmH5oP5GPmaNsurSwLx2H5iCpOMIkp5q+sfhB4Tz/UJd1E1IbEE9Z6ksnJ6RA==",
"version": "1.16.0",
"resolved": "https://registry.npmjs.org/kapsule/-/kapsule-1.16.0.tgz",
"integrity": "sha512-4f/z/Luu0cEXmagCwaFyzvfZai2HKgB4CQLwmsMUA+jlUbW94HfFSX+TWZxzWoMSO6b6aR+FD2Xd5z88VYZJTw==",
"license": "MIT",
"dependencies": {
"lodash-es": "4"
},

2
package.json
View File

@ -83,7 +83,7 @@
"express-partial-content": "1.0.2",
"express-rate-limit": "7.4.1",
"express-session": "1.18.1",
"force-graph": "1.46.0",
"force-graph": "1.47.0",
"fs-extra": "11.2.0",
"helmet": "7.1.0",
"html": "1.0.0",

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

@ -120,7 +120,7 @@ export default class QuickSearchWidget extends BasicWidget {
}
for (const note of await froca.getNotes(displayedNoteIds)) {
const $link = await linkService.createLink(note.noteId, { showNotePath: true });
const $link = await linkService.createLink(note.noteId, { showNotePath: true, showNoteIcon: true });
$link.addClass('dropdown-item');
$link.attr("tabIndex", "0");
$link.on('click', e => {
@ -148,6 +148,7 @@ export default class QuickSearchWidget extends BasicWidget {
const $showInFullButton = $('<a class="dropdown-item" tabindex="0">')
.append($(`<button class="btn btn-sm">${t("quick-search.show-in-full-search")}</button>`));
this.$dropdownMenu.append($(`<div class="dropdown-divider">`));
this.$dropdownMenu.append($showInFullButton);
$showInFullButton.on('click', () => this.showInFullSearch());

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

@ -664,6 +664,47 @@ div.quick-search .search-button.show {
transition: background-color 100ms ease-out !important;
}
/*
* Quick search results
*/
/* Item */
.quick-search .dropdown-menu *.dropdown-item {
padding: 8px 12px !important;
}
/* Note icon */
.quick-search .dropdown-menu .dropdown-item > .bx {
position: relative;
top: 1px;
}
/* Note title */
.quick-search .dropdown-menu .dropdown-item > a {
color: var(--menu-text-color);
}
.quick-search .dropdown-menu .dropdown-item > a:hover {
--hover-item-background-color: transparent;
text-decoration: underline;
}
/* Note path */
.quick-search .dropdown-menu small {
display: block;
opacity: .5;
font-size: .75em;
overflow: hidden;
}
/* The "Show in full search" button */
.quick-search .dropdown-menu button {
padding: 0;
color: var(--menu-text-color) !important;
}
/*
* Left pane
*/
@ -1298,6 +1339,14 @@ body .calendar-dropdown-widget .calendar-body a:hover {
* Recent changes list
*/
.recent-changes-dialog .modal-body {
padding: 0;
}
.recent-changes-content {
margin: var(--bs-modal-padding);
}
.recent-changes-content small {
color: var(--muted-text-color);
}
@ -1308,10 +1357,14 @@ body .calendar-dropdown-widget .calendar-body a:hover {
/* Date headings */
.recent-changes-content > div > b {
position: sticky;
display: block;
top: 0;
background: var(--modal-background-color);
padding: 10px 0;
font-size: 1.25em;
font-weight: 300;
z-index: 10;
}
.recent-changes-content ul {
@ -1323,11 +1376,13 @@ body .calendar-dropdown-widget .calendar-body a:hover {
/* Timeline items */
.recent-changes-content ul li,
.recent-changes-content > div > b {
position: relative;
margin: 0;
padding-left: var(--timeline-right-gap);
}
.recent-changes-content ul li {
position: relative;
}
/* Timeline connector */
.recent-changes-content ul li::before,