clean template: Use normal (non-bold) fonts for destination and train number

2 files changed, 22 insertions, 7 deletions

diff --git a/public/default.css b/public/default.css
index 5d15e11..fdad354 100644
--- a/public/default.css
+++ b/public/default.css
@@ -35,13 +35,17 @@ div.displayclean li .line {
 	color:#FFFFFF;
 	background-color:#666666;
 	font-weight:bold;
-	font-size: 3em;
+	font-size: 2.9em;
 	padding:3px 8px 2px 5px;
 	position:absolute;
 	top:7px;
 	left:2px;
 }
 
+div.displayclean li .line .trainno {
+	font-weight: normal;
+}
+
 div.displayclean li .lineinfo {
 	color:#000000;
 	font-size: 2em;
@@ -85,7 +89,7 @@ div.displayclean li .route {
 	font-size:2.1em;
 	position:absolute;
 	top:5px;
-	left:8em;
+	left:7.7em;
 	height: 1em;
 	width: 70%;
 	overflow: hidden;
@@ -96,7 +100,7 @@ div.displayclean li .info {
 	font-size:2.1em;
 	position:absolute;
 	top:5px;
-	left:8em;
+	left:7.7em;
 	height: 1.1em;
 	width: 70%;
 	overflow: hidden;
@@ -149,11 +153,11 @@ div.displayclean li .moreinfo .mroute {
 
 div.displayclean li .dest {
 	color:#000000;
-	font-weight:bold;
+	/*font-weight:bold;*/
 	font-size:4em;
 	position:absolute;
 	top:0.65em;
-	left:4.2em;
+	left:4em;
 	width: 70%;
 	z-index: 1;
 	overflow: hidden;
diff --git a/templates/clean.html.ep b/templates/clean.html.ep
index 9fcb3e7..053c8a8 100644
--- a/templates/clean.html.ep
+++ b/templates/clean.html.ep
@@ -18,11 +18,22 @@
 %   }
     <li>
 %   my $linetype = q{};
-%   if ( $departure->{train} =~ m{ ^ S \s? \d{1,2} $ }x ) {
+%   if ( $departure->{train_type} eq 'S' ) {
 %     $linetype = 'sbahn';
 %   }
     <span class="line <%= $linetype %> <%= $extraclasses %>">
-%=  $departure->{train}
+    % if ($departure->{train_type} and $departure->{train_no}) {
+%=    $departure->{train_type}
+%   }
+%   if ($departure->{train_line} ) {
+%=    $departure->{train_line}
+%   }
+%   elsif ($departure->{train_no}) {
+      <span class="trainno"><%= $departure->{train_no} %></span>
+%   }
+%   else {
+%=    $departure->{train}
+%   }
     </span>
 %   if (@{$departure->{replaced_by}} or @{$departure->{replacement_for}}) {
       <span class="lineinfo">