Revert Clean code.

This commit is contained in:
Jeff Lance 2017-08-24 16:20:53 +02:00
parent 3b3a085f1f
commit 60de34ac19

View File

@ -12,24 +12,16 @@
%
%
% Parent class
%
%
%-- PARENT CLASS
% inutile de passer l'option [utf8] puisque chargee dans commun.sty % inutile de passer l'option [utf8] puisque chargee dans commun.sty
\LoadClassWithOptions{beamer} \LoadClassWithOptions{beamer}
%--------------- %---------------
%
%
% Packages
%
%
%-- PACKAGES CALLS
% perso % perso
\RequirePackage{couleurs} \RequirePackage{couleurs}
\RequirePackage{commun} \RequirePackage{commun}
@ -44,17 +36,12 @@
% %-- DEF OPTIONS
%
% Class options parameters
%
%
% firstcolor / secondcolor % firstcolor / secondcolor
% option de classe % option de classe
% couleurs générales du beamer % couleurs générales du beamer
% %
% The "classical" way: % "classical" way
% \def\firstcolor{lapislazuli}% % \def\firstcolor{lapislazuli}%
% \define@key{cours_beamer.cls}{firstcolor}[lapislazuli]{% % \define@key{cours_beamer.cls}{firstcolor}[lapislazuli]{%
% \def\firstcolor{#1}% % \def\firstcolor{#1}%
@ -65,8 +52,8 @@
% \def\secondcolor{#1}% % \def\secondcolor{#1}%
% } % }
\DeclareOptionX{main1}[main1]{% \DeclareOptionX{firstcolor}[lapislazuli]{%
\def\main1{#1}% \def\firstcolor{#1}%
} }
\DeclareOptionX{secondcolor}[-\firstcolor]{% \DeclareOptionX{secondcolor}[-\firstcolor]{%
\def\secondcolor{#1}% \def\secondcolor{#1}%
@ -84,18 +71,16 @@
\addmediapath{{videos/}} \addmediapath{{videos/}}
%%% DEFAULT COLORS USED %%% %%% DEFAULT COLORS USED IN BLOCKS %%%
% Colors used in block and environments
% I don't like the default flashy green and the blue so i redefined it % I don't like the default flashy green and the blue so i redefined it
\colorlet{green}{green!40!gray} \colorlet{green}{green!40!gray}
\colorlet{blue}{airforceblue} \colorlet{blue}{airforceblue}
% Default colors of sections and subsections if not defined in theme
\colorlet{main1}{red}
\colorlet{main2}{blue}
% Colors used in block and environments if not defined in theme
\colorlet{definition}{red} \colorlet{definition}{red}
\colorlet{theorem}{red} \colorlet{theorem}{red}
\colorlet{property}{red} \colorlet{property}{red}
\colorlet{proof}{violet} \colorlet{proof}{purple}
\colorlet{vocabulary}{blue} \colorlet{vocabulary}{blue}
\colorlet{remark}{red} \colorlet{remark}{red}
\colorlet{method}{orange} \colorlet{method}{orange}
@ -157,7 +142,6 @@
} }
\setbeamertemplate{section in toc}[sections numbered roman] \setbeamertemplate{section in toc}[sections numbered roman]
\setbeamercolor{section in toc}{fg=main1} \setbeamercolor{section in toc}{fg=main1}
\setbeamercolor{section number projected}{fg=main1}
\setbeamertemplate{subsection in toc}[bullets] \setbeamertemplate{subsection in toc}[bullets]
\setbeamercolor{subsection in toc}{fg=main2} \setbeamercolor{subsection in toc}{fg=main2}
%%%%%%%%%%% %%%%%%%%%%%
@ -174,7 +158,7 @@
\mdfdefinestyle{partie}{ \mdfdefinestyle{partie}{
outerlinewidth=1em, outerlinecolor=white,% outerlinewidth=1em, outerlinecolor=white,%
% leftmargin=-1em, rightmargin=-1em,% % leftmargin=-1em, rightmargin=-1em,%
middlelinewidth=1.2pt, linecolor=main1,roundcorner=5pt,% middlelinewidth=1.2pt, linecolor={\secondcolor},roundcorner=5pt,%
apptotikzsetting={ apptotikzsetting={
\tikzset{ \tikzset{
mdfbackground/.append style={ mdfbackground/.append style={
@ -187,7 +171,7 @@
\mdfdefinestyle{sspartie}{ \mdfdefinestyle{sspartie}{
outerlinewidth=1em, outerlinecolor=white,% outerlinewidth=1em, outerlinecolor=white,%
% leftmargin=-1em, rightmargin=-1em,% % leftmargin=-1em, rightmargin=-1em,%
middlelinewidth=1.2pt, linecolor=main2,roundcorner=5pt,% middlelinewidth=1.2pt, linecolor=\firstcolor,roundcorner=5pt,%
apptotikzsetting={ apptotikzsetting={
\tikzset{ \tikzset{
mdfbackground/.append style={ mdfbackground/.append style={
@ -243,7 +227,7 @@
\begin{frame} \begin{frame}
\begin{center} \begin{center}
\begin{mdframed}[style=partie] \begin{mdframed}[style=partie]
\centering \textcolor{main1}{\textbf{ \cType{partiecounter}. #1}} \centering \textcolor{\secondcolor}{\textbf{ \cType{partiecounter}. #1}}
\end{mdframed} \end{mdframed}
\end{center} \end{center}
\end{frame} \end{frame}
@ -256,7 +240,7 @@
\begin{frame} \begin{frame}
\begin{center} \begin{center}
\begin{mdframed}[style=sspartie] \begin{mdframed}[style=sspartie]
\centering \textcolor{main2}{\textbf{ \cType{sspartiecounter}) #1}} \centering \textcolor{\firstcolor}{\textbf{ \cType{sspartiecounter}) #1}}
\end{mdframed} \end{mdframed}
\end{center} \end{center}
\end{frame} \end{frame}