From 932edeb1c1ff7dff9e7a6b1eedbb504021be3a2f Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 7 Jul 2016 12:36:33 +1000 Subject: [PATCH] Remove CMS style shim - Spree/CMS compatibility --- app/assets/stylesheets/admin/restore_spree_from_cms.css.scss | 4 ---- config/application.rb | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 app/assets/stylesheets/admin/restore_spree_from_cms.css.scss diff --git a/app/assets/stylesheets/admin/restore_spree_from_cms.css.scss b/app/assets/stylesheets/admin/restore_spree_from_cms.css.scss deleted file mode 100644 index a281031f02..0000000000 --- a/app/assets/stylesheets/admin/restore_spree_from_cms.css.scss +++ /dev/null @@ -1,4 +0,0 @@ -html { - height: auto; - background-color: transparent; -} diff --git a/config/application.rb b/config/application.rb index 4847d9bb52..9abd0a3b9b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -100,7 +100,7 @@ module Openfoodnetwork # http://stackoverflow.com/questions/8012434/what-is-the-purpose-of-config-assets-precompile config.assets.initialize_on_precompile = true config.assets.precompile += ['store/all.css', 'store/all.js', 'store/shop_front.js', 'iehack.js'] - config.assets.precompile += ['admin/all.css', 'admin/restore_spree_from_cms.css', 'admin/*.js', 'admin/**/*.js'] + config.assets.precompile += ['admin/all.css', 'admin/*.js', 'admin/**/*.js'] config.assets.precompile += ['darkswarm/all.css', 'darkswarm/all_split2.css', 'darkswarm/all.js'] config.assets.precompile += ['mail/all.css'] config.assets.precompile += ['search/all.css', 'search/*.js']