Merge 2163334c4f6d88a94cdab18a4cc7558fcd90acdd into 8eca14069a263efac5133f0aa6e946e0ad9d554e

apps/client/src/stylesheets/style.css

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

apps/client/src/widgets/dialogs/markdown_import.tsx

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