1 files changed, 141 insertions, 34 deletions

diff --git a/sass/app.scss b/sass/app.scss
index 1f8d1ec..fb81921 100644
--- a/sass/app.scss
+++ b/sass/app.scss
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 Daniel Friesel
+ * Copyright (C) 2011-2020 Birte Kristina Friesel
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -10,7 +10,7 @@ body {
 }
 
 html {
-	font-family: Sans-Serif;
+	font-family: "Arimo", "Arial", Sans-Serif;
 }
 
 a {
@@ -30,6 +30,7 @@ a {
 
 p,
 div.about,
+div.config,
 div.input-field,
 div.notes {
 	max-width: 94%;
@@ -142,6 +143,9 @@ div.content {
 		background-color: $powercar-wagon-color;
 	}
 
+	.closed {
+		background-color: $closed-wagon-color;
+	}
 
 	.nondestwagon {
 		border-style: dashed;
@@ -154,13 +158,29 @@ div.content {
 		.type {
 			display: inline-block;
 			width: 5em;
-			color: $fg2;
+			color: $fg;
 		}
 
 		a.type {
 			color: $link-color;
 		}
 
+		.groupno {
+			color: $fg;
+		}
+
+		.grouptype {
+			color: $fg2;
+		}
+
+		.grouptype:before {
+			content: "(";
+		}
+
+		.grouptype:after {
+			content: ")";
+		}
+
 		.uicunknown {
 			color: $fg3;
 		}
@@ -191,7 +211,7 @@ div.content {
 			font-weight: bold;
 		}
 
-		.uic78::before {
+		.uic78:before {
 			content: "-";
 		}
 
@@ -209,7 +229,7 @@ div.content {
 			color: $fg3;
 		}
 
-		.uiccheck::before {
+		.uiccheck:before {
 			content: "-";
 		}
 	}
@@ -316,51 +336,45 @@ div.app {
 				left:2px;
 			}
 
-			.route {
+			.route, .info {
 				background-color: transparent;
 				font-size:2.1em;
 				position:absolute;
-				top:1px;
-				left:7.7em;
+				top: 0;
+				left: 7.7em;
 				right: 7em;
-				height: 1.2em;
+				height: 1.5em;
 				overflow: hidden;
+				white-space: nowrap;
+			}
+
+			.route {
 				color: $route-color;
 			}
 
 			.info {
 				color: $info-color;
-				background-color: transparent;
-				font-size:2.1em;
-				position:absolute;
-				top:1px;
-				left:7.7em;
-				right: 7em;
-				height: 1.2em;
-				overflow: hidden;
 			}
 
-			.dest {
+			.dest, .origin {
 				background-color: transparent;
 				font-size:4em;
 				position:absolute;
-				top:0.62em;
+				bottom:0;
 				left:4em;
-				bottom:0px;
 				width: 70%;
+				white-space: nowrap;
 				overflow: hidden;
 				color: $fg;
 			}
 
+			.dest {
+				background-color: transparent;
+				color: $fg;
+			}
+
 			.origin {
 				background-color: transparent;
-				font-size:4em;
-				position:absolute;
-				top:0.62em;
-				left:4em;
-				bottom:0px;
-				width: 70%;
-				overflow: hidden;
 				color: $fg2;
 
 				&:before {
@@ -374,7 +388,7 @@ div.app {
 				font-weight: bold;
 				position: absolute;
 				right: 5px;
-				bottom: 2px;
+				bottom: 0;
 				padding-left: 0.2em;
 				color: $fg;
 			}
@@ -389,7 +403,7 @@ div.app {
 				font-size:2.3em;
 				position:absolute;
 				right:5px;
-				top:4px;
+				top:1px;
 				padding-left: 0.2em;
 				color: $fg;
 
@@ -474,6 +488,22 @@ div.app {
 		border: 2px solid $bahn-color;
 	}
 
+	.tram, .bus, .ubahn {
+		padding:3px 5px 2px 5px;
+	}
+
+	.tram {
+		background-color: $tram-color;
+	}
+
+	.bus {
+		background-color: $bus-color;
+	}
+
+	.ubahn {
+		background-color: $ubahn-color;
+	}
+
 	.moreinfo {
 		font-size:2.1em;
 		position:fixed;
@@ -512,13 +542,32 @@ div.app {
 			width: 100%;
 			display: flex;
 			justify-content: space-between;
-			margin-bottom: 1em;
+			margin-bottom: 0.5em;
 
 			> div {
 				width: 33%;
 			}
 		}
 
+		.wagonorder-preview {
+			font-size: 110%;
+			width: 100%;
+			text-align: center;
+			margin-bottom: 1em;
+
+			a {
+				color: $fg;
+			}
+
+			.otherno {
+				color: $fg2;
+			}
+
+			.meta {
+				color: $fg1;
+			}
+		}
+
 		.departure {
 			text-align: right;
 		}
@@ -593,6 +642,45 @@ div.app {
 				list-style-type: circle;
 			}
 
+			.time-early {
+				color: $early-stop-color;
+			}
+
+			.time-delayed {
+				color: $delayed-stop-color;
+			}
+
+			.time-sched-only {
+				color: $delayed-stop-color;
+			}
+
+			.time-sched-ontime {
+				color: $early-stop-color;
+			}
+
+
+			.annotation {
+				color: $fg2;
+				list-style-type: none;
+				padding-left: 3em;
+			}
+
+			.-sched:before {
+				content: " ";
+			}
+
+			.time-sched:after {
+				content: " ";
+			}
+
+			.time-sched-only:before {
+				content: "(";
+			}
+
+			.time-sched-only:after {
+				content: ")";
+			}
+
 			i.material-icons {
 				font-size: 14px;
 			}
@@ -659,15 +747,27 @@ div.candidatelist a .traininfo {
 	padding-bottom: 0.3em;
 }
 
-div.about {
+div.config {
 	margin-top: 2em;
 	font-family: Sans-Serif;
 	color: $fg2;
+
+	a {
+		color: $link-color;
+		cursor: pointer;
+		text-decoration: none;
+	}
 }
 
-div.about a {
-	color: $link-color;
-	text-decoration: none;
+div.about {
+	margin-top: 1em;
+	font-family: Sans-Serif;
+	color: $fg2;
+
+	a {
+		color: $link-color;
+		text-decoration: none;
+	}
 }
 
 .notice {
@@ -805,6 +905,13 @@ div.field {
 	margin-right: 0.5ex;
 }
 
+.smallbutton img {
+	display: block;
+	float: left;
+	margin-right: 0.7ex;
+	height: 1.2em;
+}
+
 input, select, .button {
 	display: inline-block;
 	width: 60em;