From ba6104aa3fb2c57b4e67784facbab5894e181877 Mon Sep 17 00:00:00 2001
From: Matei Stanca <i@ambientimpact.com>
Date: Wed, 27 Nov 2024 01:06:15 -0500
Subject: [PATCH] Issue #3488464: Deleted Turbo progress bar CSS, moved scroll
to own CSS.
---
modules/refreshless_turbo/css/scroll.css | 5 ++++
modules/refreshless_turbo/css/turbo.css | 28 -------------------
.../refreshless_turbo.libraries.yml | 13 ++++++---
3 files changed, 14 insertions(+), 32 deletions(-)
create mode 100644 modules/refreshless_turbo/css/scroll.css
delete mode 100644 modules/refreshless_turbo/css/turbo.css
diff --git a/modules/refreshless_turbo/css/scroll.css b/modules/refreshless_turbo/css/scroll.css
new file mode 100644
index 0000000..e1dc6fc
--- /dev/null
+++ b/modules/refreshless_turbo/css/scroll.css
@@ -0,0 +1,5 @@
+:root.refreshless-disable-smooth-scroll {
+
+ scroll-behavior: auto !important;
+
+}
diff --git a/modules/refreshless_turbo/css/turbo.css b/modules/refreshless_turbo/css/turbo.css
deleted file mode 100644
index d05fdda..0000000
--- a/modules/refreshless_turbo/css/turbo.css
+++ /dev/null
@@ -1,28 +0,0 @@
-/* @see https://turbo.hotwired.dev/handbook/drive#displaying-progress */
-
-:root {
-
- /* Default values shipped with Turbo. */
- --turbo-progress-colour: #0076ff;
- --turbo-progress-thickness: 3px;
-
- /* We recommend overriding these as they can apply to other (future)
- RefreshLess implementations as well. */
- --refreshless-progress-bar-colour: var(--turbo-progress-colour);
- --refreshless-progress-bar-thickness: var(--turbo-progress-thickness);
-
-}
-
-.turbo-progress-bar {
-
- height: var(--refreshless-progress-bar-thickness);
-
- background-color: var(--refreshless-progress-bar-colour);
-
-}
-
-:root.refreshless-disable-smooth-scroll {
-
- scroll-behavior: auto !important;
-
-}
diff --git a/modules/refreshless_turbo/refreshless_turbo.libraries.yml b/modules/refreshless_turbo/refreshless_turbo.libraries.yml
index 25d8b27..b5162e2 100644
--- a/modules/refreshless_turbo/refreshless_turbo.libraries.yml
+++ b/modules/refreshless_turbo/refreshless_turbo.libraries.yml
@@ -1,7 +1,4 @@
refreshless:
- css:
- theme:
- css/turbo.css: {}
js:
# The explicit aggregation group should not be changed or removed as it's
# used to group our JavaScript into a separate aggregate if/when core
@@ -19,7 +16,6 @@ refreshless:
js/drupal_settings.js: { attributes: { defer: true }, group: refreshless-turbo, preprocess: false }
js/behaviours.js: { attributes: { defer: true }, group: refreshless-turbo, preprocess: false }
# js/progress_bar.js: { attributes: { defer: true }, group: refreshless-turbo, preprocess: false }
- js/scroll.js: { attributes: { defer: true }, group: refreshless-turbo, preprocess: false }
js/stylesheet_sorter.js: { attributes: { defer: true }, group: refreshless-turbo, preprocess: false }
js/refreshless.js: { attributes: { defer: true }, group: refreshless-turbo, preprocess: false }
header: true
@@ -29,6 +25,7 @@ refreshless:
- core/jquery
- core/once
- refreshless_turbo/reload
+ - refreshless_turbo/scroll
# @see \Drupal\refreshless_turbo\Hooks\Library::alterJsCookie()
# Conditionally attaches our js-cookie if core's is no longer present.
#
@@ -84,6 +81,14 @@ js-cookie:
js:
vendor/js-cookie/dist/js.cookie.js: {}
+scroll:
+ css:
+ theme:
+ css/scroll.css: {}
+ js:
+ js/scroll.js: { attributes: { defer: true }, group: refreshless-turbo, preprocess: false }
+ header: true
+
turbo:
# The "-patchN" is to force downloading of a patched Turbo despite the
# official release version remaining the same. The "-patchN" number can be
--
GitLab