Skip to content

Commit

Permalink
Avoid using sprockets for combining stylesheets
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gravitystorm committed Jul 12, 2023
1 parent 17b18fc commit 1b2f07e
Show file tree
Hide file tree
Showing 11 changed files with 4 additions and 14 deletions.
1 change: 0 additions & 1 deletion app/assets/stylesheets/ltr/common.scss

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/stylesheets/print-ltr.css

This file was deleted.

1 change: 1 addition & 0 deletions app/assets/stylesheets/print-ltr.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "print";
3 changes: 0 additions & 3 deletions app/assets/stylesheets/print-rtl.css

This file was deleted.

1 change: 1 addition & 0 deletions app/assets/stylesheets/print-rtl.r2.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "print";
File renamed without changes.
1 change: 0 additions & 1 deletion app/assets/stylesheets/rtl/common.r2.scss

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/stylesheets/screen-ltr.css

This file was deleted.

1 change: 1 addition & 0 deletions app/assets/stylesheets/screen-ltr.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "common";
3 changes: 0 additions & 3 deletions app/assets/stylesheets/screen-rtl.css

This file was deleted.

1 change: 1 addition & 0 deletions app/assets/stylesheets/screen-rtl.r2.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "common";

0 comments on commit 1b2f07e

Please sign in to comment.