Skip to content

Commit 1b2f07e

Browse files
committed
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 sass/sassc-rails#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. * openstreetmap#3984 * openstreetmap#3422
1 parent 17b18fc commit 1b2f07e

File tree

11 files changed

+4
-14
lines changed

11 files changed

+4
-14
lines changed

app/assets/stylesheets/ltr/common.scss

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/assets/stylesheets/print-ltr.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/assets/stylesheets/print-ltr.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "print";

app/assets/stylesheets/print-rtl.css

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "print";
File renamed without changes.

app/assets/stylesheets/rtl/common.r2.scss

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/assets/stylesheets/screen-ltr.css

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "common";

app/assets/stylesheets/screen-rtl.css

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import "common";

0 commit comments

Comments
 (0)