From bf953f898712fb7230b632b1601fdbc88ec9a620 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Tue, 16 Jun 2015 18:25:44 +1000
Subject: [PATCH] Undo last change, it broke asset precompilation. Rename
 style.css to scss for inclusion and force recompilation of all assets.

---
 app/assets/stylesheets/darkswarm/all.scss                      | 1 -
 app/assets/stylesheets/darkswarm/{style.css => style.css.scss} | 0
 config/application.rb                                          | 2 +-
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename app/assets/stylesheets/darkswarm/{style.css => style.css.scss} (100%)

diff --git a/app/assets/stylesheets/darkswarm/all.scss b/app/assets/stylesheets/darkswarm/all.scss
index 653a0dbbe88..6cfc32e605c 100644
--- a/app/assets/stylesheets/darkswarm/all.scss
+++ b/app/assets/stylesheets/darkswarm/all.scss
@@ -10,7 +10,6 @@
 @import 'foundation-icons';
 
 @import '*';
-@import 'style';
 
 ofn-modal {
   display: block;
diff --git a/app/assets/stylesheets/darkswarm/style.css b/app/assets/stylesheets/darkswarm/style.css.scss
similarity index 100%
rename from app/assets/stylesheets/darkswarm/style.css
rename to app/assets/stylesheets/darkswarm/style.css.scss
diff --git a/config/application.rb b/config/application.rb
index 858228f01f7..5a31bc57745 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -79,7 +79,7 @@ class Application < Rails::Application
     config.assets.enabled = true
 
     # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.1'
+    config.assets.version = '1.2'
 
     config.sass.load_paths += [
       "#{Gem.loaded_specs['foundation-rails'].full_gem_path}/vendor/assets/stylesheets/foundation/components",