summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--public/service-worker.js26
-rw-r--r--public/static/css/local.css19
-rw-r--r--public/static/css/material-icons.css8
-rw-r--r--public/static/manifest.json12
l---------public/static/v32 (renamed from public/static/v30)0
-rw-r--r--templates/journey.html.ep8
-rw-r--r--templates/layouts/default.html.ep2
7 files changed, 47 insertions, 28 deletions
diff --git a/public/service-worker.js b/public/service-worker.js
index 8268bd0..1302609 100644
--- a/public/service-worker.js
+++ b/public/service-worker.js
@@ -1,19 +1,19 @@
-const CACHE_NAME = 'static-cache-v31';
+const CACHE_NAME = 'static-cache-v32';
const FILES_TO_CACHE = [
'/favicon.ico',
'/offline.html',
- '/static/v31/css/light.min.css',
- '/static/v31/css/dark.min.css',
- '/static/v31/css/material-icons.css',
- '/static/v31/css/local.css',
- '/static/v31/fonts/MaterialIcons-Regular.woff2',
- '/static/v31/fonts/MaterialIcons-Regular.woff',
- '/static/v31/fonts/MaterialIcons-Regular.ttf',
- '/static/v31/js/jquery-3.4.1.min.js',
- '/static/v31/js/materialize.min.js',
- '/static/v31/js/travelynx-actions.min.js',
- '/static/v31/js/autocomplete.min.js',
- '/static/v31/js/geolocation.min.js',
+ '/static/v32/css/light.min.css',
+ '/static/v32/css/dark.min.css',
+ '/static/v32/css/material-icons.css',
+ '/static/v32/css/local.css',
+ '/static/v32/fonts/MaterialIcons-Regular.woff2',
+ '/static/v32/fonts/MaterialIcons-Regular.woff',
+ '/static/v32/fonts/MaterialIcons-Regular.ttf',
+ '/static/v32/js/jquery-3.4.1.min.js',
+ '/static/v32/js/materialize.min.js',
+ '/static/v32/js/travelynx-actions.min.js',
+ '/static/v32/js/autocomplete.min.js',
+ '/static/v32/js/geolocation.min.js',
];
self.addEventListener('install', (evt) => {
diff --git a/public/static/css/local.css b/public/static/css/local.css
index 7bb16a3..2eb14f0 100644
--- a/public/static/css/local.css
+++ b/public/static/css/local.css
@@ -11,6 +11,25 @@ td.cancelled {
text-decoration: line-through;
}
+.wagons span {
+ margin-right: 0.5ex;
+ color: #808080;
+}
+
+.wagons .wagonclass {
+ font-weight: bold;
+ color: inherit;
+}
+
+.wagons .wagonnum {
+ margin-right: 0;
+ color: inherit;
+}
+
+.wagons .checksum:before {
+ content: "-";
+}
+
h1 {
font-size: 2.92rem;
margin: 1.9466666667rem 0 1.168rem 0;
diff --git a/public/static/css/material-icons.css b/public/static/css/material-icons.css
index d2806ec..07005de 100644
--- a/public/static/css/material-icons.css
+++ b/public/static/css/material-icons.css
@@ -2,12 +2,12 @@
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
- src: url(/static/v31/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */
+ src: url(/static/v32/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */
src: local('Material Icons'),
local('MaterialIcons-Regular'),
- url(/static/v31/fonts/MaterialIcons-Regular.woff2) format('woff2'),
- url(/static/v31/fonts/MaterialIcons-Regular.woff) format('woff'),
- url(/static/v31/fonts/MaterialIcons-Regular.ttf) format('truetype');
+ url(/static/v32/fonts/MaterialIcons-Regular.woff2) format('woff2'),
+ url(/static/v32/fonts/MaterialIcons-Regular.woff) format('woff'),
+ url(/static/v32/fonts/MaterialIcons-Regular.ttf) format('truetype');
}
.material-icons {
diff --git a/public/static/manifest.json b/public/static/manifest.json
index 8e67133..5a44a3f 100644
--- a/public/static/manifest.json
+++ b/public/static/manifest.json
@@ -3,27 +3,27 @@
"short_name": "Travelynx",
"scope": "/",
"icons": [{
- "src": "/static/v31/icons/icon-128x128.png",
+ "src": "/static/v32/icons/icon-128x128.png",
"sizes": "128x128",
"type": "image/png"
}, {
- "src": "/static/v31/icons/icon-144x144.png",
+ "src": "/static/v32/icons/icon-144x144.png",
"sizes": "144x144",
"type": "image/png"
}, {
- "src": "/static/v31/icons/icon-152x152.png",
+ "src": "/static/v32/icons/icon-152x152.png",
"sizes": "152x152",
"type": "image/png"
}, {
- "src": "/static/v31/icons/icon-192x192.png",
+ "src": "/static/v32/icons/icon-192x192.png",
"sizes": "192x192",
"type": "image/png"
}, {
- "src": "/static/v31/icons/icon-256x256.png",
+ "src": "/static/v32/icons/icon-256x256.png",
"sizes": "256x256",
"type": "image/png"
}, {
- "src": "/static/v31/icons/icon-512x512.png",
+ "src": "/static/v32/icons/icon-512x512.png",
"sizes": "512x512",
"type": "image/png"
}],
diff --git a/public/static/v30 b/public/static/v32
index 945c9b4..945c9b4 120000
--- a/public/static/v30
+++ b/public/static/v32
diff --git a/templates/journey.html.ep b/templates/journey.html.ep
index ff5bc12..976dc4d 100644
--- a/templates/journey.html.ep
+++ b/templates/journey.html.ep
@@ -179,7 +179,7 @@
<%= $station->[0] %>
% }
% else {
- <span style="color: #666666;"><%= $station->[0] %></span>
+ <span style="color: #808080;"><%= $station->[0] %></span>
% }
% if ($journey->{edited} & 0x0010) {
∗
@@ -191,12 +191,12 @@
% if ($journey->{user_data} and $journey->{user_data}{wagons}) {
<tr>
<th scope="row">Rollmaterial</th>
- <td>
+ <td class="wagons">
% for my $wagongroup (@{$journey->{user_data}{wagongroups} // []}) {
- Gruppe <%= $wagongroup %><br/>
+ Wagenverbund <%= $wagongroup %><br/>
% }
% for my $wagon (@{$journey->{user_data}{wagons}}) {
- <span style="margin-right: 0.5ex;"><%= substr($wagon->{id}, 0, 2) %></span><span style="margin-right: 0.5ex;"><%= substr($wagon->{id}, 2, 2) %></span><span style="margin-right: 0.5ex;"><%= substr($wagon->{id}, 4, 1) %></span><span style="margin-right: 0.5ex; font-weight: bold;"><%= substr($wagon->{id}, 5, 3) %></span><span style="margin-right: 0.5ex;"><%= substr($wagon->{id}, 8, 3) %></span><span style="margin-right: 1em;"><%= substr($wagon->{id}, 11) %></span>
+ <span><%= substr($wagon->{id}, 0, 2) %></span><span><%= substr($wagon->{id}, 2, 2) %></span><span><%= substr($wagon->{id}, 4, 1) %></span><span class="wagonclass"><%= substr($wagon->{id}, 5, 3) %></span><span class="wagonnum"><%= substr($wagon->{id}, 8, 3) %></span><span class="checksum"><%= substr($wagon->{id}, 11) %></span>
%= $wagon->{type}
% if ($wagon->{number}) {
– Wagen <%= $wagon->{number} %>
diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep
index 51ffc46..bd9bf8d 100644
--- a/templates/layouts/default.html.ep
+++ b/templates/layouts/default.html.ep
@@ -10,7 +10,7 @@
% while (my ($key, $value) = each %{stash('twitter') // {}}) {
<meta name="twitter:<%= $key %>" content="<%= $value %>">
% }
- % my $av = 'v31'; # asset version
+ % my $av = 'v32'; # asset version
<link rel="icon" type="image/png" href="/static/<%= $av %>/icons/icon-16x16.png" sizes="16x16">
<link rel="icon" type="image/png" href="/static/<%= $av %>/icons/icon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="/static/<%= $av %>/icons/icon-96x96.png" sizes="96x96">
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 17:52:27 +0000