diff options
| author | Yukai Huang | 2017-01-21 14:05:51 +0800 |
|---|---|---|
| committer | Yukai Huang | 2017-01-21 14:05:51 +0800 |
| commit | 0e479111e55354434b5100ae165627f5fabe06b5 (patch) | |
| tree | 451aced97ba8a111a9635a2e0d113aa8fcc7d5b7 /public/views/hackmd | |
| parent | 74b04d08b5a4cf51ba71dd1ea12388974e74f4df (diff) | |
| parent | a669c201beb3755703e87984268cbd08145e9ac6 (diff) | |
Merge branch 'master' into es6-integration
Diffstat (limited to '')
| -rw-r--r-- | public/views/hackmd.ejs | 12 | ||||
| -rw-r--r-- | public/views/hackmd/body.ejs (renamed from public/views/body.ejs) | 8 | ||||
| -rw-r--r-- | public/views/hackmd/foot.ejs (renamed from public/views/foot.ejs) | 4 | ||||
| -rw-r--r-- | public/views/hackmd/footer.ejs (renamed from public/views/footer.ejs) | 0 | ||||
| -rw-r--r-- | public/views/hackmd/head.ejs (renamed from public/views/head.ejs) | 6 | ||||
| -rw-r--r-- | public/views/hackmd/header.ejs (renamed from public/views/header.ejs) | 0 |
6 files changed, 15 insertions, 15 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..178b5504 100644 --- a/public/views/foot.ejs +++ b/public/views/hackmd/foot.ejs @@ -20,9 +20,9 @@ <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/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 |