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

Merge remote-tracking branch 'origin/develop' into chore_prettier

Browse Source
This commit is contained in:
Elian Doran 2025-03-03 20:02:38 +02:00
commit 65a51153b3
No known key found for this signature in database
9 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@ -172,7 +172,7 @@
"mini-css-extract-plugin": "2.9.2", "mini-css-extract-plugin": "2.9.2",
"nodemon": "3.1.9", "nodemon": "3.1.9",
"postcss-loader": "8.1.1", "postcss-loader": "8.1.1",
"prettier": "3.5.2", "prettier": "3.5.3",
"rcedit": "4.0.1", "rcedit": "4.0.1",
"rimraf": "6.0.1", "rimraf": "6.0.1",
"sass": "1.85.1", "sass": "1.85.1",
@ -14776,9 +14776,9 @@
} }
}, },
"node_modules/prettier": { "node_modules/prettier": {
"version": "3.5.2", "version": "3.5.3",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.2.tgz", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
"integrity": "sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==", "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"bin": { "bin": {

2
package.json
View File

@ -223,7 +223,7 @@
"mini-css-extract-plugin": "2.9.2", "mini-css-extract-plugin": "2.9.2",
"nodemon": "3.1.9", "nodemon": "3.1.9",
"postcss-loader": "8.1.1", "postcss-loader": "8.1.1",
"prettier": "3.5.2", "prettier": "3.5.3",
"rcedit": "4.0.1", "rcedit": "4.0.1",
"rimraf": "6.0.1", "rimraf": "6.0.1",
"sass": "1.85.1", "sass": "1.85.1",

2
src/public/app/widgets/type_widgets/options/appearance/electron_integration.ts
View File

@ -32,7 +32,7 @@ const TPL = `
</label> </label>
</div> </div>
<button class="btn btn-micro restart-app-button">${t("electron_integration.restart-app-button")}</button> <button class="btn btn-secondary btn-micro restart-app-button">${t("electron_integration.restart-app-button")}</button>
</div> </div>
`; `;

2
src/public/stylesheets/theme-next/notes/text.css
View File

@ -146,7 +146,7 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
padding-top: 0; padding-top: 0;
} }
div.find-replace-widget div.find-widget-found-wrapper { div.find-replace-widget div.find-widget-found-wrapper > span {
min-width: 50px; min-width: 50px;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;

11
src/public/stylesheets/theme-next/ribbon.css
View File

@ -79,3 +79,14 @@ div.editability-dropdown a.dropdown-item {
padding: 4px 10px !important; padding: 4px 10px !important;
font-size: 0.8em; font-size: 0.8em;
} }
/*
* Attribute detail dialog
*/
/* Labels */
.attr-edit-table th {
padding-right: 12px;
font-weight: normal;
white-space: nowrap;
}

2
src/public/stylesheets/theme-next/shell.css
View File

@ -77,7 +77,7 @@ body.background-effects.platform-win32.layout-vertical #vertical-main-container
/* #endregion */ /* #endregion */
/* Matches when the left pane is collapsed */ /* Matches when the left pane is collapsed */
:has(#left-pane.hidden-int) { :has(.layout-vertical #left-pane.hidden-int) {
--center-pane-border-radius: 0; --center-pane-border-radius: 0;
--tab-first-item-horiz-offset: 5px; --tab-first-item-horiz-offset: 5px;
} }

2
src/services/sql.ts
View File

@ -30,7 +30,7 @@ function buildIntegrationTestDatabase(dbPath?: string) {
return new Database(dbBuffer); return new Database(dbBuffer);
} }
function rebuildIntegrationTestDatabase(dbPath: string) { function rebuildIntegrationTestDatabase(dbPath?: string) {
if (dbConnection) { if (dbConnection) {
dbConnection.close(); dbConnection.close();
} }

2
src/views/setup.ejs
View File

@ -135,7 +135,7 @@
<p><strong><%= t("setup_sync-from-server.note") %></strong> <%= t("setup_sync-from-server.proxy-instruction") %></p> <p><strong><%= t("setup_sync-from-server.note") %></strong> <%= t("setup_sync-from-server.proxy-instruction") %></p>
</div> </div>
<div class="form-group"> <div class="form-group" style="margin-bottom: 8px;">
<label for="password"><%= t("setup_sync-from-server.password") %></label> <label for="password"><%= t("setup_sync-from-server.password") %></label>
<input type="password" id="password" class="form-control" data-bind="value: password" placeholder="<%= t("setup_sync-from-server.password-placeholder") %>"> <input type="password" id="password" class="form-control" data-bind="value: password" placeholder="<%= t("setup_sync-from-server.password-placeholder") %>">
</div> </div>