diff options
| author | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-10 01:13:31 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-20 22:26:40 +0300 |
| commit | 429aa8f374f33cffac07ece1a79cfe771a570c02 (patch) | |
| tree | aca852ab9c89c264a22a8569cd00bf11175796f6 /config | |
| parent | 0382cb48c15e48ea74397b5082541b1a4fbf1cc8 (diff) | |
Upgrade to sprockets 4
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 8 | ||||
| -rw-r--r-- | config/environments/test.rb | 1 | ||||
| -rw-r--r-- | config/initializers/color_themes.rb | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/config/application.rb b/config/application.rb index 50524a735..83c82284d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -74,14 +74,6 @@ module Diaspora # Speed up precompile by not loading the environment config.assets.initialize_on_precompile = false - # Precompile additional assets. - # (application.js, application.css, and all non-JS/CSS in the app/assets are already added) - config.assets.precompile = %w[ - color_themes/*/desktop.css - color_themes/*/mobile.css - manifest.js - ] - # See lib/tasks/assets.rake: non_digest_assets config.assets.non_digest_assets = %w(branding/logos/asterisk.png) diff --git a/config/environments/test.rb b/config/environments/test.rb index 26db9c226..4f56e4017 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -27,7 +27,6 @@ Rails.application.configure do config.assets.precompile += %w[poltergeist_disable_transition.css] # Don't precompile all themes for tests - config.assets.precompile -= %w[color_themes/*/desktop.css color_themes/*/mobile.css] config.assets.precompile += %w[ color_themes/original/desktop.css color_themes/dark_green/desktop.css diff --git a/config/initializers/color_themes.rb b/config/initializers/color_themes.rb index 7cabdba64..8231c73ac 100644 --- a/config/initializers/color_themes.rb +++ b/config/initializers/color_themes.rb @@ -17,3 +17,10 @@ if color_themes_file.exist? else AVAILABLE_COLOR_THEMES = ["original"].freeze end + +unless Rails.env.test? + AVAILABLE_COLOR_THEMES.each do |theme_code| + Rails.application.config.assets.precompile += + %W[color_themes/#{theme_code}/desktop.css color_themes/#{theme_code}/mobile.css] + end +end |