X-Git-Url: https://git.tokkee.org/?p=tokkeebeamer.git;a=blobdiff_plain;f=beamerthemetokkee.sty;h=467ecc9a9cc03520b63044ecf4d26a444841f129;hp=df3522d13d16cf7a6507c1b241e43ed76065e345;hb=a62d3fa3564dbd2a96f957e73fb9d154e50d44f5;hpb=e2663a5d41bed19f22b5b739500764a1ebb7f58b

diff --git a/beamerthemetokkee.sty b/beamerthemetokkee.sty
index df3522d..467ecc9 100644
--- a/beamerthemetokkee.sty
+++ b/beamerthemetokkee.sty
@@ -1,15 +1,40 @@
+%
+% Copyright (C) 2013-2016 Sebastian 'tokkee' Harl <sh@tokkee.org>
+% All rights reserved.
+%
+% Redistribution and use in source and binary forms, with or without
+% modification, are permitted provided that the following conditions
+% are met:
+% 1. Redistributions of source code must retain the above copyright
+%    notice, this list of conditions and the following disclaimer.
+% 2. Redistributions in binary form must reproduce the above copyright
+%    notice, this list of conditions and the following disclaimer in the
+%    documentation and/or other materials provided with the distribution.
+%
+% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+% ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+% TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+% PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+% CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+% EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+% PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+% OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+% WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+% OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+% ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+%
 \usepackage{beamertokkee}
 \usepackage{lmodern}
 
+\usepackage{beamertokkee}
+
 \usecolortheme{tokkee}
 
 \usepackage{tikz}
 
 \usetikzlibrary{positioning}
-\usetikzlibrary{shadows}
 
-\setbeamersize{text margin left=7mm, text margin right=7mm,%
-	text margin top=0mm, text margin bottom=0mm}
+\setbeamersize{text margin left=7mm, text margin right=7mm}
 
 \titlegraphic{
 	\begin{tikzpicture}[remember picture,overlay]
@@ -23,22 +48,16 @@
 \setbeamertemplate{title page}
 {
 	\begin{centering}
-		\begin{tikzpicture}
-			\usebeamercolor[bg]{title}
-			\draw[thick,draw=gray] (0,0)
-				node [fill=tokkeelightgray,draw,drop shadow,rounded corners,inner sep=10pt,align=center]
-				{
-					\,\\
-					\usebeamerfont{title}%
-					\usebeamercolor[fg]{title}%
-					\inserttitle\par\\[.25em]
-					\ifx\insertsubtitle\@empty
-					\else
-						{\usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}
-						 \insertsubtitle\par}
-					\fi
-				};
-		\end{tikzpicture}
+		\titlebox{%
+			{\usebeamerfont{title}\usebeamercolor[fg]{title}%
+			 \inserttitle}
+			\ifx\insertsubtitle\@empty%
+			\else%
+				\par\\[.25em]
+				{\usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}%
+				 \mbox{\insertsubtitle}\par}%
+			\fi%
+		}
 
 		\vskip1em
 
@@ -63,13 +82,16 @@
 	\begin{tikzpicture}[remember picture,overlay]
 		\fill[fill=tokkeelightgray,anchor=north west]
 			(-7mm,-.0\paperheight) rectangle +(\paperwidth,20mm);
-		\fill[fill=tokkeeblue,anchor=north west]
+		\fill[fill=tokkeeblue,anchor=north west,drop shadow]
 			(-7mm,-.0\paperheight) rectangle +(\paperwidth,-3mm);
 	\end{tikzpicture}
 	\begin{tikzpicture}[remember picture,overlay]
+		\node[inner sep=0pt,anchor=east] (logo)
+			at (\textwidth,.07\paperheight)
+			{\includegraphics[height=10mm]{tokkee_logo}};
 		\node[inner sep=0pt,anchor=base west] (tokkee_frametitle)
-			at (0,.05\paperheight)
-			{\large\insertframetitle};
+			at (-.03\paperwidth,.05\paperheight)
+			{\insertframetitle};
 	\end{tikzpicture}
 }
 
@@ -83,10 +105,10 @@
 {
 	\begin{tikzpicture}[overlay]
 		\node (tokkee_copyright)[inner sep=0pt,anchor=base west]
-			at (.03\paperwidth,.01\paperheight)
+			at (.03\paperwidth,.02\paperheight)
 			{\scriptsize \insertcopyrightinfo};
 		\node (tokkee_framenumber) [inner sep=0pt,anchor=base east]
-			at (.97\paperwidth,.01\paperheight)
+			at (.97\paperwidth,.02\paperheight)
 			{\scriptsize \insertshorttitle{} -- \translate{Slide} \insertframenumber};
 	\end{tikzpicture}
 }