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