From 2171317bad1cf9addf86f4cc0ec59f3b48327ce1 Mon Sep 17 00:00:00 2001 From: Derf Null Date: Fri, 31 Mar 2023 17:40:53 +0200 Subject: move local.css to sass --- public/service-worker.js | 1 - public/static/css/local.css | 65 --------------------------------------- sass/src/common/local.scss | 60 ++++++++++++++++++++++++++++++++++++ sass/src/dark/index.scss | 1 + sass/src/light/index.scss | 1 + templates/layouts/default.html.ep | 1 - 6 files changed, 62 insertions(+), 67 deletions(-) delete mode 100644 public/static/css/local.css create mode 100644 sass/src/common/local.scss diff --git a/public/service-worker.js b/public/service-worker.js index df524a7..dadb6a4 100644 --- a/public/service-worker.js +++ b/public/service-worker.js @@ -5,7 +5,6 @@ const FILES_TO_CACHE = [ '/static/v51/css/light.min.css', '/static/v51/css/dark.min.css', '/static/v51/css/material-icons.css', - '/static/v51/css/local.css', '/static/v51/fonts/MaterialIcons-Regular.woff2', '/static/v51/fonts/MaterialIcons-Regular.woff', '/static/v51/fonts/MaterialIcons-Regular.ttf', diff --git a/public/static/css/local.css b/public/static/css/local.css deleted file mode 100644 index 5449a23..0000000 --- a/public/static/css/local.css +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2020 Daniel Friesel - * - * SPDX-License-Identifier: MIT - */ -.action-checkin, -.action-checkout, -.action-undo, -.action-cancelled-from, -.action-cancelled-to, -.action-share { - cursor: pointer; -} - -.brand-logo span { - transition: color 1s; -} - -.brand-logo:hover .ca, -.brand-logo:hover .ce { - color: #a8e3fa; -} - -.brand-logo:hover .cb, -.brand-logo:hover .cd { - color: #f5c4ce; -} - -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; -} - -h2 { - font-size: 2.28rem; - margin: 1.52rem 0 .912rem 0; -} - -h3 { - font-size: 1.64rem; - margin: 1.0933333333rem 0 .656rem 0; -} diff --git a/sass/src/common/local.scss b/sass/src/common/local.scss new file mode 100644 index 0000000..32f66da --- /dev/null +++ b/sass/src/common/local.scss @@ -0,0 +1,60 @@ +.action-checkin, +.action-checkout, +.action-undo, +.action-cancelled-from, +.action-cancelled-to, +.action-share { + cursor: pointer; +} + +.brand-logo span { + transition: color 1s; +} + +.brand-logo:hover .ca, +.brand-logo:hover .ce { + color: #a8e3fa !important; +} + +.brand-logo:hover .cb, +.brand-logo:hover .cd { + color: #f5c4ce !important; +} + +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; +} + +h2 { + font-size: 2.28rem; + margin: 1.52rem 0 .912rem 0; +} + +h3 { + font-size: 1.64rem; + margin: 1.0933333333rem 0 .656rem 0; +} diff --git a/sass/src/dark/index.scss b/sass/src/dark/index.scss index f46aefb..28c615b 100644 --- a/sass/src/dark/index.scss +++ b/sass/src/dark/index.scss @@ -2,6 +2,7 @@ @import 'variables.scss'; @import '../../materialize.scss'; @import '../common/index.scss'; +@import '../common/local.scss'; .progress { background-color: color('grey', 'darken-3'); diff --git a/sass/src/light/index.scss b/sass/src/light/index.scss index 170b750..531c346 100644 --- a/sass/src/light/index.scss +++ b/sass/src/light/index.scss @@ -2,6 +2,7 @@ @import 'variables.scss'; @import '../../materialize.scss'; @import '../common/index.scss'; +@import '../common/local.scss'; .progress { background-color: color('grey', 'lighten-2'); diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep index 66dc9db..66c0e6b 100644 --- a/templates/layouts/default.html.ep +++ b/templates/layouts/default.html.ep @@ -54,7 +54,6 @@ } %= stylesheet "/static/${av}/css/material-icons.css" - %= stylesheet "/static/${av}/css/local.css" % if (stash('with_map')) { %= stylesheet "/static/${av}/leaflet/leaflet.css" % } -- cgit v1.2.3