From 2171317bad1cf9addf86f4cc0ec59f3b48327ce1 Mon Sep 17 00:00:00 2001 From: Derf Null Date: Fri, 31 Mar 2023 17:40:53 +0200 Subject: [PATCH] move local.css to sass --- public/service-worker.js | 1 - .../static/css/local.css => sass/src/common/local.scss | 9 ++------- sass/src/dark/index.scss | 1 + sass/src/light/index.scss | 1 + templates/layouts/default.html.ep | 1 - 5 files changed, 4 insertions(+), 9 deletions(-) rename public/static/css/local.css => sass/src/common/local.scss (86%) 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/sass/src/common/local.scss similarity index 86% rename from public/static/css/local.css rename to sass/src/common/local.scss index 5449a23..32f66da 100644 --- a/public/static/css/local.css +++ b/sass/src/common/local.scss @@ -1,8 +1,3 @@ -/* - * Copyright (C) 2020 Daniel Friesel - * - * SPDX-License-Identifier: MIT - */ .action-checkin, .action-checkout, .action-undo, @@ -18,12 +13,12 @@ .brand-logo:hover .ca, .brand-logo:hover .ce { - color: #a8e3fa; + color: #a8e3fa !important; } .brand-logo:hover .cb, .brand-logo:hover .cd { - color: #f5c4ce; + color: #f5c4ce !important; } td.cancelled { 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" % }