Skip to content

The Unified and Autonomous Development Platform

fix: Keep wide Markdown diagrams readable

Robin Shen1d62084afdf9
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/mermaid/mermaid-init.js b/server-core/src/main/java/io/onedev/server/web/asset/mermaid/mermaid-init.js
index 06cd4558e2..deeb1006b5 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/mermaid/mermaid-init.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/mermaid/mermaid-init.js
@@ -1,2 +1,2 @@
var mermaidTheme = onedev.server.isDarkMode()? "dark": "default";
-mermaid.mermaidAPI.initialize({theme: mermaidTheme, startOnLoad:false});
\ No newline at end of file
+mermaid.mermaidAPI.initialize({theme: mermaidTheme, themeVariables: {fontSize: "12px"}, startOnLoad:false});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
index 4dcb71c194..55e2fa67c4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
@@ -597,12 +597,13 @@ body.markdown-editor-expanded {
color: var(--dark-mode-gray) !important;
}
+.markdown-rendered .mermaid,
.markdown-rendered .plantuml {
overflow-x: auto;
margin-bottom: 1.2rem;
}
.markdown-rendered .plantuml svg {
- max-width: 100%;
+ max-width: none;
height: auto;
}
.markdown-rendered .plantuml-error {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
index b4af642b2e..77e0dfcb61 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
@@ -1354,7 +1354,13 @@ onedev.server.markdown = {
var $mermaid = $container.find(".mermaid");
if ($mermaid.length != 0)
- mermaid.init(undefined, $mermaid);
+ mermaid.init(undefined, $mermaid, function(id) {
+ var svg = document.getElementById(id);
+ if (svg && svg.viewBox.baseVal.width > 0) {
+ // Keep labels readable instead of shrinking wide diagrams to fit the page.
+ $(svg).css({width: svg.viewBox.baseVal.width, maxWidth: "none", height: "auto"});
+ }
+ });
var $plantuml = $container.find(".plantuml");
if ($plantuml.length != 0 && onedev.server.plantuml)