63 Commits

Author SHA1 Message Date
Björn Weström
a23fce6c2d Cleanup after merge 2015-01-13 21:55:10 +01:00
Björn Weström
9f970ed953 Merge branch 'master' into text-labels
Conflicts:
	dist/mermaid.full.js
	dist/mermaid.full.min.js
	dist/mermaid.slim.js
	dist/mermaid.slim.min.js
	src/diagrams/flowchart/flowRenderer.js
	src/utils.js
	test/web_style.html
2015-01-13 21:50:05 +01:00
Björn Weström
43d2b0b9d7 Improved style handling 2015-01-11 16:15:57 +01:00
knsv
5a720b6d63 Introducing subgraphs 2015-01-07 21:02:58 +01:00
knsv
f9943b6b82 Support for different arrow types in sequence diagrams: no arrow head, cross head and regular arrow head. 2015-01-04 17:56:58 +01:00
knsv
5fc873468d Styling of sequence diagrams from css classes 2014-12-21 20:59:11 +01:00
Björn Weström
f656269a50 Improved class styling for nodes
Added unit testing
classDefs are now exported to the common style of the SVG
Styling is no longer copied from other mermaid SVGs on the same webpage
2014-12-14 22:15:47 +01:00
Björn Weström
3fcbc7ae56 Added class definitions to nodes
Removed the inline styling of nodes with classes, replaced with class
attributes and a common CSS Style section at the start of the SVG.
2014-12-14 00:32:27 +01:00
knsv
92439fbdf3 Merge branch 'master' of https://github.com/knsv/mermaid
Conflicts:
	gulpfile.js
2014-12-11 19:35:03 +01:00
knsv
977df99c80 * Support for comments pointed out in issue #47 2014-12-11 19:23:36 +01:00
Jason Kim
202af046aa Made changes based on jslint 2014-12-09 22:26:42 -08:00
knsv
4c564ebe9e Adding experimental new grammars 2014-12-04 17:58:05 +01:00
knsv
2317ea5117 Better text handling for flowcharts 2014-11-25 18:58:47 +01:00