From 25b0306a933c5c38eb5bfbfa0bddfdf4f4e12901 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 1 Nov 2013 11:09:23 +1100 Subject: [PATCH] Ensure css is precompiled, reformat configs --- .../{shared => admin}/restore_spree_from_cms.css.scss | 0 app/views/shared/_cms_elrte_head.html.haml | 2 +- config/application.rb | 6 +++++- 3 files changed, 6 insertions(+), 2 deletions(-) rename app/assets/stylesheets/{shared => admin}/restore_spree_from_cms.css.scss (100%) diff --git a/app/assets/stylesheets/shared/restore_spree_from_cms.css.scss b/app/assets/stylesheets/admin/restore_spree_from_cms.css.scss similarity index 100% rename from app/assets/stylesheets/shared/restore_spree_from_cms.css.scss rename to app/assets/stylesheets/admin/restore_spree_from_cms.css.scss diff --git a/app/views/shared/_cms_elrte_head.html.haml b/app/views/shared/_cms_elrte_head.html.haml index 024c38ca53..f070625f8a 100644 --- a/app/views/shared/_cms_elrte_head.html.haml +++ b/app/views/shared/_cms_elrte_head.html.haml @@ -11,7 +11,7 @@ 'comfortable_mexican_sofa/jquery_ui', 'comfortable_mexican_sofa/dialogs', 'comfortable_mexican_sofa/widgets', - 'shared/restore_spree_from_cms' + 'admin/restore_spree_from_cms' = javascript_include_tag('comfortable_mexican_sofa/application') diff --git a/config/application.rb b/config/application.rb index 09a32edf6a..d6f17c8356 100644 --- a/config/application.rb +++ b/config/application.rb @@ -76,6 +76,10 @@ module Openfoodnetwork config.assets.version = '1.0' config.assets.initialize_on_precompile = true - config.assets.precompile += ['store/all.css', 'store/all.js', 'store/shop_front.js', 'admin/all.css', 'admin/*.js', 'admin/**/*.js', 'comfortable_mexican_sofa/*', 'search/all.css', 'search/*.js'] + config.assets.precompile += ['store/all.css', 'store/all.js', 'store/shop_front.js'] + config.assets.precompile += ['admin/all.css', 'admin/*.js', 'admin/**/*.js'] + config.assets.precompile += ['comfortable_mexican_sofa/*'] + config.assets.precompile += ['search/all.css', 'search/*.js'] + config.assets.precompile += ['shared/*'] end end