diff options
Diffstat (limited to 'public')
-rw-r--r-- | public/js/index.js | 5 | ||||
-rw-r--r-- | public/js/public.js | 3 | ||||
-rw-r--r-- | public/js/slide.js | 3 | ||||
-rw-r--r-- | public/views/foot.ejs | 7 | ||||
-rw-r--r-- | public/views/head.ejs | 5 | ||||
-rw-r--r-- | public/views/index.ejs | 3 | ||||
-rw-r--r-- | public/views/pretty.ejs | 10 | ||||
-rw-r--r-- | public/views/slide.ejs | 3 |
8 files changed, 17 insertions, 22 deletions
diff --git a/public/js/index.js b/public/js/index.js index 626799c4..20a76ff1 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1,9 +1,6 @@ /* jquery and jquery plugins */ require('../vendor/showup/showup'); -/* bootstrap */ -require('bootstrap/dist/css/bootstrap.css'); - require('prismjs/themes/prism.css'); require('highlight.js/styles/github-gist.css'); @@ -15,6 +12,8 @@ var saveAs = require('file-saver').saveAs; require('js-url'); require('randomcolor'); +var _ = require("lodash"); + var List = require('list.js'); var common = require('./common.js'); diff --git a/public/js/public.js b/public/js/public.js index 5fd3fd79..ac951804 100644 --- a/public/js/public.js +++ b/public/js/public.js @@ -1,9 +1,6 @@ /* jquery and jquery plugins */ require('../vendor/showup/showup'); -/* bootstrap */ -require('bootstrap/dist/css/bootstrap.css'); - require('prismjs/themes/prism.css'); require('highlight.js/styles/github-gist.css'); diff --git a/public/js/slide.js b/public/js/slide.js index 1f4892f9..257c60bb 100644 --- a/public/js/slide.js +++ b/public/js/slide.js @@ -1,6 +1,3 @@ -require('bootstrap/js/tooltip'); -require('bootstrap/dist/css/bootstrap.css'); - require('prismjs/themes/prism.css'); /* other vendors plugin */ diff --git a/public/views/foot.ejs b/public/views/foot.ejs index 323d18f3..696fe3b6 100644 --- a/public/views/foot.ejs +++ b/public/views/foot.ejs @@ -3,11 +3,8 @@ </script> <% if(useCDN) { %> <script src="//cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js" defer></script> -<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> <script src="//cdn.jsdelivr.net/velocity/1.3.1/velocity.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js" defer></script> -<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script> -<script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.5.0/socket.io.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script> <script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment-with-locales.min.js" defer></script> @@ -20,6 +17,10 @@ <script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script> <script src="<%- url %>/vendor/mermaid/dist/mermaid.min.js" defer></script> <% } %> +<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> +<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script> +<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.16.4/lodash.min.js" defer></script> +<script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.5.0/socket.io.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/viz.js/1.3.0/viz.js" defer></script> <%- include build/index-scripts %> <script src="<%- url %>/js/google-drive-upload.js" defer></script> diff --git a/public/views/head.ejs b/public/views/head.ejs index f4ba108a..67884495 100644 --- a/public/views/head.ejs +++ b/public/views/head.ejs @@ -8,17 +8,16 @@ <link rel="icon" type="image/png" href="<%- url %>/favicon.png"> <link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png"> <% if(useCDN) { %> -<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> -<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"> <link rel="stylesheet" href="//cdn.jsdelivr.net/ionicons/2.0.1/css/ionicons.min.css"> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css"> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css"> <% } else { %> -<link rel="stylesheet" href="<%- url %>/vendor/font-awesome/css/font-awesome.min.css"> <link rel="stylesheet" href="<%- url %>/vendor/Ionicons/css/ionicons.min.css"> <link rel="stylesheet" href="<%- url %>/vendor/octicons/octicons/octicons.css"> <link rel="stylesheet" href="<%- url %>/css/bootstrap-social.css"> <% } %> +<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> +<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"> <link rel="stylesheet" href="<%- url %>/vendor/jquery-ui/jquery-ui.min.css"> <link rel="stylesheet" href="<%- url %>/vendor/codemirror/lib/codemirror.css"> <link rel="stylesheet" href="<%- url %>/vendor/codemirror-spell-checker/spell-checker.min.css"> diff --git a/public/views/index.ejs b/public/views/index.ejs index 0e41db57..0bc3dd50 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -195,7 +195,6 @@ ================================================== --> <!-- Placed at the end of the document so the pages load faster --> <% if(useCDN) { %> - <script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js" defer></script> <script src="//cdn.jsdelivr.net/velocity/1.3.1/velocity.min.js" defer></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" defer></script> @@ -205,6 +204,8 @@ <script src="<%- url %>/vendor/velocity/velocity.min.js" defer></script> <script src="<%- url %>/vendor/moment/min/moment-with-locales.min.js" defer></script> <% } %> + <script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js" defer></script> + <script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.16.4/lodash.min.js" defer></script> <%- include build/cover-scripts %> </body> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index ecce68d9..0cd9e012 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -18,15 +18,14 @@ <link rel="icon" type="image/png" href="<%- url %>/favicon.png"> <link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png"> <% if(useCDN) { %> - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/ionicons/2.0.1/css/ionicons.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css"> <% } else { %> - <link rel="stylesheet" href='<%- url %>/vendor/font-awesome/css/font-awesome.min.css'> <link rel="stylesheet" href="<%- url %>/vendor/Ionicons/css/ionicons.min.css"> <link rel="stylesheet" href="<%- url %>/vendor/octicons/octicons/octicons.css"> <% } %> + <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> + <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"> <link rel="stylesheet" href='<%- url %>/css/github-extract.css'> <link rel="stylesheet" href='<%- url %>/css/gist.css'> <link rel="stylesheet" href="<%- url %>/css/mermaid.css"> @@ -90,8 +89,6 @@ MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }}); </script> <% if(useCDN) { %> -<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> -<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script> <script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment-with-locales.min.js" defer></script> @@ -102,6 +99,9 @@ <script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script> <script src="<%- url %>/vendor/mermaid/dist/mermaid.min.js" defer></script> <% } %> +<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script> +<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> +<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.16.4/lodash.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/viz.js/1.3.0/viz.js" defer></script> <%- include build/pretty-scripts %> <script src="<%- url %>/js/reveal-markdown.js" defer></script> diff --git a/public/views/slide.ejs b/public/views/slide.ejs index 5b24ab4e..79d77086 100644 --- a/public/views/slide.ejs +++ b/public/views/slide.ejs @@ -87,7 +87,6 @@ MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }}); </script> <% if(useCDN) { %> - <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> <script src="//cdn.jsdelivr.net/velocity/1.3.1/velocity.min.js" defer></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script> <script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script> @@ -102,6 +101,8 @@ <script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script> <script src="<%- url %>/vendor/mermaid/dist/mermaid.min.js" defer></script> <% } %> + <script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> + <script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.16.4/lodash.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/viz.js/1.3.0/viz.js" defer></script> <%- include build/slide-scripts %> </body> |