From 183412b669b5b0b216aa1591a039be78385b2b0f Mon Sep 17 00:00:00 2001
From: Christoph Haas <email@christoph-haas.de>
Date: Sun, 28 Dec 2014 13:11:41 +0100
Subject: [PATCH] Moved vendor assets into asset pipeline. Fixes assets in
 production.

---
 app/assets/javascripts/application.js       | 1 -
 app/assets/stylesheets/application.css.scss | 4 +++-
 app/views/layouts/application.html.slim     | 2 --
 config/environments/production.rb           | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 1c69f5e..af7c1e1 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,4 +16,3 @@
 //= require fancybox
 //= require jquery.cycle2
 //= require_tree .
-
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 5d8fa0f..8b8ddea 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -12,4 +12,6 @@
  */
 
 @import "foundation_and_overrides";
-@import "my.css.scss";
+@import "my";
+@import "jquery-fancybox/jquery.fancybox";
+/*@import "jquery-raty/jquery.raty";*/
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index 0842887..6f01fef 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -9,8 +9,6 @@ html
     / TODO: make the keywords reflect the virtual host (e.g. Debian)
     = stylesheet_link_tag "application", media: "all"
     = javascript_include_tag "vendor/modernizr"
-    = stylesheet_link_tag "jquery-fancybox/jquery.fancybox", media: "all"
-    //= stylesheet_link_tag "jquery-raty/jquery.raty", media: "all"
     = javascript_include_tag 'jquery'
     //= javascript_include_tag 'jquery-raty/jquery.raty'
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 9ae489a..cefdd25 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -21,11 +21,11 @@ Debshots::Application.configure do
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
   # config.serve_static_assets = false
-  config.serve_static_assets = true
+  config.serve_static_files = true
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
-  # config.assets.css_compressor = :sass
+  config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false