diff options
| author | jpl | 2017-02-01 17:25:13 +0100 |
|---|---|---|
| committer | jpl | 2017-02-01 17:25:13 +0100 |
| commit | 2368e50d6ba65f222bb02982ed7dea39e765d09d (patch) | |
| tree | d19d8455edb3a810e820050bcf4e8fe056cdb6d9 | |
| parent | 33c882b95c68544905861e11cd9abebc60f5bd67 (diff) | |
| download | chouette-core-2368e50d6ba65f222bb02982ed7dea39e765d09d.tar.bz2 | |
Refs #2475: fix tests, replacing old application.sass with new one
| -rw-r--r-- | app/assets/stylesheets/application.sass (renamed from app/assets/stylesheets/application_new.sass) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/old_application.sass.erb (renamed from app/assets/stylesheets/application.sass.erb) | 0 | ||||
| -rw-r--r-- | app/views/layouts/application.html.slim | 2 | ||||
| -rw-r--r-- | config/initializers/assets.rb | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/application_new.sass b/app/assets/stylesheets/application.sass index 74919f7b4..74919f7b4 100644 --- a/app/assets/stylesheets/application_new.sass +++ b/app/assets/stylesheets/application.sass diff --git a/app/assets/stylesheets/application.sass.erb b/app/assets/stylesheets/old_application.sass.erb index 3443a035d..3443a035d 100644 --- a/app/assets/stylesheets/application.sass.erb +++ b/app/assets/stylesheets/old_application.sass.erb diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index dc288a1e9..dc1ec9766 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -9,7 +9,7 @@ html lang=I18n.locale title STIF BOIV = stylesheet_link_tag 'base', media: 'all', 'data-turbolinks-track': true - = stylesheet_link_tag 'application_new', media: 'all', 'data-turbolinks-track': true + = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': true = javascript_include_tag 'application', 'data-turbolinks-track': true diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 9ca59134e..b53dba3d8 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -5,4 +5,4 @@ Rails.application.config.assets.version = '1.0' # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. -Rails.application.config.assets.precompile += %w( base.css application_new.css es6_browserified/*.js ) +Rails.application.config.assets.precompile += %w( base.css es6_browserified/*.js ) |