Sulley
/
layout_syllabus_ffg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve merge issues

This commit is contained in:
Gregory Trullemans 2023-11-05 10:53:45 +01:00
parent ab62a34372
commit 4ff0ad8d5b
1 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ffgTemplate.sty
View File

@ -61,11 +61,8 @@
% other package
\RequirePackage{bm} % Notation mathématique en gras
\RequirePackage{lscape} % Gestion du mode "paysage"
<<<<<<< HEAD
=======
\RequirePackage{svg}
% \RequirePackage[inkscapeformat=png]{svg}
>>>>>>> 0cc2c74 (Update style)
\frenchbsetup{StandardItemLabels=true}
@ -86,7 +83,7 @@
% Color definition
\definecolor{ffg_darkblue}{RGB}{21,29,76}
\definecolor{ffg_lightblue}{RGB}{0, 120, 190}
\definecolor{ffg_lightblue}{RGB}{0, 112, 192}
\definecolor{ffg_red}{RGB}{241, 83, 60}
\definecolor{ffg_title_color}{RGB}{12, 97, 158}
@ -131,31 +128,6 @@
\null
\thispagestyle{empty}%
<<<<<<< HEAD
% Titre du document
\begin{textblock}{200}(0,3)
\centering
{\fontsize{33}{42}\selectfont {\bfseries \textcolor{ffg_darkblue}{FORMATION~\formationType~\discipline}\par}}
\vspace{2.5cm}
{\fontsize{33}{42}\selectfont {\bfseries \textcolor{ffg_red}{Module :\\\moduleTitle}\par}}
\end{textblock}
% Type de document
\begin{textblock}{200}(0,8)
\begin{center}
{\fontsize{28}{42}\selectfont \textcolor{ffg_lightblue}{Formation des Cadres}\par}%
\end{center}
\end{textblock}
% Années
\begin{textblock}{200}(0,11.5)
\centering
\begin{center}
{\fontsize{30}{84}\selectfont \textcolor{white}{{\the\year}\hspace{3cm} {\NextYear}}\par}%
\end{center}
\end{textblock}
=======
% Logo FfG
\begin{textblock}{50}(6,0.35)
\includegraphics[scale=0.05]{ffg_logo.png}%
@ -184,7 +156,6 @@
\end{center}
\end{textblock}
>>>>>>> 0cc2c74 (Update style)
\null
\cleardoublepage
}
@ -253,23 +224,11 @@
% Unnumbered section title
\titleformat{name=\section, numberless}[display]
{\fontsize{14pt}{12pt}\selectfont\color{ffg_section_color}}
<<<<<<< HEAD
{#1}
{0pt}
{}
[\vspace{-4mm} {\color{ffg_lightblue}\titlerule[.6mm]} \enlargethispage{-\parskip}]
\titlespacing*{name=\section, numberless}
{0pt} % left
{24pt} % top
{10pt} % bottom
=======
{\qquad #1}
{0pt}
{}
[\vspace{-4mm} {\color{ffg_lightblue}\titlerule[.6mm]} \enlargethispage{-\parskip}]
>>>>>>> 0cc2c74 (Update style)
% Numbered subsection title
\titleformat{\subsection}[display]
{\fontsize{13pt}{12pt}\selectfont\color{ffg_title_color}}