GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity

Testcommit

Browse Source
This commit is contained in:
Knut Sveidqvist 2020-06-15 22:26:11 +02:00
parent 603f2a2154
commit b5d457daa9
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cypress/integration/other/configuration.spec.js
View File

@ -88,7 +88,7 @@ describe('Configuration', () => {
C -->|Three| F[fa:fa-car Car] C -->|Three| F[fa:fa-car Car]
`, `,
{ {
logLevel:0, arrowMarkerAbsolute: true logLevel:0, arrowMarkerAbsolute: true,fontFamily: '"Noto Sans SC", sans-serif'
} }
); );

10
cypress/platform/e2e.html
View File

@ -6,12 +6,12 @@
<style> <style>
body { body {
/* font-family: 'Mansalva', cursive;*/ /* font-family: 'Mansalva', cursive;*/
font-family: 'Mansalva', cursive; font-family: '"Noto Sans SC", sans-serif';
}
.mermaid-main-font {
font-family: '"Noto Sans SC", sans-serif';
/* font-family: var(--mermaid-font-family); */
} }
/* .mermaid-main-font {
font-family: "trebuchet ms", verdana, arial;
font-family: var(--mermaid-font-family);
} */
/* :root { /* :root {
--mermaid-font-family: '"trebuchet ms", verdana, arial'; --mermaid-font-family: '"trebuchet ms", verdana, arial';
--mermaid-font-family: "Comic Sans MS", "Comic Sans", cursive; --mermaid-font-family: "Comic Sans MS", "Comic Sans", cursive;

5
src/mermaidAPI.js
View File

@ -702,6 +702,7 @@ export const decodeEntities = function(text) {
*/ */
const render = function(id, _txt, cb, container) { const render = function(id, _txt, cb, container) {
const cnf = getConfig(); const cnf = getConfig();
console.warn(cnf);
// Check the maximum allowed text size // Check the maximum allowed text size
let txt = _txt; let txt = _txt;
if (_txt.length > cnf.maxTextSize) { if (_txt.length > cnf.maxTextSize) {
@ -941,7 +942,7 @@ function reinitialize(options) {
let firstInit = true; let firstInit = true;
function initialize(options) { function initialize(options) {
// console.log('mermaidAPI.initialize'); console.log('mermaidAPI.initialize');
// Set default options // Set default options
if (typeof options === 'object') { if (typeof options === 'object') {
if (firstInit) { if (firstInit) {
@ -950,7 +951,7 @@ function initialize(options) {
} }
setConfig(options); setConfig(options);
} }
logger.warn('Initializing mermaidAPI theme', { console.warn('Initializing mermaidAPI theme', {
version: pkg.version, version: pkg.version,
options, options,
config, config,