Merge branch 'master' into dev

2025-03-01 10:36:34 +00:00 · 2023-12-04 15:58:45 +00:00
parent 5b5b06cc06 eff063a748
commit 33cf34f7c7
89 changed files with 903 additions and 670 deletions
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -339,6 +339,8 @@ module.exports = {
                }
                theme.codeEditor = theme.codeEditor || {}
                theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
+
+                theme.mermaid = Object.assign({}, themePlugin.mermaid, theme.mermaid)
            }
            activeThemeInitialised = true;
        }