From be7f8b0553fc3e3d976621db5855c67226b3f115 Mon Sep 17 00:00:00 2001 From: Johann Dahm Date: Thu, 22 Jan 2015 20:39:09 -0500 Subject: [PATCH 1/3] Use palette colors instead of hardcoded names. --- beamerthemem.sty | 66 ++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/beamerthemem.sty b/beamerthemem.sty index f3a8aa6..c5db9f0 100644 --- a/beamerthemem.sty +++ b/beamerthemem.sty @@ -55,7 +55,7 @@ {\usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}\insertsubtitle\par}% \vspace*{0.5em} \fi% - \begin{tikzpicture}\draw[mLightBrown] (0, 0) -- (\textwidth, 0);\end{tikzpicture}% + \begin{tikzpicture}\draw[alerted text.fg] (0, 0) -- (\textwidth, 0);\end{tikzpicture}% \vspace*{1em} \ifx\insertauthor\@empty% \else% @@ -93,45 +93,51 @@ % the progress bar \def\progressbar@sectionprogressbar{% - \progressbar@tmpcounta=\insertframenumber - \progressbar@tmpcountb=\inserttotalframenumber - \progressbar@tmpdim=\progressbar@pbwd + {\usebeamercolor{palette primary}% + \progressbar@tmpcounta=\insertframenumber + \progressbar@tmpcountb=\inserttotalframenumber + \progressbar@tmpdim=\progressbar@pbwd \divide\progressbar@tmpdim by 100 - \multiply\progressbar@tmpdim by \progressbar@tmpcounta - \divide\progressbar@tmpdim by \progressbar@tmpcountb + \multiply\progressbar@tmpdim by \progressbar@tmpcounta + \divide\progressbar@tmpdim by \progressbar@tmpcountb \multiply\progressbar@tmpdim by 100 - \makebox[\textwidth][c]{ - \begin{tikzpicture}[tight background] + \makebox[\textwidth][c]{ + \begin{tikzpicture}[tight background] - \node[anchor=west, mDarkTeal, inner sep=0pt] at (0pt, 0pt) {\insertsectionHEAD}; + \node[anchor=west, fg, inner sep=0pt] at (0pt, 0pt) {\insertsectionHEAD}; - \draw[anchor=west, mDarkTeal!20, fill=mDarkTeal!20, inner sep=0pt] - (2pt, -16pt) rectangle ++ (\progressbar@pbwd, \progressbar@pbht); + \draw[anchor=west, fg!20, fill=fg!20, inner sep=0pt] + (2pt, -16pt) rectangle ++ (\progressbar@pbwd, \progressbar@pbht); - \draw[anchor=west, mDarkTeal, fill=mDarkTeal, inner sep=0pt] - (2pt, -16pt) rectangle ++ (\progressbar@tmpdim, \progressbar@pbht); - \end{tikzpicture}% - } + \draw[anchor=west, fg, fill=fg, inner sep=0pt] + (2pt, -16pt) rectangle ++ (\progressbar@tmpdim, \progressbar@pbht); + \end{tikzpicture}% + } + } % end usebeamercolor{palette primary} } \if@useTitleProgressBar - \def\progressbar@titleprogressbar{% - \progressbar@tmpcounta=\insertframenumber - \progressbar@tmpcountb=\inserttotalframenumber - \progressbar@tmpdim=\paperwidth - \divide\progressbar@tmpdim by 100 - \multiply\progressbar@tmpdim by \progressbar@tmpcounta - \divide\progressbar@tmpdim by \progressbar@tmpcountb - \multiply\progressbar@tmpdim by 100 +\def\progressbar@titleprogressbar{% + \progressbar@tmpcounta=\insertframenumber + \progressbar@tmpcountb=\inserttotalframenumber + \progressbar@tmpdim=\paperwidth + \divide\progressbar@tmpdim by 100 + \multiply\progressbar@tmpdim by \progressbar@tmpcounta + \divide\progressbar@tmpdim by \progressbar@tmpcountb + \multiply\progressbar@tmpdim by 100 + {% + \usebeamercolor{palette quaternary}% + \usebeamercolor{alerted text}% \begin{tikzpicture}[tight background] - \draw[mDarkBrown, fill=mDarkBrown] (0, 0) rectangle ($(\paperwidth, 0.2pt) - (0.4pt, 0)$); - \draw[mLightBrown, fill=mLightBrown] (0, 0) rectangle (\progressbar@tmpdim, 0.2pt); - \end{tikzpicture} - } + \draw[palette quaternary.fg, fill=palette quaternary.fg] (0, 0) rectangle ($(\paperwidth, 0.2pt) - (0.4pt, 0)$); + \draw[alerted text.fg, fill=alerted text.fg] (0, 0) rectangle (\progressbar@tmpdim, 0.2pt); + \end{tikzpicture}% + }% +} \fi -%}}} +% }}} %{{{ --- Commands --------------------- \newcommand{\insertsectionHEAD}{% @@ -141,7 +147,7 @@ \newcommand{\plain}[2][]{% \begingroup - \setbeamercolor{background canvas}{bg=mDarkTeal} + \setbeamercolor{background canvas}{use=palette primary,bg=palette primary.fg} \begin{frame}{#1} \centering \vfill\vspace{1em}\usebeamerfont{section title}\textcolor{white}{\scshape #2}\vfill @@ -172,7 +178,7 @@ \AtBeginSection[] { \begingroup - \setbeamercolor{background canvas}{bg=black!2} + \setbeamercolor{background canvas}{parent=palette primary} \begin{frame}[plain] \vspace{2em}\usebeamerfont{section title} \progressbar@sectionprogressbar% From 20a76b05f7107af296c5a560d1cb36a6cb478fff Mon Sep 17 00:00:00 2001 From: Johann Dahm Date: Thu, 22 Jan 2015 20:41:41 -0500 Subject: [PATCH 2/3] Added block colors. --- beamercolorthememetropolis.sty | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/beamercolorthememetropolis.sty b/beamercolorthememetropolis.sty index 41b7e24..dcb4368 100644 --- a/beamercolorthememetropolis.sty +++ b/beamercolorthememetropolis.sty @@ -39,5 +39,13 @@ \setbeamercolor{footnote}{fg=mDarkTeal!50} \setbeamercolor{page number in head/foot}{fg=mDarkTeal} +\setbeamercolor{block title}{parent=palette secondary} +\setbeamercolor{block title alerted}{use=alerted text,fg=mDarkTeal,bg=alerted text.fg!75!bg} +\setbeamercolor{block title example}{use=example text,fg=mDarkTeal,bg=example text.fg!75!bg} + +\setbeamercolor{block body}{parent=normal text,use=block title,bg=block title.bg!25!bg} +\setbeamercolor{block body alerted}{parent=normal text,use=block title alerted,bg=block title alerted.bg!25!bg} +\setbeamercolor{block body example}{parent=normal text,use=block title example,bg=block title example.bg!25!bg} + \mode From c0a88c8e1de681fb037269eab40089c30f336a7f Mon Sep 17 00:00:00 2001 From: Johann Dahm Date: Thu, 22 Jan 2015 20:48:31 -0500 Subject: [PATCH 3/3] Added *.fls to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fa12266..2d7b963 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ demo.pdf +*.fls *.acn *.acr *.alg