Commit d9b8a7ca authored by Laurent Heirendt's avatar Laurent Heirendt

Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !13
parents 3f950f06 b4b07184
......@@ -81,6 +81,11 @@
minScale: 0.1,
maxScale: 2.5,
math: {
mathjax: 'http://cdn.mathjax.org/mathjax/latest/MathJax.js',
config: 'TeX-AMS_HTML-full' // See http://docs.mathjax.org/en/latest/config-files.html
},
theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
transition: Reveal.getQueryHash().transition || 'default', // default/cube/page/concave/zoom/linear/fade/none
......@@ -92,7 +97,8 @@
{ src: 'theme/reveal.js/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
{ src: 'theme/reveal.js/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: 'theme/reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: 'theme/reveal.js/plugin/fullscreen/fullscreen.js' },
{ src: 'theme/reveal.js/plugin/notes/notes.js', async: true, condition: function () { return !!document.body.classList; } },
{ src: 'theme/reveal.js/plugin/math/math.js', async: true }
]
});
</script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment