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 (symlink)
index 85037a3..0000000
--- 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 (file)
index 162c6f2..0000000
--- 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 (file)
index 0000000..ced65cf
--- /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 (file)
index 162c6f2..0000000
--- 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 (file)
index 0000000..ced65cf
--- /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 (symlink)
index 85037a3..0000000
--- 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 (file)
index a0890d1..0000000
--- 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 (file)
index 0000000..c525060
--- /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 (file)
index c0f4d79..0000000
--- 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 (file)
index 0000000..c525060
--- /dev/null
+++ b/app/assets/stylesheets/screen-rtl.r2.scss
@@ -0,0 +1 @@
+@import "common";