Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid using sprockets for combining stylesheets #4088

Merged
merged 1 commit into from
Jul 12, 2023

Conversation

gravitystorm
Copy link
Collaborator

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 @importing 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.

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
@gravitystorm gravitystorm added the refactor Refactoring, or things that work but could be done better label Jul 12, 2023
@tomhughes tomhughes merged commit 0a8dae7 into openstreetmap:master Jul 12, 2023
@gravitystorm gravitystorm deleted the sprockets_direct branch July 26, 2023 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactor Refactoring, or things that work but could be done better
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants