gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-01-03 21:24:24 +01:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge branch 'develop' into renovate/prettier-3.x

Browse Source
This commit is contained in:
JYC333 2025-03-03 18:30:58 +01:00 committed by GitHub
commit 0d5bef422a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ const TPL = `
</label>
</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>
`;

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;
}
div.find-replace-widget div.find-widget-found-wrapper {
div.find-replace-widget div.find-widget-found-wrapper > span {
min-width: 50px;
font-style: normal;
font-weight: normal;

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

@ -78,4 +78,15 @@ div.editability-dropdown a.dropdown-item {
min-width: 0;
padding: 4px 10px !important;
font-size: .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 */
/* Matches when the left pane is collapsed */
:has(#left-pane.hidden-int) {
:has(.layout-vertical #left-pane.hidden-int) {
--center-pane-border-radius: 0;
--tab-first-item-horiz-offset: 5px;
}

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>
</div>
<div class="form-group">
<div class="form-group" style="margin-bottom: 8px;">
<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") %>">
</div>