gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-05 06:54:23 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge 2163334c4f6d88a94cdab18a4cc7558fcd90acdd into 8eca14069a263efac5133f0aa6e946e0ad9d554e

Browse Source
This commit is contained in:
SngAbc 2025-12-01 12:02:46 +00:00 committed by GitHub
commit 29b1cfd978
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/src/stylesheets/style.css
View File

@ -1017,7 +1017,7 @@ div[data-notify="container"] {
svg.ck-icon { svg.ck-icon {
&.ck-icon_inherit-color { &.ck-icon_inherit-color {
* { path {
fill: currentColor; fill: currentColor;
} }
} }

18
apps/client/src/widgets/dialogs/markdown_import.tsx
View File

@ -37,12 +37,21 @@ export default function MarkdownImportDialog() {
return ( return (
<Modal <Modal
className="markdown-import-dialog" title={t("markdown_import.dialog_title")} size="lg" className="markdown-import-dialog" title={t("markdown_import.dialog_title")} size="lg"
footer={<Button className="markdown-import-button" text={t("markdown_import.import_button")} onClick={() => setShown(false)} keyboardShortcut="Ctrl+Enter" />} footer={
onShown={() => markdownImportTextArea.current?.focus()} <Button
onHidden={async () => { className="markdown-import-button"
text={t("markdown_import.import_button")}
keyboardShortcut="Ctrl+Enter"
onClick={async () => {
setShown(false);
if (editorApiRef.current) { if (editorApiRef.current) {
await convertMarkdownToHtml(text, editorApiRef.current); await convertMarkdownToHtml(text, editorApiRef.current);
} }
}}
/>
}
onShown={() => markdownImportTextArea.current?.focus()}
onHidden={() => {
setShown(false); setShown(false);
setText(""); setText("");
}} }}
@ -56,6 +65,9 @@ export default function MarkdownImportDialog() {
if (e.key === "Enter" && e.ctrlKey) { if (e.key === "Enter" && e.ctrlKey) {
e.preventDefault(); e.preventDefault();
setShown(false); setShown(false);
if (editorApiRef.current) {
convertMarkdownToHtml(text, editorApiRef.current);
}
} }
}}></textarea> }}></textarea>
</Modal> </Modal>