git.iko.soy/typeable/pandoc
on master help sign in
Moved themes after fonts

If themes are loaded after fonts then they can override fonts. Otherwise, what the themes set will be overridden by the fallback loading of lmodern.sty.

commitdb0cda8f2e7978e28c3da253c43c387e8a35be4c authorThomas Hodgson <twsh@users.noreply.github.com> dateTue 8 Dec 2015, 18:16 (11 years ago) parent16e9428
1 file changed+18−18
default.beamer+18−18
default.beamer+18−18
@@ -1,22 +1,4 @@
11\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(handout)$handout,$endif$$if(beamer)$ignorenonframetext,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
2−$if(theme)$
3−\usetheme{$theme$}
4−$endif$
5−$if(colortheme)$
6−\usecolortheme{$colortheme$}
7−$endif$
8−$if(fonttheme)$
9−\usefonttheme{$fonttheme$}
10−$endif$
11−$if(mainfont)$
12−\usefonttheme{serif} % use mainfont rather than sansfont for slide text
13−$endif$
14−$if(innertheme)$
15−\useinnertheme{$innertheme$}
16−$endif$
17−$if(outertheme)$
18−\useoutertheme{$outertheme$}
19−$endif$
202\setbeamertemplate{caption}[numbered]
213\setbeamertemplate{caption label separator}{: }
224\setbeamercolor{caption name}{fg=normal text.fg}
@@ -59,6 +41,24 @@ $if(CJKmainfont)$
5941 \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
6042$endif$
6143\fi
44+$if(theme)$
45+\usetheme{$theme$}
46+$endif$
47+$if(colortheme)$
48+\usecolortheme{$colortheme$}
49+$endif$
50+$if(fonttheme)$
51+\usefonttheme{$fonttheme$}
52+$endif$
53+$if(mainfont)$
54+\usefonttheme{serif} % use mainfont rather than sansfont for slide text
55+$endif$
56+$if(innertheme)$
57+\useinnertheme{$innertheme$}
58+$endif$
59+$if(outertheme)$
60+\useoutertheme{$outertheme$}
61+$endif$
6262% use upquote if available, for straight quotes in verbatim environments
6363\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
6464% use microtype if available