Merge remote-tracking branch 'origin/master'

[hacks/latex/beamer-upsud.git] / beamerthemeUpsud.sty

diff --git a/beamerthemeUpsud.sty b/beamerthemeUpsud.sty
index f832e2e..f50aaae 100644 (file)
--- a/beamerthemeUpsud.sty
+++ b/beamerthemeUpsud.sty
@@ -17,24 +17,30 @@
 
 \setbeamercolor{title}{fg = white, bg=upsblue}
 \setbeamercolor{frametitle}{fg = white}
-\setbeamercolor{item}{fg = upsblue}
-\setbeamercolor{subitem}{fg = upsblue}
-\setbeamercolor{subsubitem}{fg = upsblue}
-\setbeamercolor{description item}{fg = upsblue}
+\setbeamercolor{item}{fg = upsgray}
+\setbeamercolor{subitem}{fg = upsgray}
+\setbeamercolor{subsubitem}{fg = upsgray}
+\setbeamercolor{description item}{fg = upsgreen}
 
 \setbeamercolor{normal text}{fg = upsgray}
 \setbeamercolor{alerted text}{fg = upsgreen}
 
 
-
-
+\setbeamercolor{section in toc}{fg=upsblue, bg=white}
+\setbeamercolor{}{}
 
 %%% font options
 
 
 \setbeamerfont{normal text}{} % ignored currently
 \setbeamerfont{alerted text}{family=\bf}
-\setbeamerfont{example text}{}
+\setbeamerfont{block title example}{family=\bf}
+\setbeamercolor{block title example}{fg=white, bg=upsblue}
+\setbeamercolor{block body example}{fg=upsgray, bg=upsblue!10}
+
+\setbeamerfont{block title}{family=\bf}
+\setbeamercolor{block title}{fg=white, bg=upsgreen}
+\setbeamercolor{block body}{fg=upsgray, bg=upsgreen!10}
 
 \setbeamerfont{structure}{}
 \setbeamerfont{tiny structure}{size=\tiny}
@@ -49,7 +55,7 @@
 \setbeamerfont{author in head/foot}{}
 \setbeamerfont{author in sidebar}{size=\tiny}
 
-\setbeamerfont{institute}{size=\scriptsize}
+\setbeamerfont{institute}{size=\small}
 \setbeamerfont{institute in head/foot}{}
 \setbeamerfont{institute in sidebar}{}
 
@@ -90,7 +96,7 @@
 \setbeamerfont{sidebar right}{parent=sidebar}
 
 \setbeamerfont{frametitle}{parent=structure,size=\Large,series=\bfseries}
-\setbeamerfont{framesubtitle}{parent=frametitle,size=\footnotesize}
+\setbeamerfont{framesubtitle}{parent=frametitle,size=\scriptsize,series=\it,family=\it}
 
 \setbeamerfont{caption}{size=\small}
 \setbeamerfont{caption name}{parent={structure,caption}}
@@ -151,30 +157,32 @@
 %%% title page
 
 \setbeamercolor{title page}{bg=upsblue, fg=white}
+\setbeamercolor{framesubtitle}{bg=upsblue, fg=white}
+
 
 \setbeamerfont{title}{size=\Huge,parent=structure}
 \defbeamertemplate*{title page}{customized}[1][]
 {
   \begin{tikzpicture}[remember picture,overlay,x=\paperwidth,y=\paperheight]
-
     \begin{scope}{on background layer}
-      \node (a) at (current page.south east) {};
-      \node (b) at (current page.north west) {};
-      \draw [line width=0pt, upsblue, fill=upsblue] (a) rectangle (b);
-      \node (c) at (current page.east) {};
-      \node (d) at (current page.west) {};
-
-      \draw [line width=0pt, upsdarkblue, fill=upsdarkblue] ($(c) + (0, 1.3cm)$) rectangle ($(d) - (0, 1.3cm)$);
-      \node [anchor=east, xshift=1.2mm,yshift=5.6cm] at (current page.south east) {
-            \includegraphics[width=3cm]{upsud-reserve}
+      \draw [line width=0pt, upsblue, fill=upsblue] (current
+      page.south east) rectangle (current page.north west);
+
+      %%%% 70x90x56.5
+      \draw [line width=0pt, upsdarkblue, fill=upsdarkblue]
+      ($(current page.east) + (0pt, 28.25pt)$) rectangle ($(current page.west) - (0, 28.25pt)$);
+      \node [anchor=south east, xshift=3.5pt,yshift=-4pt] at
+      ($(current page.east) - (0, 28.25pt)$) {
+            \includegraphics[width=70pt]{upsud-reserve}
           };
       \end{scope}
-      \node [anchor=west, yshift=1em, xshift=1cm,align=left] (e) at (current
+      \node [anchor=west, yshift=0pt, xshift=15pt,align=left] at (current
       page.west) {\usebeamerfont{title}\inserttitle\\\usebeamerfont{date}\insertdate};
-      \node [anchor=north west, xshift=1cm, align=left] (f) at
-      ($(current page.west) - (0cm, 1.3cm)$)
+      \node [anchor=north west, xshift=15pt, align=left] at
+      ($(current page.west) - (0cm, 28.25pt)$)
       {\usebeamerfont{author}\insertauthor};
-
+      \node [anchor=north west, yshift=0pt, xshift=15pt, align=left] at
+      (current page.north west) {\usebeamerfont{institute}\insertinstitute};
     \end{tikzpicture}
 %  \usebeamerfont{author}\insertauthor\par
 
@@ -188,17 +196,21 @@
   \begin{tikzpicture}[remember picture,overlay,x=\paperwidth,y=1.5cm]
 
     \begin{scope}{on background layer}
-      \node (g) at (current page.north west) {};
-      \node (h) at ($(current page.north east) - (0cm, 1.5cm)$) {};
-      \draw[upsblue, fill=upsblue] (g) rectangle (h);
+      \draw[upsblue, fill=upsblue] (current page.north west)
+      rectangle ($(current page.north east) - (0cm, 30pt)$);
 
-      \node [anchor=north east, yshift=1.7mm,xshift=1.7mm] (i) at (current page.north east) {
-        \includegraphics[height=1.5cm]{upsud-reserve}
+      \node [anchor=north east, yshift=4.5pt, xshift=4.5pt] at (current
+      page.north east) {
+        \includegraphics[height=30pt]{upsud-reserve}
       };
     \end{scope}
-    \node [anchor=west] (i) at ($(current page.north west) + (1cm, -0.75cm)$) {
+    \node [anchor=north west] at ($(current page.north west) + (2em, 0pt)$) {
       \usebeamerfont{frametitle}\insertframetitle
     };
+    \node [anchor=south east] at ($(current page.north east) + (-2em,
+    -30pt)$) {
+      \usebeamerfont{framesubtitle}\insertsection
+    };
     \end{tikzpicture}
 }