xobs
/
fa20-bt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge upgrade of highlight.js, add base styles to pre code, dont limit language detection in index.html #809

This commit is contained in:
Hakim El Hattab 2014-03-25 16:56:33 +01:00
parent b8157a1e91
commit 243867f91e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
css/reveal.css
View File

@ -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%;

2
css/reveal.min.css vendored
View File

File diff suppressed because one or more lines are too long

5
index.html
View File

@ -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; } }
]