diff --git a/beamertheme-source/beamercolorthemeneo.dtx b/beamertheme-source/beamercolorthemeneo.dtx index 4e34ca5559299da8358a429f926ecd8dda575e5c..557a6aa2ac9f825364f2783d761e48c10e39fd3d 100644 --- a/beamertheme-source/beamercolorthemeneo.dtx +++ b/beamertheme-source/beamercolorthemeneo.dtx @@ -59,11 +59,24 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{colorstyle} +% Choose between 2015 (legacy) and 2021 (modern) color set style +% \begin{macrocode} +\pgfkeys{ + /neo/color/style/.cd, + .is choice, + modern/.code=\neo@colorstyle@modern, + legacy/.code=\neo@colorstyle@legacy, +} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\neo@color@setdefaults} % Sets default values for color theme options. % \begin{macrocode} \newcommand{\neo@color@setdefaults}{ \pgfkeys{/neo/color/.cd, + style=legacy, background=light, block=transparent, } @@ -76,54 +89,63 @@ % \subsubsection{Base colors} % % \begin{macrocode} +\newcommand{\neo@colorstyle@modern}{ + \definecolor{nDarkGrey}{RGB}{47,88,110} + \definecolor{nGrey}{RGB}{140,159,177} + \definecolor{nLightGrey}{RGB}{211,218,225} + + \definecolor{nDarkRed}{RGB}{151,27,47} + \definecolor{nRed}{RGB}{197,15,60} + \definecolor{nLightRed}{RGB}{233,164,181} + + \definecolor{nDarkGreen}{RGB}{38,97,65} + \definecolor{nGreen}{RGB}{123,183,37} + \definecolor{nLightGreen}{RGB}{205,228,172} + + \definecolor{nDarkBlue}{RGB}{4,30,66} + \definecolor{nBlue}{RGB}{0,49,106} + \definecolor{nLightBlue}{RGB}{160,177,198} -\definecolor{nDarkGrey}{RGB}{152,164,174} -\definecolor{nGrey}{RGB}{210,213,215} -\definecolor{nLightGrey}{RGB}{235,236,238} + \definecolor{nDarkCyan}{RGB}{0,82,135} + \definecolor{nCyan}{RGB}{24,180,241} + \definecolor{nLightCyan}{RGB}{167,226,250} -\definecolor{nDarkRed}{RGB}{141,20,41} -\definecolor{nRed}{RGB}{201,169,147} -\definecolor{nLightRed}{RGB}{237,231,222} + \definecolor{nDarkYellow}{RGB}{232,119,34} + \definecolor{nYellow}{RGB}{253,183,53} + \definecolor{nLightYellow}{RGB}{254,228,178} +} + +\newcommand{\neo@colorstyle@legacy}{ + \definecolor{nDarkGrey}{RGB}{152,164,174} + \definecolor{nGrey}{RGB}{210,213,215} + \definecolor{nLightGrey}{RGB}{235,236,238} -\definecolor{nDarkGreen}{RGB}{0,155,119} -\definecolor{nGreen}{RGB}{170,207,189} -\definecolor{nLightGreen}{RGB}{229,239,234} + \definecolor{nDarkRed}{RGB}{141,20,41} + \definecolor{nRed}{RGB}{201,169,147} + \definecolor{nLightRed}{RGB}{237,231,222} -\definecolor{nDarkBlue}{RGB}{0,56,101} -\definecolor{nBlue}{RGB}{144,167,198} -\definecolor{nLightBlue}{RGB}{221,229,240} + \definecolor{nDarkGreen}{RGB}{0,155,119} + \definecolor{nGreen}{RGB}{170,207,189} + \definecolor{nLightGreen}{RGB}{229,239,234} -\definecolor{nDarkCyan}{RGB}{0,177,235} -\definecolor{nCyan}{RGB}{180,214,245} -\definecolor{nLightCyan}{RGB}{234,243,252} + \definecolor{nDarkBlue}{RGB}{0,56,101} + \definecolor{nBlue}{RGB}{144,167,198} + \definecolor{nLightBlue}{RGB}{221,229,240} -\definecolor{nDarkYellow}{RGB}{201,147,19} -\definecolor{nYellow}{RGB}{217,198,137} -\definecolor{nLightYellow}{RGB}{243,238,223} + \definecolor{nDarkCyan}{RGB}{0,177,235} + \definecolor{nCyan}{RGB}{180,214,245} + \definecolor{nLightCyan}{RGB}{234,243,252} + \definecolor{nDarkYellow}{RGB}{201,147,19} + \definecolor{nYellow}{RGB}{217,198,137} + \definecolor{nLightYellow}{RGB}{243,238,223} +} \definecolor{nBlack}{HTML}{011F32} \definecolor{nWhite}{RGB}{250,250,250} % \end{macrocode} % % % -% \subsubsection{Alias colors} -% -% Support the colors provided by the old i4 beamer theme. -% -% \begin{macrocode} -\colorlet{i4red}{nDarkRed} -\colorlet{i4green}{nDarkGreen} -\colorlet{i4blue}{nDarkBlue} -\colorlet{i4cyan}{nDarkCyan} -\colorlet{i4yellow}{nDarkYellow} -\colorlet{i4grey}{nDarkGrey} -\definecolor{darkred}{rgb}{0.8,0,0} -\colorlet{beamergreen}{green!50!black} -% \end{macrocode} -% -% -% % \subsubsection{Base styles} % % All colors in \themename are derived from the definitions of |normal text|, diff --git a/beamertheme-source/beamerinnerthemeneo.dtx b/beamertheme-source/beamerinnerthemeneo.dtx index 72badb215cbc0fd7a0138e7a046dc9795cb5fbf3..7da5a725340cba2e315bd8c7fc1c468df221f4db 100644 --- a/beamertheme-source/beamerinnerthemeneo.dtx +++ b/beamertheme-source/beamerinnerthemeneo.dtx @@ -154,7 +154,7 @@ \usebackgroundtemplate{ \tikzexternaldisable% \begin{tikzpicture} - \node[anchor=north west,inner sep=0,outer sep=0] at (0, \paperheight) {\includegraphics[width=\paperwidth]{images/titlepage-#1}}; + \node[anchor=north west,inner sep=0,outer sep=0,fill=nDarkBlue] at (0, \paperheight) {\includegraphics[width=\paperwidth]{images/titlepage-#1}}; \fill[nWhite] (0,0) rectangle (\paperwidth, 0.3\paperheight); \end{tikzpicture}% \tikzexternalenable% diff --git a/beamertheme-source/beamerouterthemeneo.dtx b/beamertheme-source/beamerouterthemeneo.dtx index 0faea7780a79f6014f0db95896f7dc121235fc61..eac36935938008466d029ccbbe2a696caa41d7c4 100644 --- a/beamertheme-source/beamerouterthemeneo.dtx +++ b/beamertheme-source/beamerouterthemeneo.dtx @@ -48,7 +48,7 @@ none/.code=\setbeamertemplate{frametitle icon}[none], i4/.code=\setbeamertemplate{frametitle icon}[i4], fau/.code=\setbeamertemplate{frametitle icon}[fau], - fau-new/.code=\setbeamertemplate{frametitle icon}[fau-new], + fau-modern/.code=\setbeamertemplate{frametitle icon}[fau-modern], } % \end{macrocode} % \end{macro} @@ -187,7 +187,7 @@ \defbeamertemplate{frametitle icon}{none}{} \defbeamertemplate{frametitle icon}{i4}{ \hfill\raisebox{-.25\height}{\includegraphics[height=1.2em]{images/logo-i4-white}}} \defbeamertemplate{frametitle icon}{fau}{ \hfill\raisebox{-.25\height}{\includegraphics[height=1.2em]{images/logo-fau-white}}} -\defbeamertemplate{frametitle icon}{fau-new}{ \hfill\raisebox{-.25\height}{\includegraphics[height=1.75em]{images/logo-fau-white-new}\kern-0.275em}} +\defbeamertemplate{frametitle icon}{fau-modern}{ \hfill\raisebox{-.25\height}{\includegraphics[height=1.75em]{images/logo-fau-white-modern}}} % \end{macrocode} % \end{macro} % diff --git a/beamertheme-source/beamerthemeneo.dtx b/beamertheme-source/beamerthemeneo.dtx index bc60e2e12f3a33beba1f21179e2bbab7a278657a..6d93e404d1d06bc0615357e4c2cede6ddba5118e 100644 --- a/beamertheme-source/beamerthemeneo.dtx +++ b/beamertheme-source/beamerthemeneo.dtx @@ -111,6 +111,8 @@ darkcolors/.code=\pgfkeysalso{color/background=dark}, whitebg/.code=\pgfkeysalso{color/background=white}, blockbg/.code=\pgfkeysalso{color/block=fill}, + modern/.code=\pgfkeysalso{color/style=modern}, + legacy/.code=\pgfkeysalso{color/style=legacy}, light/.code=\pgfkeysalso{font/style=light}, book/.code=\pgfkeysalso{font/style=book}, regular/.code=\pgfkeysalso{font/style=regular}, diff --git a/doc/neotheme.pdf b/doc/neotheme.pdf index ad2431fc82c6ab049bb6e572c05eb86c67d37143..461bd779deba8b27b958dfa3220386ec8700ad99 100644 Binary files a/doc/neotheme.pdf and b/doc/neotheme.pdf differ diff --git a/images/logo-fau-modern.pdf b/images/logo-fau-modern.pdf new file mode 100644 index 0000000000000000000000000000000000000000..65f02c6a02de5269022f3178d960ae79919d2578 Binary files /dev/null and b/images/logo-fau-modern.pdf differ diff --git a/images/logo-fau-tf-modern.pdf b/images/logo-fau-tf-modern.pdf new file mode 100644 index 0000000000000000000000000000000000000000..06cd7c5bd1a4a37a7d4f79b75a8756aa56afe619 Binary files /dev/null and b/images/logo-fau-tf-modern.pdf differ diff --git a/images/logo-fau-tf-new.pdf b/images/logo-fau-tf-new.pdf deleted file mode 100644 index e44703d366c9ca9006e978319bb9465de2aaaf63..0000000000000000000000000000000000000000 Binary files a/images/logo-fau-tf-new.pdf and /dev/null differ diff --git a/images/logo-fau-white-new.pdf b/images/logo-fau-white-modern.pdf similarity index 100% rename from images/logo-fau-white-new.pdf rename to images/logo-fau-white-modern.pdf diff --git a/images/titlepage-extern.pdf b/images/titlepage-extern.pdf index 9bf3750dc1bdc205914f880a458b2e92b356fd65..428971cf76941c253b9a355cfd458ab2c6b8dc14 100644 Binary files a/images/titlepage-extern.pdf and b/images/titlepage-extern.pdf differ diff --git a/images/titlepage-intern.pdf b/images/titlepage-intern.pdf index 955e53899b3b767040b14b67aa26a2aed0557484..ce2093c7c6895a0427a64784362adec9c0732638 100644 Binary files a/images/titlepage-intern.pdf and b/images/titlepage-intern.pdf differ