From 19c3edab711d21ad6846d03055f0aef0b827222d Mon Sep 17 00:00:00 2001
From: Dan Barber <dan@new-bamboo.co.uk>
Date: Mon, 10 Mar 2014 11:32:08 +0000
Subject: [PATCH] Fix some assets.

---
 app/views/layouts/application.html.erb              |  2 +-
 config/application.rb                               |  2 ++
 .../stylesheets/{fancybox.css => fancybox.css.scss} | 13 +++++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)
 rename vendor/assets/stylesheets/{fancybox.css => fancybox.css.scss} (90%)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index be419c3..32bebfc 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,7 +9,7 @@
     <meta name="language" content="English" />
     <%= stylesheet_link_tag "application" %>
     <%= javascript_include_tag 'application' %>
-    <%= favicon_link_tag %>
+    <%= favicon_link_tag 'favicon.ico' %>
     <%= render :partial => "shared/typekit" %>
   </head>
 
diff --git a/config/application.rb b/config/application.rb
index 40bfd2c..7d18e7f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,6 +43,8 @@ module DanBarberPhoto
     # Enable the asset pipeline
     config.assets.enabled = true
 
+    config.assets.precompile += %w(favicon.ico fancybox/sprite.png fancybox/loading.gif fancybox/blank.gif fancybox/overlay.png)
+
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
 
diff --git a/vendor/assets/stylesheets/fancybox.css b/vendor/assets/stylesheets/fancybox.css.scss
similarity index 90%
rename from vendor/assets/stylesheets/fancybox.css
rename to vendor/assets/stylesheets/fancybox.css.scss
index fcda4c0..104b429 100755
--- a/vendor/assets/stylesheets/fancybox.css
+++ b/vendor/assets/stylesheets/fancybox.css.scss
@@ -1,3 +1,8 @@
+//= depend_on_asset "fancybox/sprite.png"
+//= depend_on_asset "fancybox/loading.gif"
+//= depend_on_asset "fancybox/blank.gif"
+//= depend_on_asset "fancybox/overlay.png"
+
 /*! fancyBox v2.1.4 fancyapps.com | fancyapps.com/fancybox/#license */
 .fancybox-wrap,
 .fancybox-skin,
@@ -76,7 +81,7 @@
 }
 
 #fancybox-loading, .fancybox-close, .fancybox-prev span, .fancybox-next span {
-  background-image: url('/assets/fancybox/sprite.png');
+  background-image: asset-url('fancybox/sprite.png');
 }
 
 #fancybox-loading {
@@ -94,7 +99,7 @@
 #fancybox-loading div {
   width: 44px;
   height: 44px;
-  background: url('/assets/fancybox/loading.gif') center center no-repeat;
+  background: asset-url('fancybox/loading.gif') center center no-repeat;
 }
 
 .fancybox-close {
@@ -114,7 +119,7 @@
   height: 100%;
   cursor: pointer;
   text-decoration: none;
-  background: transparent url('/assets/fancybox/blank.gif'); /* helps IE */
+  background: transparent asset-url('fancybox/blank.gif'); /* helps IE */
   -webkit-tap-highlight-color: rgba(0,0,0,0);
   z-index: 8040;
 }
@@ -175,7 +180,7 @@
   overflow: hidden;
   display: none;
   z-index: 8010;
-  background: url('/assets/fancybox/overlay.png');
+  background: asset-url('fancybox/overlay.png');
 }
 
 .fancybox-overlay-fixed {