Skip to content

Commit

Permalink
Merge pull request #1 from mermaid-js/develop
Browse files Browse the repository at this point in the history
Merge upstream
  • Loading branch information
cmmoran authored Jul 1, 2020
2 parents 0849aa3 + 200a3e5 commit 19519ac
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ pie

## Related projects

- [Command Line Interface](https://github.com/mermaid-js/mermaid.cli)
- [Command Line Interface](https://github.com/mermaid-js/mermaid-cli)
- [Live Editor](https://github.com/mermaid-js/mermaid-live-editor)
- [HTTP Server](https://github.com/TomWright/mermaid-server)

Expand Down
9 changes: 7 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="description" content="Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css">
<!-- <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css"> -->
<link rel="stylesheet" href="theme.css">
<script src="//cdn.jsdelivr.net/npm/[email protected]/dist/mermaid.min.js"></script>
<!-- <script src="http://localhost:9000/mermaid.js"></script> -->
<script>
Expand Down Expand Up @@ -54,7 +55,11 @@
}

var num = 0;
mermaid.initialize({ logLevel:0, startOnLoad: false, themeCSS:'.label { font-family: Source Sans Pro,Helvetica Neue,Arial,sans-serif; }' });
const isDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches

const conf = { logLevel:4, startOnLoad: false, themeCSS:'.label { font-family: Source Sans Pro,Helvetica Neue,Arial,sans-serif; }' };
if(isDarkMode) conf.theme = 'dark';
mermaid.initialize(conf);

</script>
<script>
Expand Down
4 changes: 4 additions & 0 deletions docs/sequenceDiagram.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ sequenceDiagram
John-->>Alice: Great!
```

## A note on nodes, the word "end" could potentially break the diagram, due to the way that the mermaid language is scripted.
## If unavoidable, one must use parentheses(), quotation marks "", or brackets {},[], to enclose the word "end". i.e : (end), [end], {end}.


## Syntax

### Participants
Expand Down
Loading

0 comments on commit 19519ac

Please sign in to comment.