Unverified Commit 824fb697 authored by Cassidy Dingenskirchen's avatar Cassidy Dingenskirchen Committed by Birte Kristina Friesel
Browse files

unified train farbtupferl 



(cherry picked from commit 20e8fd39851146eb4fb3cc8cb1f7ba7fc4086d8d)
Signed-off-by: default avatarBirte Kristina Friesel <derf@finalrewind.org>
parent dbbeaeea

sass/src/common/local.scss

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ ul.suggestions { 
		}

	}

}

.departures .dep-line {

.dep-line {

	text-align: center;

	padding: .2rem;

	color: white;

templates/_checked_in.html.ep

+1 −6
Original line number Diff line number Diff line
@@ -7,12 +7,7 @@ 
				<span class="card-title center-align">Ziel wählen</span>

			% }

			<span class="card-title center-align">

					% if ($journey->{train_line}) {

						<b><%= $journey->{train_type} %> <%= $journey->{train_line} %></b> <%= $journey->{train_no} %>

					% }

					% else {

						<%= $journey->{train_type} %> <%= $journey->{train_no} %>

					% }

				%= include '_format_train', journey => $journey

			</span>

			% if ($journey->{comment}) {

				<p><%= $journey->{comment} %></p>

templates/_checked_out.html.ep

+2 −1
Original line number Diff line number Diff line 
<div class="card">

	<div class="card-content">

		<span class="card-title">Ausgecheckt</span>

		<p>Aus <%= $journey->{train_type} %> <%= $journey->{train_no} %>

		<p>Aus

			%= include '_format_train', journey => $journey

			bis <a href="/s/<%= $journey->{arr_eva} %>?hafas=<%= $journey->{train_id} =~ m{[|]} ? 1 : 0 %>"><%= $journey->{arr_name} %></a></p>

		% if (@{stash('connections_iris') // [] } or @{stash('connections_hafas') // []}) {

			<span class="card-title" style="margin-top: 2ex;">Verbindungen</span>

templates/_format_train.html.ep

+5 −4
Original line number Diff line number Diff line 
% if ($journey->{extra_data}{wagonorder_pride}) {

	🏳️‍🌈

% }

<span class="dep-line <%= $journey->{train_type} // q{} %>">

	<%= $journey->{train_type} %>

	<%= $journey->{train_line}  // $journey->{train_no}%>

</span>

% if ($journey->{train_line}) {

	<b><%= $journey->{train_type} %> <%= $journey->{train_line} %></b> <%= $journey->{train_no} %>

% }

% else {

	<%= $journey->{train_type} %> <%= $journey->{train_no} %>

	<%= $journey->{train_no} %>

% }

templates/_history_trains.html.ep

+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,11 @@ 
					% }

					<tr>

						<td><%= $travel->{sched_departure}->strftime($date_format) %></td>

						<td><a href="<%= $detail_link %>"><%= $travel->{type} %> <%= $travel->{line} // $travel->{no} %></a></td>

						<td><a href="<%= $detail_link %>">

						<span class="dep-line <%= $travel->{type} // q{} %>">

							<%= $travel->{type} %> <%= $travel->{line}  // $travel->{no}%>

						</span>

						</a></td>

						<td>

						<a href="<%= $detail_link %>" class="unmarked">

						% if (param('cancelled')) {