Merge remote-tracking branch 'origin/main' into react/type_widgets

2025-11-10 07:15:51 +01:00 · 2025-11-09 19:30:41 +02:00
parent e28794d706 521152ec0e
commit 7fc9f08843
18 changed files with 72 additions and 35 deletions
--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@@ -1104,7 +1104,6 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href

 .card {
    color: inherit !important;
-    background-color: inherit !important;
    border-color: var(--main-border-color) !important;
 }

@@ -1759,10 +1758,10 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
    flex-direction: column;
    margin-inline-start: 10px;
    margin-inline-end: 5px;
+    background: transparent;
 }

 #right-pane .card-header {
-    background: inherit;
    padding: 6px 0 3px 0;
    width: 99%; /* to give minimal right margin */
    background-color: var(--button-background-color);
@@ -2516,7 +2515,7 @@ footer.webview-footer button {
    transform: rotate(180deg);
 }

-/* CK Edito */
+/* CK Editor */

 /* Insert text snippet: limit the width of the listed items to avoid overly long names */
 :root body.desktop div.ck-template-form li.ck-list__item .ck-template-form__text-part > span {
@@ -2546,4 +2545,18 @@ iframe.print-iframe {

 .excalidraw.theme--dark canvas {
    --theme-filter: invert(100%) hue-rotate(180deg);
+}
+
+/* Scrolling container */
+
+.scrolling-container:has(> :is(.note-detail.full-height, .note-list-widget.full-height)) {
+    display: flex;
+    flex-direction: column;
+}
+
+.scrolling-container > .note-detail.full-height,
+.scrolling-container > .note-list-widget {
+    position: relative;
+    flex-grow: 1;
+    width: 100%;
 }
--- a/apps/client/src/stylesheets/theme-next-dark.css
+++ b/apps/client/src/stylesheets/theme-next-dark.css
@@ -230,8 +230,7 @@
    --code-block-box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.6);

    --card-background-color: #ffffff12;
-    --card-background-hover-color: #3c3c3c;
-    --card-background-press-color: #464646;
+    --card-background-hover-color: #ffffff20;
    --card-border-color: transparent;
    --card-box-shadow: none;

--- a/apps/client/src/stylesheets/theme-next-light.css
+++ b/apps/client/src/stylesheets/theme-next-light.css
@@ -211,8 +211,8 @@
    --new-tab-button-hover-color: black;

    --right-pane-background-color: var(--main-background-color);
-    --right-pane-background-color-bgfx: var(--center-pane-vert-layout-background-color-bgfx); /* Only for the vertical layout */
-    --right-pane-item-hover-background: #ececec;
+    --right-pane-background-color-bgfx: #ffffff9e; /* Only for the vertical layout */
+    --right-pane-item-hover-background: #00000013;
    --right-pane-item-hover-color: inherit;

    --scrollbar-thumb-color: #0000005c;
@@ -229,8 +229,7 @@
    --code-block-box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.1), 0px 0px 2px rgba(0, 0, 0, 0.2);

    --card-background-color: #0000000d;
-    --card-background-hover-color: #f9f9f9;
-    --card-background-press-color: #efefef;
+    --card-background-hover-color: #0000001c;
    --card-border-color: transparent;
    --card-shadow-color: rgba(0, 0, 0, 0.1);
    --card-box-shadow: none;
--- a/apps/client/src/stylesheets/theme-next/base.css
+++ b/apps/client/src/stylesheets/theme-next/base.css
@@ -487,13 +487,21 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
    --note-list-vertical-padding: 15px;
    background-color: var(--card-background-color);
    border: 1px solid var(--card-border-color) !important;
-    box-shadow: 2px 3px 4px var(--card-shadow-color);
    border-radius: 12px;
    user-select: none;
    padding: 0;
    margin: 5px 10px 5px 0;
 }

+:root .note-list .note-book-card:hover {
+    background-color: var(--card-background-hover-color);
+    transition: background-color 200ms ease-out;
+}
+
+:root .note-list .note-book-card:active {
+    transform: scale(.98);
+}
+
 .note-list.list-view .note-book-card {
    box-shadow: 0 0 3px var(--card-shadow-color);
 }
@@ -502,10 +510,6 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
    vertical-align: middle;
 }

-.note-list-wrapper .note-book-card:active {
-    background-color: var(--card-background-press-color);
-}
-
 .note-list-wrapper .note-book-card a {
    color: inherit !important;
 }
@@ -592,7 +596,6 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
 }

 .note-list.grid-view .note-book-card:hover {
-    background: var(--card-background-color) !important;
    filter: contrast(105%);
 }

--- a/apps/client/src/stylesheets/theme-next/notes/text.css
+++ b/apps/client/src/stylesheets/theme-next/notes/text.css
@@ -674,4 +674,17 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {

 .ck-content a.reference-link > span {
    text-decoration: underline;
+}
+
+/*
+ * Read-only text content
+ */
+
+.note-detail-readonly-text:focus-visible {
+    outline: 2px solid var(--input-focus-outline-color);
+    border-radius: 4px;
+}
+
+.note-list-widget {
+    outline: 0 !important;
 }
--- a/apps/client/src/stylesheets/theme-next/pages.css
+++ b/apps/client/src/stylesheets/theme-next/pages.css
@@ -101,7 +101,7 @@
 .sql-table-schemas-widget .sql-table-schemas button:hover,
 .sql-table-schemas-widget .sql-table-schemas button:active,
 .sql-table-schemas-widget .sql-table-schemas button:focus-visible {
-    --background: var(--card-background-press-color);
+    --background: var(--card-background-hover-color);
    --color: var(--main-text-color);
 }

--- a/apps/client/src/stylesheets/theme-next/shell.css
+++ b/apps/client/src/stylesheets/theme-next/shell.css
@@ -64,6 +64,7 @@ body.background-effects.theme-supports-background-effects.platform-win32.layout-

 body.background-effects.theme-supports-background-effects.platform-win32.layout-horizontal {
    --center-pane-background-color-bgfx: var(--center-pane-horiz-layout-background-color-bgfx);
+    --gutter-color: var(--left-pane-background-color);
 }

 body.background-effects.theme-supports-background-effects.platform-win32,
--- a/apps/client/src/widgets/NoteDetail.css
+++ b/apps/client/src/widgets/NoteDetail.css
@@ -10,10 +10,6 @@ body.prefers-centered-content .note-detail {
    margin-inline: auto;
 }

-.note-detail.full-height {
-    height: 100%;
-}
-
 .note-detail > * {
    contain: none;
 }
--- a/apps/client/src/widgets/ReadOnlyNoteInfoBar.css
+++ b/apps/client/src/widgets/ReadOnlyNoteInfoBar.css
@@ -3,7 +3,7 @@ body.zen div.read-only-note-info-bar-widget {
    max-width: var(--max-content-width);
    border-radius: 8px;
    border: unset;
-    margin: 0 auto;
+    margin: 0 auto 10px auto;
 }

 .read-only-note-info-bar-widget-content {
--- a/apps/client/src/widgets/collections/NoteList.css
+++ b/apps/client/src/widgets/collections/NoteList.css
@@ -6,7 +6,7 @@
    contain: none !important;
 }

-body.prefers-centered-content .note-list-widget {
+body.prefers-centered-content .note-list-widget:not(.full-height) {
    /* Horizontally center the widget in its parent when the "Keep content centered" option is on */
    margin-inline: auto;
 }
--- a/apps/client/src/widgets/collections/calendar/index.css
+++ b/apps/client/src/widgets/collections/calendar/index.css
@@ -1,6 +1,7 @@
 .calendar-view {
    overflow: hidden;
    position: relative;
+    outline: 0;
    height: 100%;
    user-select: none;
    padding: 10px;
@@ -67,6 +68,7 @@
 }

 body.desktop:not(.zen) .calendar-view .calendar-header {
+    padding-block-start: 4px;
    padding-inline-end: 5em;
 }

--- a/apps/client/src/widgets/containers/content-header.ts
+++ b/apps/client/src/widgets/containers/content-header.ts
@@ -25,8 +25,7 @@ export default class ContentHeader extends Container<BasicWidget> {
    }

    init() {
-        this.parentElement = this.parent!.$widget.get(0);
-
+        this.parentElement = this.parent?.$widget.get(0);
        if (!this.parentElement) {
            console.warn("No parent set for <ContentHeader>.");
            return;
--- a/apps/client/src/widgets/note_types.tsx
+++ b/apps/client/src/widgets/note_types.tsx
@@ -126,7 +126,8 @@ export const TYPE_MAPPINGS: Record<ExtendedNoteType, NoteTypeMapping> = {
    relationMap: {
        view: () => import("./type_widgets/relation_map/RelationMap"),
        className: "note-detail-relation-map",
-        printable: true
+        printable: true,
+        isFullHeight: true
    },
    noteMap: {
        view: () => import("./type_widgets/NoteMap"),
--- a/apps/client/src/widgets/react/InfoBar.css
+++ b/apps/client/src/widgets/react/InfoBar.css
@@ -1,11 +1,13 @@
 .info-bar {
-    --link-color: var(--main-text-color);
-    
+    --link-color: currentColor;
+
    margin-top: 4px;
    contain: unset !important;
    padding: 8px 20px;
    color: var(--read-only-note-info-bar-color);
    font-size: .9em;
+    cursor: default;
+    user-select: none;
 }

 .info-bar-prominent {
--- a/apps/client/src/widgets/type_widgets/canvas/Canvas.css
+++ b/apps/client/src/widgets/type_widgets/canvas/Canvas.css
@@ -1,3 +1,7 @@
+.canvas-widget {
+    height: 100%;
+}
+
 .excalidraw .App-menu_top .buttonList {
  display: flex;
 }
--- a/apps/client/src/widgets/type_widgets/relation_map/RelationMap.css
+++ b/apps/client/src/widgets/type_widgets/relation_map/RelationMap.css
@@ -5,7 +5,6 @@
 .note-detail-relation-map {
    height: 100%;
    overflow: hidden !important;
-    padding: 10px;
    position: relative;
 }

--- a/apps/website/src/translations/id/translation.json
+++ b/apps/website/src/translations/id/translation.json
@@ -1 +1,7 @@
-{}
+{
+    "get-started": {
+        "title": "Mulai",
+        "desktop_title": "Unduh aplikasi desktop (v{{version}})",
+        "architecture": "Arsitektur:"
+    }
+}
--- a/docs/README-id.md
+++ b/docs/README-id.md
@@ -34,12 +34,12 @@ untuk ikhtisar cepat:

 <a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="./docs/app.png" alt="Trilium Screenshot" width="1000"></a>

-## ⏬ Download
- [Latest release](https://github.com/TriliumNext/Trilium/releases/latest) –
-  stable version, recommended for most users.
- [Nightly build](https://github.com/TriliumNext/Trilium/releases/tag/nightly) –
-  unstable development version, updated daily with the latest features and
-  fixes.
+## ⏬ Unduh
+- [Rilis terbaru](https://github.com/TriliumNext/Trilium/releases/latest) –
+  versi stabil, direkomendasikan.
+- [Rilis nightly](https://github.com/TriliumNext/Trilium/releases/tag/nightly) –
+  versi pengembangan, tidak stabil, diperbarui setiap hari dengan fitur dan
+  perbaikan terbaru.

 ## 📚 Dokumentasi