Merge branch 'master' into feature/addSecrets

author: Raccoon 2017-03-03 09:22:35 +0800
committer: GitHub 2017-03-03 09:22:35 +0800
commit: 48592d692c2b8a71e3ca9e7f0bc34f230eea1542 (patch)
tree: 053538d49b92121e29e0e576d2e5e0b249d28537 /public/views/hackmd
parent: a8b99638b2bc4db0dffd643b96287faf4f97e030 (diff)
parent: 0bea4da6238b1f46562b146b32d88fc8d8b9060a (diff)
6 files changed, 17 insertions, 17 deletions
diff --git a/public/views/hackmd.ejs b/public/views/hackmd.ejs
index c5778fc9..49084a63 100644
--- a/public/views/hackmd.ejs
+++ b/public/views/hackmd.ejs
@@ -2,14 +2,14 @@
 <html lang="en">
 
 <head>
-    <%- include head %>
+    <%- include hackmd/head %>
 </head>
 
 <body>
-    <%- include header %>
-    <%- include body %>
-    <%- include footer %>
-    <%- include foot %>
+    <%- include hackmd/header %>
+    <%- include hackmd/body %>
+    <%- include hackmd/footer %>
+    <%- include hackmd/foot %>
 </body>
 
-</html>
-\ No newline at end of file
+</html>
diff --git a/public/views/body.ejs b/public/views/hackmd/body.ejs
index 5ad1733e..d8a3f108 100644
--- a/public/views/body.ejs
+++ b/public/views/hackmd/body.ejs
@@ -244,7 +244,7 @@
         </div>
     </div>
 </div>
-<%- include refresh-modal %>
-<%- include signin-modal %>
-<%- include help-modal %>
-<%- include revision-modal %>
+<%- include ../shared/refresh-modal %>
+<%- include ../shared/signin-modal %>
+<%- include ../shared/help-modal %>
+<%- include ../shared/revision-modal %>
diff --git a/public/views/foot.ejs b/public/views/hackmd/foot.ejs
index c1df65c2..445b0213 100644
--- a/public/views/foot.ejs
+++ b/public/views/hackmd/foot.ejs
@@ -11,18 +11,18 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js" integrity="sha256-yYfngbEKv4RENfGDvNUqJTqGFcKf31NJEe9OTnnMH3Y=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/config/TeX-AMS-MML_HTMLorMML.js" integrity="sha256-immzXfCGLhnx3Zfi9F/dUcqxEM8K3o3oTFy9Bh6HCwg=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/moment-with-locales.min.js" integrity="sha256-vvT7Ok9u6GbfnBPXnbM6FVDEO8E1kTdgHOFZOAXrktA=" crossorigin="anonymous" defer></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" integrity="sha256-Yabf6Mj1TPKd6h4F6z5xRR1/2son0Wg8NhvjYnhcQcY=" crossorigin="anonymous" defer></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/7.0.0/mermaid.min.js" integrity="sha256-1uR+pqxH5fN/rOZcZTb9c5+bR3OIYEKzu2sI11Dnj9A=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/js/emojify.min.js" integrity="sha256-VAB5tAlKBvgaxw8oJ1crWMVbdmBVl4mP/2M8MNRl+4E=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.2/lodash.min.js" integrity="sha256-Cv5v4i4SuYvwRYzIONifZjoc99CkwfncROMSWat1cVA=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.2/socket.io.min.js" integrity="sha256-WKvqiY0jZHWQZIohYEmr9KUC5rEaYEOFTq+ByllJK8w=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.6/handlebars.min.js" integrity="sha256-1O3BtOwnPyyRzOszK6P+gqaRoXHV6JXj8HkjZmPYhCI=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js" integrity="sha256-KbfTjB0WZ8vvXngdpJGY3Yp3xKk+tttbqClO11anCIU=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.6.0/gist-embed.min.js" integrity="sha256-KyF2D6xPIJUW5sUDSs93vWyZm+1RzIpKCexxElmxl8g=" crossorigin="anonymous" defer></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/1.4.1/viz.js" integrity="sha256-U0a9HpXT7zG0N3tVzo58B5S+QXUxo4FdBIjrBMYrxZI=" crossorigin="anonymous" defer></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/1.7.0/viz.js" integrity="sha256-8t+rndrF+TU4JtelmOH1lDHTMe2ovhO2UbzDArp5lY8=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.8/validator.min.js" integrity="sha256-LHeY7YoYJ0SSXbCx7sR14Pqna+52moaH3bhv0Mjzd/M=" crossorigin="anonymous" defer></script>
-<%- include build/index-scripts %>
+<%- include ../build/index-scripts %>
 <% } else { %>
 <script src="<%- url %>/build/MathJax/MathJax.js" defer></script>
 <script src="<%- url %>/build/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
-<%- include build/index-pack-scripts %>
+<%- include ../build/index-pack-scripts %>
 <% } %>
diff --git a/public/views/footer.ejs b/public/views/hackmd/footer.ejs
index e69de29b..e69de29b 100644
--- a/public/views/footer.ejs
+++ b/public/views/hackmd/footer.ejs
diff --git a/public/views/head.ejs b/public/views/hackmd/head.ejs
index 218847f7..d0663993 100644
--- a/public/views/head.ejs
+++ b/public/views/hackmd/head.ejs
@@ -14,9 +14,9 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" integrity="sha256-QiWfLIsCT02Sdwkogf6YMiQlj4NE84MKkzEMkZnMGdg=" crossorigin="anonymous" />
 <link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
-<%- include build/index-header %>
+<%- include ../build/index-header %>
 <% } else { %>
 <link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
-<%- include build/index-pack-header %>
+<%- include ../build/index-pack-header %>
 <% } %>
-<%- include polyfill %>
-\ No newline at end of file
+<%- include ../shared/polyfill %>
+\ No newline at end of file
diff --git a/public/views/header.ejs b/public/views/hackmd/header.ejs
index bb4e3174..bb4e3174 100644
--- a/public/views/header.ejs
+++ b/public/views/hackmd/header.ejs
author	Raccoon	2017-03-03 09:22:35 +0800
committer	GitHub	2017-03-03 09:22:35 +0800
commit	48592d692c2b8a71e3ca9e7f0bc34f230eea1542 (patch)
tree	053538d49b92121e29e0e576d2e5e0b249d28537 /public/views/hackmd
parent	a8b99638b2bc4db0dffd643b96287faf4f97e030 (diff)
parent	0bea4da6238b1f46562b146b32d88fc8d8b9060a (diff)