Merge branch 'develop' into refactor-sequences

# Conflicts:
#	dist/mermaid.core.js
#	dist/mermaid.core.js.map
#	dist/mermaid.js
#	dist/mermaid.js.map
#	dist/mermaid.min.js
#	dist/mermaid.min.js.map
#	src/config.js
#	src/mermaidAPI.js
This commit is contained in:
Chris Moran
2020-06-17 06:12:02 -04:00
16 changed files with 836 additions and 913 deletions

View File

@@ -1351,7 +1351,7 @@ describe('when rendering a sequenceDiagram with directives', function() {
renderer.setConf(conf);
});
it('it should handle one actor, when theme is dark and logLevel is 1', function() {
it('it should handle one actor, when theme is dark and logLevel is 1 DX1', function() {
renderer.bounds.init();
const str = `
%%{init: { "theme": "dark", "logLevel": 1 } }%%