mirror of
https://github.com/zadam/trilium.git
synced 2025-11-10 07:15:51 +01:00
Merge remote-tracking branch 'origin/main' into react/type_widgets
This commit is contained in:
@@ -1104,7 +1104,6 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href
|
|||||||
|
|
||||||
.card {
|
.card {
|
||||||
color: inherit !important;
|
color: inherit !important;
|
||||||
background-color: inherit !important;
|
|
||||||
border-color: var(--main-border-color) !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;
|
flex-direction: column;
|
||||||
margin-inline-start: 10px;
|
margin-inline-start: 10px;
|
||||||
margin-inline-end: 5px;
|
margin-inline-end: 5px;
|
||||||
|
background: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
#right-pane .card-header {
|
#right-pane .card-header {
|
||||||
background: inherit;
|
|
||||||
padding: 6px 0 3px 0;
|
padding: 6px 0 3px 0;
|
||||||
width: 99%; /* to give minimal right margin */
|
width: 99%; /* to give minimal right margin */
|
||||||
background-color: var(--button-background-color);
|
background-color: var(--button-background-color);
|
||||||
@@ -2516,7 +2515,7 @@ footer.webview-footer button {
|
|||||||
transform: rotate(180deg);
|
transform: rotate(180deg);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* CK Edito */
|
/* CK Editor */
|
||||||
|
|
||||||
/* Insert text snippet: limit the width of the listed items to avoid overly long names */
|
/* 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 {
|
: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 {
|
.excalidraw.theme--dark canvas {
|
||||||
--theme-filter: invert(100%) hue-rotate(180deg);
|
--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%;
|
||||||
}
|
}
|
||||||
@@ -230,8 +230,7 @@
|
|||||||
--code-block-box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.6);
|
--code-block-box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.6);
|
||||||
|
|
||||||
--card-background-color: #ffffff12;
|
--card-background-color: #ffffff12;
|
||||||
--card-background-hover-color: #3c3c3c;
|
--card-background-hover-color: #ffffff20;
|
||||||
--card-background-press-color: #464646;
|
|
||||||
--card-border-color: transparent;
|
--card-border-color: transparent;
|
||||||
--card-box-shadow: none;
|
--card-box-shadow: none;
|
||||||
|
|
||||||
|
|||||||
@@ -211,8 +211,8 @@
|
|||||||
--new-tab-button-hover-color: black;
|
--new-tab-button-hover-color: black;
|
||||||
|
|
||||||
--right-pane-background-color: var(--main-background-color);
|
--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-background-color-bgfx: #ffffff9e; /* Only for the vertical layout */
|
||||||
--right-pane-item-hover-background: #ececec;
|
--right-pane-item-hover-background: #00000013;
|
||||||
--right-pane-item-hover-color: inherit;
|
--right-pane-item-hover-color: inherit;
|
||||||
|
|
||||||
--scrollbar-thumb-color: #0000005c;
|
--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);
|
--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-color: #0000000d;
|
||||||
--card-background-hover-color: #f9f9f9;
|
--card-background-hover-color: #0000001c;
|
||||||
--card-background-press-color: #efefef;
|
|
||||||
--card-border-color: transparent;
|
--card-border-color: transparent;
|
||||||
--card-shadow-color: rgba(0, 0, 0, 0.1);
|
--card-shadow-color: rgba(0, 0, 0, 0.1);
|
||||||
--card-box-shadow: none;
|
--card-box-shadow: none;
|
||||||
|
|||||||
@@ -487,13 +487,21 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
|
|||||||
--note-list-vertical-padding: 15px;
|
--note-list-vertical-padding: 15px;
|
||||||
background-color: var(--card-background-color);
|
background-color: var(--card-background-color);
|
||||||
border: 1px solid var(--card-border-color) !important;
|
border: 1px solid var(--card-border-color) !important;
|
||||||
box-shadow: 2px 3px 4px var(--card-shadow-color);
|
|
||||||
border-radius: 12px;
|
border-radius: 12px;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
margin: 5px 10px 5px 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 {
|
.note-list.list-view .note-book-card {
|
||||||
box-shadow: 0 0 3px var(--card-shadow-color);
|
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;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
.note-list-wrapper .note-book-card:active {
|
|
||||||
background-color: var(--card-background-press-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.note-list-wrapper .note-book-card a {
|
.note-list-wrapper .note-book-card a {
|
||||||
color: inherit !important;
|
color: inherit !important;
|
||||||
}
|
}
|
||||||
@@ -592,7 +596,6 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.note-list.grid-view .note-book-card:hover {
|
.note-list.grid-view .note-book-card:hover {
|
||||||
background: var(--card-background-color) !important;
|
|
||||||
filter: contrast(105%);
|
filter: contrast(105%);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -674,4 +674,17 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
|
|||||||
|
|
||||||
.ck-content a.reference-link > span {
|
.ck-content a.reference-link > span {
|
||||||
text-decoration: underline;
|
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;
|
||||||
}
|
}
|
||||||
@@ -101,7 +101,7 @@
|
|||||||
.sql-table-schemas-widget .sql-table-schemas button:hover,
|
.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:active,
|
||||||
.sql-table-schemas-widget .sql-table-schemas button:focus-visible {
|
.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);
|
--color: var(--main-text-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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 {
|
body.background-effects.theme-supports-background-effects.platform-win32.layout-horizontal {
|
||||||
--center-pane-background-color-bgfx: var(--center-pane-horiz-layout-background-color-bgfx);
|
--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,
|
body.background-effects.theme-supports-background-effects.platform-win32,
|
||||||
|
|||||||
@@ -10,10 +10,6 @@ body.prefers-centered-content .note-detail {
|
|||||||
margin-inline: auto;
|
margin-inline: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.note-detail.full-height {
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.note-detail > * {
|
.note-detail > * {
|
||||||
contain: none;
|
contain: none;
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,7 @@ body.zen div.read-only-note-info-bar-widget {
|
|||||||
max-width: var(--max-content-width);
|
max-width: var(--max-content-width);
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
border: unset;
|
border: unset;
|
||||||
margin: 0 auto;
|
margin: 0 auto 10px auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.read-only-note-info-bar-widget-content {
|
.read-only-note-info-bar-widget-content {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
contain: none !important;
|
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 */
|
/* Horizontally center the widget in its parent when the "Keep content centered" option is on */
|
||||||
margin-inline: auto;
|
margin-inline: auto;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
.calendar-view {
|
.calendar-view {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
outline: 0;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
@@ -67,6 +68,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
body.desktop:not(.zen) .calendar-view .calendar-header {
|
body.desktop:not(.zen) .calendar-view .calendar-header {
|
||||||
|
padding-block-start: 4px;
|
||||||
padding-inline-end: 5em;
|
padding-inline-end: 5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,8 +25,7 @@ export default class ContentHeader extends Container<BasicWidget> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
this.parentElement = this.parent!.$widget.get(0);
|
this.parentElement = this.parent?.$widget.get(0);
|
||||||
|
|
||||||
if (!this.parentElement) {
|
if (!this.parentElement) {
|
||||||
console.warn("No parent set for <ContentHeader>.");
|
console.warn("No parent set for <ContentHeader>.");
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -126,7 +126,8 @@ export const TYPE_MAPPINGS: Record<ExtendedNoteType, NoteTypeMapping> = {
|
|||||||
relationMap: {
|
relationMap: {
|
||||||
view: () => import("./type_widgets/relation_map/RelationMap"),
|
view: () => import("./type_widgets/relation_map/RelationMap"),
|
||||||
className: "note-detail-relation-map",
|
className: "note-detail-relation-map",
|
||||||
printable: true
|
printable: true,
|
||||||
|
isFullHeight: true
|
||||||
},
|
},
|
||||||
noteMap: {
|
noteMap: {
|
||||||
view: () => import("./type_widgets/NoteMap"),
|
view: () => import("./type_widgets/NoteMap"),
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
.info-bar {
|
.info-bar {
|
||||||
--link-color: var(--main-text-color);
|
--link-color: currentColor;
|
||||||
|
|
||||||
margin-top: 4px;
|
margin-top: 4px;
|
||||||
contain: unset !important;
|
contain: unset !important;
|
||||||
padding: 8px 20px;
|
padding: 8px 20px;
|
||||||
color: var(--read-only-note-info-bar-color);
|
color: var(--read-only-note-info-bar-color);
|
||||||
font-size: .9em;
|
font-size: .9em;
|
||||||
|
cursor: default;
|
||||||
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.info-bar-prominent {
|
.info-bar-prominent {
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
|
.canvas-widget {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.excalidraw .App-menu_top .buttonList {
|
.excalidraw .App-menu_top .buttonList {
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
.note-detail-relation-map {
|
.note-detail-relation-map {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
overflow: hidden !important;
|
overflow: hidden !important;
|
||||||
padding: 10px;
|
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1,7 @@
|
|||||||
{}
|
{
|
||||||
|
"get-started": {
|
||||||
|
"title": "Mulai",
|
||||||
|
"desktop_title": "Unduh aplikasi desktop (v{{version}})",
|
||||||
|
"architecture": "Arsitektur:"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
12
docs/README-id.md
vendored
12
docs/README-id.md
vendored
@@ -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>
|
<a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="./docs/app.png" alt="Trilium Screenshot" width="1000"></a>
|
||||||
|
|
||||||
## ⏬ Download
|
## ⏬ Unduh
|
||||||
- [Latest release](https://github.com/TriliumNext/Trilium/releases/latest) –
|
- [Rilis terbaru](https://github.com/TriliumNext/Trilium/releases/latest) –
|
||||||
stable version, recommended for most users.
|
versi stabil, direkomendasikan.
|
||||||
- [Nightly build](https://github.com/TriliumNext/Trilium/releases/tag/nightly) –
|
- [Rilis nightly](https://github.com/TriliumNext/Trilium/releases/tag/nightly) –
|
||||||
unstable development version, updated daily with the latest features and
|
versi pengembangan, tidak stabil, diperbarui setiap hari dengan fitur dan
|
||||||
fixes.
|
perbaikan terbaru.
|
||||||
|
|
||||||
## 📚 Dokumentasi
|
## 📚 Dokumentasi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user