jan/revproxy-presentation
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remove theme config option #1061

Browse source
This commit is contained in:
Hakim El Hattab 2014-12-18 17:45:51 +01:00
parent c3f9aabe04
commit 7c03d60186
2 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
index.html
View file

@ -163,16 +163,17 @@
<h2>Themes</h2> <h2>Themes</h2>
<p> <p>
reveal.js comes with a few themes built in: <br> reveal.js comes with a few themes built in: <br>
<a href="?#/themes">Black (default)</a> - <!-- Hacks to swap themes after the page has loaded. Not flexible and only intended for the reveal.js demo deck. -->
<a href="?theme=white#/themes">White</a> - <a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/test.css'); return false;">Black (default)</a> -
<a href="?theme=league#/themes">League</a> - <a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/white.css'); return false;">White</a> -
<a href="?theme=sky#/themes">Sky</a> - <a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/league.css'); return false;">League</a> -
<a href="?theme=beige#/themes">Beige</a> - <a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/sky.css'); return false;">Sky</a> -
<a href="?theme=simple#/themes">Simple</a> <br> <a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/beige.css'); return false;">Beige</a> -
<a href="?theme=serif#/themes">Serif</a> - <a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/simple.css'); return false;">Simple</a> <br>
<a href="?theme=night#/themes">Night</a> - <a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/serif.css'); return false;">Serif</a> -
<a href="?theme=moon#/themes">Moon</a> - <a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/night.css'); return false;">Night</a> -
<a href="?theme=solarized#/themes">Solarized</a> <a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/moon.css'); return false;">Moon</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/solarized.css'); return false;">Solarized</a>
</p> </p>
<p> <p>
<small> <small>

15
js/reveal.js
View file

@ -121,9 +121,6 @@
// Focuses body when page changes visiblity to ensure keyboard shortcuts work // Focuses body when page changes visiblity to ensure keyboard shortcuts work
focusBodyOnPageVisibilityChange: true, focusBodyOnPageVisibilityChange: true,
// Theme (see /css/theme)
theme: null,
// Transition style // Transition style
transition: 'default', // none/fade/slide/convex/concave/zoom transition: 'default', // none/fade/slide/convex/concave/zoom
@ -870,18 +867,6 @@
} ); } );
} }
// Load the theme in the config, if it's not already loaded
if( config.theme && dom.theme ) {
var themeURL = dom.theme.getAttribute( 'href' );
var themeFinder = /[^\/]*?(?=\.css)/;
var themeName = themeURL.match(themeFinder)[0];
if( config.theme !== themeName ) {
themeURL = themeURL.replace(themeFinder, config.theme);
dom.theme.setAttribute( 'href', themeURL );
}
}
sync(); sync();
} }