marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-20 07:49:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2017-05-cli-output

Browse Source
This commit is contained in:
Tyler Long
2017-05-31 22:43:19 +08:00
committed by GitHub
parent e3585a7d66 952fe4923c
commit ef07012359
7 changed files with 382 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/index.html
View File

@@ -10,7 +10,7 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
<!-- Latest compiled and minified JavaScript -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.5/angular.min.js"></script>
<script src="nav.js"></script>
</head>
<body style="height:1000px" ng-app="navApp">
@@ -21,4 +21,4 @@
<iframe src="{{frameUrl}}" style="float:right;width:90%;height:1000px;"></iframe>
</div>
</body>
</html>
</html>