Merge pull request #27 from mermaid-js/develop

sync
mermaid-js · Aug 12, 2020 · 595e03c · 595e03c
2 parents b95a9bb + aacf84f
commit 595e03c
Show file tree

Hide file tree

Showing 10 changed files with 99,420 additions and 15 deletions.
diff --git a/cypress/platform/current.html b/cypress/platform/current.html
@@ -74,15 +74,22 @@ <h1>info below</h1>
   A --> D: asd123
       </div>
       </div>
-      %%{init: {'theme': 'base', 'themeVariables':{ 'primaryColor': '#ff0000'}}}%%
       <div class="mermaid" style="width: 50%; height: 20%;">
-        %%{init: {'theme': 'dark'}}%%
-
-        flowchart TB
-        subgraph apa
-          a --> A %% comment
-          a --> a{apa} %% comment
-        end
+        %%{init: {'theme': 'base', 'themeVariables': { 'primaryColor': '#ff0000'}}}%%
+        graph TD
+          A[Christmas] -->|Get money| B(Go shopping)
+          B --> C{Let me think}
+          B --> G[/Another/]
+          C ==>|One| D[Laptop]
+          C -->|Two| E[iPhone]
+          C -->|Three| F[fa:fa-car Car]
+          subgraph section
+            C
+            D
+            E
+            F
+            G
+          end
       </div>
       <div class="mermaid2" style="width: 50%; height: 20%;">
 graph TD
@@ -106,7 +113,7 @@ <h1>info below</h1>
           // console.error('Mermaid error: ', err);
         };
       mermaid.initialize({
-        theme: 'forest',
+        // theme: 'forest',
         // themeVariables:{primaryColor: '#ff0000'},
         // arrowMarkerAbsolute: true,
         // themeCSS: '.edgePath .path {stroke: red;} .arrowheadPath {fill: red;}',