Commit 243867f9 authored by Hakim El Hattab's avatar Hakim El Hattab
Browse files

merge upgrade of highlight.js, add base styles to pre code, dont limit...

merge upgrade of highlight.js, add base styles to pre code, dont limit language detection in index.html #809
parent b8157a1e
......@@ -353,10 +353,13 @@ body {
font-family: monospace;
}
.reveal pre code {
display: block;
padding: 5px;
overflow: auto;
max-height: 400px;
word-wrap: normal;
background: #3F3F3F;
color: #DCDCDC;
}
.reveal pre.stretch code {
height: 100%;
......
This diff is collapsed.
......@@ -412,10 +412,7 @@ function linkify( selector ) {
{ src: 'lib/js/classList.js', condition: function() { return !document.body.classList; } },
{ src: 'plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'plugin/highlight/highlight.js', async: true, callback: function() {
hljs.configure({languages:['js','html']}); // limit language detection to what's in the presentation
hljs.initHighlightingOnLoad();
} },
{ src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
{ src: 'plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: 'plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
]
......
Supports Markdown
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