From f74a6e47d5fd4cd4abc3ef5d162bb6d144890e98 Mon Sep 17 00:00:00 2001
From: VadLusk <AdLusk@gmail.com>
Date: Mon, 3 Sep 2018 09:20:26 +1000
Subject: [PATCH] Remove css_splitter references, delete all_split2.css. #1361
 #2633

---
 Gemfile                                         | 1 -
 Gemfile.lock                                    | 5 +----
 app/assets/stylesheets/darkswarm/all_split2.css | 3 ---
 app/controllers/application_controller.rb       | 1 -
 app/views/layouts/darkswarm.html.haml           | 2 +-
 5 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 app/assets/stylesheets/darkswarm/all_split2.css

diff --git a/Gemfile b/Gemfile
index 1147d4c59c..04f240a002 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,7 +103,6 @@ gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper',
 
 gem 'jquery-rails'
 gem 'jquery-migrate-rails'
-gem 'css_splitter'
 
 gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b8644adb02..98534f621b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -243,9 +243,7 @@ GEM
       safe_yaml (~> 1.0.0)
     css_parser (1.3.5)
       addressable
-    css_splitter (0.4.5)
-      sprockets (>= 2.0.0)
-    daemons (1.2.6)
+    daemons (1.2.2)
     dalli (2.7.2)
     database_cleaner (0.7.1)
     db2fog (0.8.0)
@@ -725,7 +723,6 @@ DEPENDENCIES
   capybara (>= 2.15.4)
   coffee-rails (~> 3.2.1)
   compass-rails
-  css_splitter
   custom_error_message!
   daemons
   dalli
diff --git a/app/assets/stylesheets/darkswarm/all_split2.css b/app/assets/stylesheets/darkswarm/all_split2.css
deleted file mode 100644
index e231ca5d02..0000000000
--- a/app/assets/stylesheets/darkswarm/all_split2.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- *= require 'darkswarm/all'
- */
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 65d1fb1f33..4b0cae8049 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -7,7 +7,6 @@ class ApplicationController < ActionController::Base
   before_filter :set_cache_headers # Issue #1213, prevent cart emptying via cache when using back button
 
   include EnterprisesHelper
-  helper CssSplitter::ApplicationHelper
 
   def redirect_to(options = {}, response_status = {})
     ::Rails.logger.error("Redirected by #{caller(1).first rescue "unknown"}")
diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index 2b796ad0cc..e3cd92951f 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -17,7 +17,7 @@
     = yield :scripts
     %script{:src => "https://js.stripe.com/v3/", :type => "text/javascript"}
     %script{src: "//maps.googleapis.com/maps/api/js?libraries=places,geometry#{ ENV['GOOGLE_MAPS_API_KEY'] ? '&key=' + ENV['GOOGLE_MAPS_API_KEY'] : ''} "}
-    = split_stylesheet_link_tag "darkswarm/all"
+    = stylesheet_link_tag "darkswarm/all"
     = javascript_include_tag "darkswarm/all"
 
     = render "layouts/i18n_script"