diff --git a/Gemfile b/Gemfile index 372556d7..221e9fb4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'rails', '~> 5.2.4' -gem 'sassc-rails', '~> 2.0.0' +gem 'sassc-rails', '~> 2.1.2' gem 'coffee-rails', '~> 5.0.0' #gem 'json' diff --git a/Gemfile.lock b/Gemfile.lock index a5268019..0126714c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,7 +87,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) crass (1.0.6) database_cleaner (1.8.5) diff-lcs (1.3) @@ -100,13 +100,13 @@ GEM factory_bot_rails (6.1.0) factory_bot (~> 6.1.0) railties (>= 5.0.0) - ffi (1.9.25) + ffi (1.13.1) font-awesome-sass (5.13.0) sassc (>= 1.11) globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) - i18n (1.8.4) + i18n (1.8.5) concurrent-ruby (~> 1.0) jaro_winkler (1.5.4) jquery-rails (4.4.0) @@ -221,10 +221,9 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) - sassc (2.0.0) - ffi (~> 1.9.6) - rake - sassc-rails (2.0.0) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) railties (>= 4.0.0) sassc (>= 2.0) sprockets (> 3.0) @@ -252,7 +251,7 @@ GEM tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) spring (2.1.0) - sprockets (3.7.2) + sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -320,7 +319,7 @@ DEPENDENCIES rspec-expectations rubocop (~> 0.89) sanitize (~> 5.2) - sassc-rails (~> 2.0.0) + sassc-rails (~> 2.1.2) selenium-webdriver (~> 3.142) simplecov solargraph diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 00000000..b16e53d6 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/stylesheets/black.scss b/app/assets/stylesheets/black.scss index edff8b5c..86647a0b 100644 --- a/app/assets/stylesheets/black.scss +++ b/app/assets/stylesheets/black.scss @@ -9,4 +9,4 @@ $link-bgcolor: $link-color; $box-tablink-color: unset; // Import all components -@import 'manifest'; +@import 'include/manifest'; diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/include/icons.scss similarity index 100% rename from app/assets/stylesheets/icons.scss rename to app/assets/stylesheets/include/icons.scss diff --git a/app/assets/stylesheets/legacy.scss b/app/assets/stylesheets/include/legacy.scss similarity index 100% rename from app/assets/stylesheets/legacy.scss rename to app/assets/stylesheets/include/legacy.scss diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/include/login.scss similarity index 100% rename from app/assets/stylesheets/login.scss rename to app/assets/stylesheets/include/login.scss diff --git a/app/assets/stylesheets/manifest.scss b/app/assets/stylesheets/include/manifest.scss similarity index 100% rename from app/assets/stylesheets/manifest.scss rename to app/assets/stylesheets/include/manifest.scss diff --git a/app/assets/stylesheets/tracks-logo.scss b/app/assets/stylesheets/include/tracks-logo.scss similarity index 100% rename from app/assets/stylesheets/tracks-logo.scss rename to app/assets/stylesheets/include/tracks-logo.scss diff --git a/app/assets/stylesheets/tracks.scss b/app/assets/stylesheets/include/tracks.scss similarity index 100% rename from app/assets/stylesheets/tracks.scss rename to app/assets/stylesheets/include/tracks.scss diff --git a/app/assets/stylesheets/light_blue.scss b/app/assets/stylesheets/light_blue.scss index ae2972c1..9d6ea71e 100644 --- a/app/assets/stylesheets/light_blue.scss +++ b/app/assets/stylesheets/light_blue.scss @@ -9,4 +9,4 @@ $link-bgcolor: unset; $box-tablink-color: lighten(#000, 85%); // Import all components -@import 'manifest'; +@import 'include/manifest'; diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 117d2895..719bc58e 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -7,8 +7,3 @@ Rails.application.config.assets.version = '1.0' # Rails.application.config.assets.paths << Emoji.images_path # Add Yarn node_modules folder to the asset load path. Rails.application.config.assets.paths << Rails.root.join('node_modules') - -# Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in the app/assets -# folder are already added. -Rails.application.config.assets.precompile += %w( light_blue.css black.css print.css mobile.css jquery-ui/datepicker-*.js )