Merge branch '3-inrae-ification-beamer' into 'master'

Resolve "Inrae-ification beamer"

Closes #3

See merge request !3

.gitlab-ci.yml

@@ -12,3 +12,9 @@ build_rapport_en:
   script:
     - latexmk -f -pdf -interaction=nonstopmode rapport_inrae_en.tex > /dev/null 2>&1 || true
     - du -hs rapport_inrae_en.pdf
+
+build_presentation:
+  stage: build
+  script:
+    - pdflatex presentation_inrae.tex > /dev/null 2>&1 || true
+    - du -hs presentation_inrae.pdf
\ No newline at end of file

presentation_irstea.tex → presentation_inrae.tex

@@ -58,7 +58,7 @@
         \begin{center}
             Un graphique redimensionné à la largeur de la ligne :
             \resizebox{\linewidth}{!}{%
-                \includegraphics{presentation_inrae/logo_inrae_rvb.png}
+                \includegraphics{rapport_inrae/logo_inrae_couv_haut.png}
             }
 
         \end{center}

presentation_inrae/beamercolorthemeirstea.sty → presentation_inrae/beamercolorthemeINRAE.sty

@@ -2,35 +2,35 @@
 
 % Settings
 %\setbeamercolor{headline}{fg=tabutter,bg=black}
-%\setbeamercolor{headline}{fg=irsteaDark,bg=white}
+%\setbeamercolor{headline}{fg=inraeDark,bg=white}
 \setbeamercolor{headline}{fg=black,bg=white}
-%\setbeamercolor{headline}{fg=black,bg=gris!8}
-\setbeamercolor{footline}{fg=irsteaDark, bg=white}
+%\setbeamercolor{headline}{fg=black,bg=inraeDarkGrey!8}
+\setbeamercolor{footline}{fg=inraeDark, bg=white}
 \setbeamerfont{footline}{size=\large,series=\tt}
 \setbeamercolor{separation line}{bg=white}
-\setbeamercolor{title in headline}{fg=gris}
-\setbeamercolor{author in headline}{fg=irstea}
-\setbeamercolor{institute in headline}{fg=irsteaLightGrey}
+\setbeamercolor{title in headline}{fg=inraeDarkGrey}
+\setbeamercolor{author in headline}{fg=inrae}
+\setbeamercolor{institute in headline}{fg=inraeLightGrey}
 
-\setbeamercolor{frametitle}{fg=gris}
-\setbeamercolor{framesubtitle}{fg=irstea}
-\setbeamercolor{author in head/foot}{fg=irstea, bg=white}
-\setbeamercolor{title in head/foot}{fg=irstea, bg=white}
+\setbeamercolor{frametitle}{fg=inraeDarkGrey}
+\setbeamercolor{framesubtitle}{fg=inrae}
+\setbeamercolor{author in head/foot}{fg=inrae, bg=white}
+\setbeamercolor{title in head/foot}{fg=inrae, bg=white}
 
-\setbeamercolor*{normal text}{fg=irsteaDark, bg=white}
+\setbeamercolor*{normal text}{fg=inraeDark, bg=white}
 %\setbeamercolor*{block body}{bg=white,fg=black}
-\setbeamercolor*{block body}{bg=gris!10,fg=black}
-%\setbeamercolor*{block title}{fg=bleufonce,bg=white}
-\setbeamercolor*{block title}{fg=bleufonce,bg=gris!22}
+\setbeamercolor*{block body}{bg=inraeDarkGrey!10,fg=black}
+%\setbeamercolor*{block title}{fg=inraeDarker,bg=white}
+\setbeamercolor*{block title}{fg=inraeDarker,bg=inraeDarkGrey!22}
 \setbeamerfont{block title}{size=\large,series=\bf}
 \setbeamercolor{upper separation line head}{fg=white}
 
-\setbeamercolor*{block title alerted}{fg=ta3scarletred,bg=gris!22}
-\setbeamercolor*{block body alerted}{bg=gris!10,fg=black}
+\setbeamercolor*{block title alerted}{fg=ta3scarletred,bg=inraeDarkGrey!22}
+\setbeamercolor*{block body alerted}{bg=inraeDarkGrey!10,fg=black}
 
-\setbeamercolor*{example body}{fg=prairie,bg=white}
-\setbeamercolor*{example text}{fg=prairie,bg=white}
-\setbeamercolor*{example title}{bg=irstea,fg=white}
+\setbeamercolor*{example body}{fg=inraeGreen,bg=white}
+\setbeamercolor*{example text}{fg=inraeGreen,bg=white}
+\setbeamercolor*{example title}{bg=inrae,fg=white}
 
 
 

presentation_inrae/beamerinnerthemeirstea.sty → presentation_inrae/beamerinnerthemeINRAE.sty

@@ -2,9 +2,9 @@
 
 % Title page
 \defbeamertemplate*{title page}{INRAE}[1][]
-{ 
+{
 %\fbox{
-	\begin{overpic}[width=4cm,height=4cm,keepaspectratio]{presentation_inrae/CouvCadreirsteaDarkGH}
+	\begin{overpic}[width=4cm,height=4cm,keepaspectratio]{presentation_inrae/CouvCadreMarineGH}
 	\put(0,3){
 		\hspace{0.08\linewidth}
 %\fbox{
@@ -17,25 +17,25 @@
 	}
 	\end{overpic}
 %}
-	
+
 	\hspace*{0.4\linewidth}
 %\fbox{
     \begin{minipage}[t][3cm][c]{0.6\linewidth}
 		\begin{flushleft}
 			\usebeamercolor{author in headline}{\color{fg}\large{\insertauthor}\\[1ex]}
 			\usebeamercolor{institute in headline}{\color{fg}\large{\insertdate}\\[1ex]}
-		\end{flushleft}	
+		\end{flushleft}
 	\end{minipage}
 %}
-    
+
 %\fbox{
     \begin{minipage}[t][1.6cm][c]{0.49\linewidth}
-        \includegraphics[height=1.5cm,keepaspectratio]{presentation_inrae/logo_inrae_rvb}    
+        \includegraphics[width=2.5cm,keepaspectratio]{rapport_inrae/logo_inrae_couv_haut.png}
     \end{minipage}
     \begin{minipage}[t][1.6cm][c]{0.49\linewidth}
-        \begin{flushright}                
+        \begin{flushright}
             \includegraphics[height=1cm,keepaspectratio]{\logopartenaire}
-        \end{flushright}    
+        \end{flushright}
     \end{minipage}
 %}
 }

presentation_inrae/beamerthemeirstea.sty → presentation_inrae/beamerthemeINRAE.sty

@@ -21,13 +21,13 @@
 \usecolortheme{INRAE}
 
 \setbeamertemplate{navigation symbols}{}
-\setbeamertemplate{blocks}[rounded][shadow=true]  
+\setbeamertemplate{blocks}[rounded][shadow=true]
 \setbeamertemplate{footline}[frame number]
 \setbeamertemplate{section in toc shaded}[default][45]
 \setbeamerfont{footline}{size=\fontsize{9}{11}\selectfont} %https://tex.stackexchange.com/a/26899/124910
-\setbeamercolor{section in toc}{fg=irsteaDark}
-\setbeamercolor{subsection in toc}{fg=irstea}
-\setbeamercolor{itemize item}{fg=irstea}
-\setbeamercolor{enumerate item}{fg=irstea}
+\setbeamercolor{section in toc}{fg=inraeDark}
+\setbeamercolor{subsection in toc}{fg=inrae}
+\setbeamercolor{itemize item}{fg=inrae}
+\setbeamercolor{enumerate item}{fg=inrae}
 
 \mode<all>
\ No newline at end of file

presentation_inrae/preambule.tex

@@ -55,9 +55,9 @@
   \useasboundingbox(0,0) rectangle(\the\paperwidth,1.2);
 \def\tempa{1#2}% Third example https://tex.stackexchange.com/a/286903/124910
 \if\tempa1%
-      {\node[anchor=west, gris,font=\Large] at (1.5,0.41){#1};}%
+      {\node[anchor=west, inraeDarkGrey,font=\Large] at (1.5,0.41){#1};}%
 \else%
-      {\node[anchor= west, gris,font=\Large] at (1.5,0.61){#1};%
+      {\node[anchor= west, inraeDarkGrey,font=\Large] at (1.5,0.61){#1};%
        \node[anchor= west, inrae,font=\large] at (1.5,0.11){\textcolor{inrae}{\textsc{#2}}};}%
 \fi
   \end{tikzpicture}

rapport_inrae/preambule_inrae.tex

@@ -13,15 +13,15 @@
 % Quotations
 % @see https://fr.sharelatex.com/learn/Typesetting_quotations
 % @usage the environment displayquote prints a display quotation and the command \textquote an in-line quotation
-\usepackage{csquotes} 
-% displayquote in italic 
+\usepackage{csquotes}
+% displayquote in italic
 \renewcommand{\mkbegdispquote}[2]{\itshape}
 
 % Gestion de la bibliographie avec biblatex
 \input{rapport/preambule_biblatex}
 
 
-% Extra space for numbered titles in table of contents 
+% Extra space for numbered titles in table of contents
 % http://tex.stackexchange.com/a/13691/124910
 \usepackage{tocstyle}
 
@@ -37,7 +37,7 @@
 \def\siecle#1{\textsc{\romannumeral #1}\textsuperscript{e}~siècle}
 
 % Supprime les liens moches et permet le retour à la ligne du ToC
-\PassOptionsToPackage{hyphens}{url}\usepackage[hidelinks,breaklinks]{hyperref} 
+\PassOptionsToPackage{hyphens}{url}\usepackage[hidelinks,breaklinks]{hyperref}
 
 % Définition des marges
 \usepackage[left=2cm,right=2cm,top=2cm,bottom=2cm]{geometry}
@@ -60,10 +60,10 @@
 % pour fixer l'emplacement des figures
 % \begin{figure}[H]
 % Voir http://tex.stackexchange.com/a/8633
-\usepackage{float} 
+\usepackage{float}
 
 %subfigures http://tex.stackexchange.com/a/37597
-\usepackage{subcaption} 
+\usepackage{subcaption}
 
 % Liens colorés http://tex.stackexchange.com/a/12408
 \usepackage{url}
@@ -84,7 +84,7 @@
 \makeatother
 
 % Redéfinition de \cleardoublepage pour créer une page vide
-% \cleardoublepage permet de générer une page vide 
+% \cleardoublepage permet de générer une page vide
 % si le chapitre ne commence pas sur la page de droite
 \makeatletter
 \def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page\else
@@ -126,7 +126,7 @@
 	\ifodd\value{page}\hbox{}\vspace*{\fill}\thispagestyle{empty}\newpage\fi
 }
 
-% Todo notes 
+% Todo notes
 % @usage The todonotes package makes three commands available to the user: \todo[]{}, \missingfigure{} and \listoftodos.
 \usepackage{todonotes}
 % Ajustement des bulles todo mises dans la marge
@@ -137,8 +137,8 @@
 \RequirePackage{rapport_inrae/inraecolors}
 
 % Pourquoi les couleurs chargées depuis "inraecolors" ne sont-elles pas disponibles pour \hypersetup ci-dessous ?
-\definecolor{titreColor}{HTML}{008C8E}  % irsteaDark
-\definecolor{linkColor}{HTML}{423089}  % irsteaBlue
+\definecolor{titreColor}{HTML}{008C8E}  % inraeDark
+\definecolor{linkColor}{HTML}{423089}  % inraeBlue
 
 \hypersetup{
     colorlinks,
@@ -176,7 +176,7 @@
 
 % Format des titres utilisés dans le préambule du rapport (Auteurs, résumé...)
 \newcommand{\titrepreambule}[1]{
-	\vspace{2\baselineskip}	
+	\vspace{2\baselineskip}
 	{\sffamily\Large\color{titreColor}\scshape{#1}}
 	\vspace{\baselineskip}}