marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-10-04 06:39:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr/2'

Browse Source 
Conflicts:
	.gitignore
	dist/mermaid.full.min.js
	dist/mermaid.slim.min.js
This commit is contained in:
Björn Weström
2014-12-14 22:30:42 +01:00
parent 429b901e7a eb7c341046
commit e550ef9e25
8 changed files with 311 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/web.html
View File

@@ -39,7 +39,7 @@
di{Diamond is <br/> broken}-->ro(Rounded<br>square<br>shape);
di-->ro2(Rounded square shape);
%% Comments after double percent signs
e((Inner circle))-->f(,.?!+-*ز);
e((Inner / circle))-->f(,.?!+-*ز);
cyr[Cyrillic]-->cyr2((Circle shape Начало));
style e red;
</div>
@@ -58,7 +58,7 @@
<div class="mermaid">
sequenceDiagram
Alice->Bob: Hello Bob, how are you?
Note right of Bob: Bob thinks
Note right of Bob: Bob thinks about <br/> things <br/> to think about
Bob-->Alice: I am good thanks!
Bob-->John the Long: How about you John?
Bob-->Alice: Checking with John...