dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 22:09:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

flowchart/mermaid: remove the surrounding pre

Browse Source
This commit is contained in:
Le Tan 2018-03-16 21:38:25 +08:00
parent 47b4cc88aa
commit dfbb692b15
5 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/resources/markdown_template.js
View File

@ -536,8 +536,7 @@ var renderMermaidOne = function(code) {
graphDiv.classList.add(VMermaidDivClass); graphDiv.classList.add(VMermaidDivClass);
graphDiv.innerHTML = graph; graphDiv.innerHTML = graph;
var preNode = code.parentNode; var preNode = code.parentNode;
preNode.classList.add(VMermaidDivClass); preNode.parentNode.replaceChild(graphDiv, preNode);
preNode.replaceChild(graphDiv, code);
return true; return true;
}; };
@ -582,19 +581,19 @@ var renderFlowchartOne = function(code) {
graphDiv.id = 'flowchart-diagram-' + flowchartIdx; graphDiv.id = 'flowchart-diagram-' + flowchartIdx;
graphDiv.classList.add(VFlowchartDivClass); graphDiv.classList.add(VFlowchartDivClass);
var preNode = code.parentNode; var preNode = code.parentNode;
preNode.replaceChild(graphDiv, code); var preParentNode = preNode.parentNode;
preParentNode.replaceChild(graphDiv, preNode);
// Draw on it after adding it to page. // Draw on it after adding it to page.
try { try {
graph.drawSVG(graphDiv.id); graph.drawSVG(graphDiv.id);
} catch (err) { } catch (err) {
content.setLog("err: " + err); content.setLog("err: " + err);
preNode.replaceChild(code, graphDiv); preParentNode.replaceChild(preNode, graphDiv);
delete graphDiv; delete graphDiv;
return false; return false;
} }
preNode.classList.add(VMermaidDivClass);
return true; return true;
}; };

8
src/resources/themes/v_moonlight/v_moonlight.css
View File

@ -169,20 +169,12 @@ div.mermaid-diagram {
color: #6C6C6C; color: #6C6C6C;
} }
pre.mermaid-diagram {
overflow-y: hidden;
}
div.flowchart-diagram { div.flowchart-diagram {
overflow-y: hidden; overflow-y: hidden;
background: #B0BEC5; background: #B0BEC5;
color: #6C6C6C; color: #6C6C6C;
} }
pre.flowchart-diagram {
overflow-y: hidden;
}
.img-package { .img-package {
text-align: center; text-align: center;
} }

8
src/resources/themes/v_pure/v_pure.css
View File

@ -173,18 +173,10 @@ div.mermaid-diagram {
overflow-y: hidden; overflow-y: hidden;
} }
pre.mermaid-diagram {
overflow-y: hidden;
}
div.flowchart-diagram { div.flowchart-diagram {
overflow-y: hidden; overflow-y: hidden;
} }
pre.flowchart-diagram {
overflow-y: hidden;
}
.img-package { .img-package {
text-align: center; text-align: center;
} }

8
src/resources/themes/v_white/v_white.css
View File

@ -172,18 +172,10 @@ div.mermaid-diagram {
overflow-y: hidden; overflow-y: hidden;
} }
pre.mermaid-diagram {
overflow-y: hidden;
}
div.flowchart-diagram { div.flowchart-diagram {
overflow-y: hidden; overflow-y: hidden;
} }
pre.flowchart-diagram {
overflow-y: hidden;
}
.img-package { .img-package {
text-align: center; text-align: center;
} }

2
src/vnote.cpp
View File

@ -126,6 +126,8 @@ QString VNote::generateHtmlTemplate(const QString &p_renderBg,
"pre code { white-space: pre-wrap !important; " "pre code { white-space: pre-wrap !important; "
"word-break: break-all !important; }\n" "word-break: break-all !important; }\n"
"code { word-break: break-all !important; }\n" "code { word-break: break-all !important; }\n"
"div.flowchart-diagram { overflow: hidden !important; }\n"
"div.mermaid-diagram { overflow: hidden !important; }\n"
"a { word-break: break-all !important; }\n"; "a { word-break: break-all !important; }\n";
if (!g_config->getEnableImageConstraint()) { if (!g_config->getEnableImageConstraint()) {
// Constain the image width by force in PDF, otherwise, the PDF will // Constain the image width by force in PDF, otherwise, the PDF will