From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Jul 2023 17:34:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4088'
X-Git-Tag: live~1190
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0a8dae77fbf8e0f7539f1a64abbf4ed32cf79558?hp=c6db419b5542d7b36108f6a50ae147e9343083bc

Merge remote-tracking branch 'upstream/pull/4088'
---

diff --git a/app/assets/stylesheets/ltr/common.scss b/app/assets/stylesheets/ltr/common.scss
deleted file mode 120000
index 85037a3c7..000000000
--- a/app/assets/stylesheets/ltr/common.scss
+++ /dev/null
@@ -1 +0,0 @@
-../common.scss
\ No newline at end of file
diff --git a/app/assets/stylesheets/print-ltr.css b/app/assets/stylesheets/print-ltr.css
deleted file mode 100644
index 162c6f23c..000000000
--- a/app/assets/stylesheets/print-ltr.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- *= require print
- */
diff --git a/app/assets/stylesheets/print-ltr.scss b/app/assets/stylesheets/print-ltr.scss
new file mode 100644
index 000000000..ced65cf98
--- /dev/null
+++ b/app/assets/stylesheets/print-ltr.scss
@@ -0,0 +1 @@
+@import "print";
diff --git a/app/assets/stylesheets/print-rtl.css b/app/assets/stylesheets/print-rtl.css
deleted file mode 100644
index 162c6f23c..000000000
--- a/app/assets/stylesheets/print-rtl.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- *= require print
- */
diff --git a/app/assets/stylesheets/print-rtl.r2.scss b/app/assets/stylesheets/print-rtl.r2.scss
new file mode 100644
index 000000000..ced65cf98
--- /dev/null
+++ b/app/assets/stylesheets/print-rtl.r2.scss
@@ -0,0 +1 @@
+@import "print";
diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.scss
similarity index 100%
rename from app/assets/stylesheets/print.css
rename to app/assets/stylesheets/print.scss
diff --git a/app/assets/stylesheets/rtl/common.r2.scss b/app/assets/stylesheets/rtl/common.r2.scss
deleted file mode 120000
index 85037a3c7..000000000
--- a/app/assets/stylesheets/rtl/common.r2.scss
+++ /dev/null
@@ -1 +0,0 @@
-../common.scss
\ No newline at end of file
diff --git a/app/assets/stylesheets/screen-ltr.css b/app/assets/stylesheets/screen-ltr.css
deleted file mode 100644
index a0890d1e0..000000000
--- a/app/assets/stylesheets/screen-ltr.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- *= require ltr/common
- */
diff --git a/app/assets/stylesheets/screen-ltr.scss b/app/assets/stylesheets/screen-ltr.scss
new file mode 100644
index 000000000..c525060af
--- /dev/null
+++ b/app/assets/stylesheets/screen-ltr.scss
@@ -0,0 +1 @@
+@import "common";
diff --git a/app/assets/stylesheets/screen-rtl.css b/app/assets/stylesheets/screen-rtl.css
deleted file mode 100644
index c0f4d793a..000000000
--- a/app/assets/stylesheets/screen-rtl.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- *= require rtl/common
- */
diff --git a/app/assets/stylesheets/screen-rtl.r2.scss b/app/assets/stylesheets/screen-rtl.r2.scss
new file mode 100644
index 000000000..c525060af
--- /dev/null
+++ b/app/assets/stylesheets/screen-rtl.r2.scss
@@ -0,0 +1 @@
+@import "common";