Avoid using sprockets for combining stylesheets
There are two options for combining stylesheets, using sprockets (via `require` statements) or using sass (via `@import` statements). This commit switches to using `@import` statements throughout, to avoid a bug with libsass that prevents us from using bootstrap 5.2+ See https://github.com/sass/sassc-rails/issues/174 Since R2 is not triggered when `@import`ing a file, we need to switch the top-level stylesheet names to include the extension. We can also take the opportunity to remove a level of indirection, along with removing symlinks which cause problems on some platforms. * https://github.com/openstreetmap/openstreetmap-website/issues/3984 * https://github.com/openstreetmap/openstreetmap-website/issues/3422
This commit is contained in:
parent
17b18fcb81
commit
e108ec6d48
11 changed files with 4 additions and 14 deletions
|
@ -1 +0,0 @@
|
||||||
../common.scss
|
|
|
@ -1,3 +0,0 @@
|
||||||
/*
|
|
||||||
*= require print
|
|
||||||
*/
|
|
1
app/assets/stylesheets/print-ltr.scss
Normal file
1
app/assets/stylesheets/print-ltr.scss
Normal file
|
@ -0,0 +1 @@
|
||||||
|
@import "print";
|
|
@ -1,3 +0,0 @@
|
||||||
/*
|
|
||||||
*= require print
|
|
||||||
*/
|
|
1
app/assets/stylesheets/print-rtl.r2.scss
Normal file
1
app/assets/stylesheets/print-rtl.r2.scss
Normal file
|
@ -0,0 +1 @@
|
||||||
|
@import "print";
|
|
@ -1 +0,0 @@
|
||||||
../common.scss
|
|
|
@ -1,3 +0,0 @@
|
||||||
/*
|
|
||||||
*= require ltr/common
|
|
||||||
*/
|
|
1
app/assets/stylesheets/screen-ltr.scss
Normal file
1
app/assets/stylesheets/screen-ltr.scss
Normal file
|
@ -0,0 +1 @@
|
||||||
|
@import "common";
|
|
@ -1,3 +0,0 @@
|
||||||
/*
|
|
||||||
*= require rtl/common
|
|
||||||
*/
|
|
1
app/assets/stylesheets/screen-rtl.r2.scss
Normal file
1
app/assets/stylesheets/screen-rtl.r2.scss
Normal file
|
@ -0,0 +1 @@
|
||||||
|
@import "common";
|
Loading…
Add table
Add a link
Reference in a new issue