Serve fonts from the asset pipeline

Following the suggestion to use the sass-rails font-path helper:

  http://aokolish.me/blog/2011/12/24/at-font-face-with-the-asset-pipeline/

27 files changed, 75 insertions, 74 deletions

diff --git a/public/stylesheets/fonts/delicious-bold-webfont.eot b/app/assets/fonts/delicious-bold-webfont.eot
index 90d2e95fa..90d2e95fa 100755
--- a/public/stylesheets/fonts/delicious-bold-webfont.eot
+++ b/app/assets/fonts/delicious-bold-webfont.eot
diff --git a/public/stylesheets/fonts/delicious-bold-webfont.svg b/app/assets/fonts/delicious-bold-webfont.svg
index 51a5d9080..51a5d9080 100755
--- a/public/stylesheets/fonts/delicious-bold-webfont.svg
+++ b/app/assets/fonts/delicious-bold-webfont.svg
diff --git a/public/stylesheets/fonts/delicious-bold-webfont.ttf b/app/assets/fonts/delicious-bold-webfont.ttf
index 2ec5d3e49..2ec5d3e49 100755
--- a/public/stylesheets/fonts/delicious-bold-webfont.ttf
+++ b/app/assets/fonts/delicious-bold-webfont.ttf
diff --git a/public/stylesheets/fonts/delicious-bold-webfont.woff b/app/assets/fonts/delicious-bold-webfont.woff
index b47277ef1..b47277ef1 100755
--- a/public/stylesheets/fonts/delicious-bold-webfont.woff
+++ b/app/assets/fonts/delicious-bold-webfont.woff
diff --git a/public/stylesheets/fonts/delicious-bolditalic-webfont.eot b/app/assets/fonts/delicious-bolditalic-webfont.eot
index 8e8957864..8e8957864 100755
--- a/public/stylesheets/fonts/delicious-bolditalic-webfont.eot
+++ b/app/assets/fonts/delicious-bolditalic-webfont.eot
diff --git a/public/stylesheets/fonts/delicious-bolditalic-webfont.svg b/app/assets/fonts/delicious-bolditalic-webfont.svg
index 7368c90f2..7368c90f2 100755
--- a/public/stylesheets/fonts/delicious-bolditalic-webfont.svg
+++ b/app/assets/fonts/delicious-bolditalic-webfont.svg
diff --git a/public/stylesheets/fonts/delicious-bolditalic-webfont.ttf b/app/assets/fonts/delicious-bolditalic-webfont.ttf
index ef25c0adc..ef25c0adc 100755
--- a/public/stylesheets/fonts/delicious-bolditalic-webfont.ttf
+++ b/app/assets/fonts/delicious-bolditalic-webfont.ttf
diff --git a/public/stylesheets/fonts/delicious-bolditalic-webfont.woff b/app/assets/fonts/delicious-bolditalic-webfont.woff
index 068f460de..068f460de 100755
--- a/public/stylesheets/fonts/delicious-bolditalic-webfont.woff
+++ b/app/assets/fonts/delicious-bolditalic-webfont.woff
diff --git a/public/stylesheets/fonts/delicious-heavy-webfont.eot b/app/assets/fonts/delicious-heavy-webfont.eot
index 782a01422..782a01422 100755
--- a/public/stylesheets/fonts/delicious-heavy-webfont.eot
+++ b/app/assets/fonts/delicious-heavy-webfont.eot
diff --git a/public/stylesheets/fonts/delicious-heavy-webfont.svg b/app/assets/fonts/delicious-heavy-webfont.svg
index 64e0eb347..64e0eb347 100755
--- a/public/stylesheets/fonts/delicious-heavy-webfont.svg
+++ b/app/assets/fonts/delicious-heavy-webfont.svg
diff --git a/public/stylesheets/fonts/delicious-heavy-webfont.ttf b/app/assets/fonts/delicious-heavy-webfont.ttf
index deba1f94f..deba1f94f 100755
--- a/public/stylesheets/fonts/delicious-heavy-webfont.ttf
+++ b/app/assets/fonts/delicious-heavy-webfont.ttf
diff --git a/public/stylesheets/fonts/delicious-heavy-webfont.woff b/app/assets/fonts/delicious-heavy-webfont.woff
index b3c48915d..b3c48915d 100755
--- a/public/stylesheets/fonts/delicious-heavy-webfont.woff
+++ b/app/assets/fonts/delicious-heavy-webfont.woff
diff --git a/public/stylesheets/fonts/delicious-italic-webfont.eot b/app/assets/fonts/delicious-italic-webfont.eot
index 8bc7f8ce0..8bc7f8ce0 100755
--- a/public/stylesheets/fonts/delicious-italic-webfont.eot
+++ b/app/assets/fonts/delicious-italic-webfont.eot
diff --git a/public/stylesheets/fonts/delicious-italic-webfont.svg b/app/assets/fonts/delicious-italic-webfont.svg
index 3cad32124..3cad32124 100755
--- a/public/stylesheets/fonts/delicious-italic-webfont.svg
+++ b/app/assets/fonts/delicious-italic-webfont.svg
diff --git a/public/stylesheets/fonts/delicious-italic-webfont.ttf b/app/assets/fonts/delicious-italic-webfont.ttf
index 01d11991b..01d11991b 100755
--- a/public/stylesheets/fonts/delicious-italic-webfont.ttf
+++ b/app/assets/fonts/delicious-italic-webfont.ttf
diff --git a/public/stylesheets/fonts/delicious-italic-webfont.woff b/app/assets/fonts/delicious-italic-webfont.woff
index 32aa7611e..32aa7611e 100755
--- a/public/stylesheets/fonts/delicious-italic-webfont.woff
+++ b/app/assets/fonts/delicious-italic-webfont.woff
diff --git a/public/stylesheets/fonts/delicious-roman-webfont.eot b/app/assets/fonts/delicious-roman-webfont.eot
index 2e1b7b24e..2e1b7b24e 100755
--- a/public/stylesheets/fonts/delicious-roman-webfont.eot
+++ b/app/assets/fonts/delicious-roman-webfont.eot
diff --git a/public/stylesheets/fonts/delicious-roman-webfont.svg b/app/assets/fonts/delicious-roman-webfont.svg
index c7c20b31c..c7c20b31c 100755
--- a/public/stylesheets/fonts/delicious-roman-webfont.svg
+++ b/app/assets/fonts/delicious-roman-webfont.svg
diff --git a/public/stylesheets/fonts/delicious-roman-webfont.ttf b/app/assets/fonts/delicious-roman-webfont.ttf
index cc27c5c1d..cc27c5c1d 100755
--- a/public/stylesheets/fonts/delicious-roman-webfont.ttf
+++ b/app/assets/fonts/delicious-roman-webfont.ttf
diff --git a/public/stylesheets/fonts/delicious-roman-webfont.woff b/app/assets/fonts/delicious-roman-webfont.woff
index 9acbdd4a0..9acbdd4a0 100755
--- a/public/stylesheets/fonts/delicious-roman-webfont.woff
+++ b/app/assets/fonts/delicious-roman-webfont.woff
diff --git a/public/stylesheets/fonts/delicious-smallcaps-webfont.eot b/app/assets/fonts/delicious-smallcaps-webfont.eot
index 358efc11f..358efc11f 100755
--- a/public/stylesheets/fonts/delicious-smallcaps-webfont.eot
+++ b/app/assets/fonts/delicious-smallcaps-webfont.eot
diff --git a/public/stylesheets/fonts/delicious-smallcaps-webfont.svg b/app/assets/fonts/delicious-smallcaps-webfont.svg
index d1235b7f6..d1235b7f6 100755
--- a/public/stylesheets/fonts/delicious-smallcaps-webfont.svg
+++ b/app/assets/fonts/delicious-smallcaps-webfont.svg
diff --git a/public/stylesheets/fonts/delicious-smallcaps-webfont.ttf b/app/assets/fonts/delicious-smallcaps-webfont.ttf
index 152f15f13..152f15f13 100755
--- a/public/stylesheets/fonts/delicious-smallcaps-webfont.ttf
+++ b/app/assets/fonts/delicious-smallcaps-webfont.ttf
diff --git a/public/stylesheets/fonts/delicious-smallcaps-webfont.woff b/app/assets/fonts/delicious-smallcaps-webfont.woff
index 0d4d1f7d0..0d4d1f7d0 100755
--- a/public/stylesheets/fonts/delicious-smallcaps-webfont.woff
+++ b/app/assets/fonts/delicious-smallcaps-webfont.woff
diff --git a/app/assets/stylesheets/fonts.css b/app/assets/stylesheets/fonts.css
new file mode 100644
index 000000000..18b2b76a9
--- /dev/null
+++ b/app/assets/stylesheets/fonts.css
@@ -0,0 +1,73 @@
+
+@font-face {
+    font-family: 'DeliciousBold';
+    src: url(font-path('delicious-bold-webfont.eot'));
+    src: url(font-path('delicious-bold-webfont.eot?#iefix')) format('embedded-opentype'),
+         url(font-path('delicious-bold-webfont.woff')) format('woff'),
+         url(font-path('delicious-bold-webfont.ttf')) format('truetype'),
+         url(font-path('delicious-bold-webfont.svg#DeliciousBold')) format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'DeliciousBoldItalic';
+    src: url(font-path('delicious-bolditalic-webfont.eot'));
+    src: url(font-path('delicious-bolditalic-webfont.eot?#iefix')) format('embedded-opentype'),
+         url(font-path('delicious-bolditalic-webfont.woff')) format('woff'),
+         url(font-path('delicious-bolditalic-webfont.ttf')) format('truetype'),
+         url(font-path('delicious-bolditalic-webfont.svg#DeliciousBoldItalic')) format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'DeliciousHeavyRegular';
+    src: url(font-path('delicious-heavy-webfont.eot'));
+    src: url(font-path('delicious-heavy-webfont.eot?#iefix')) format('embedded-opentype'),
+         url(font-path('delicious-heavy-webfont.woff')) format('woff'),
+         url(font-path('delicious-heavy-webfont.ttf')) format('truetype'),
+         url(font-path('delicious-heavy-webfont.svg#DeliciousHeavyRegular')) format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'DeliciousItalic';
+    src: url(font-path('delicious-italic-webfont.eot'));
+    src: url(font-path('delicious-italic-webfont.eot?#iefix')) format('embedded-opentype'),
+         url(font-path('delicious-italic-webfont.woff')) format('woff'),
+         url(font-path('delicious-italic-webfont.ttf')) format('truetype'),
+         url(font-path('delicious-italic-webfont.svg#DeliciousItalic')) format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'DeliciousRoman';
+    src: url(font-path('delicious-roman-webfont.eot'));
+    src: url(font-path('delicious-roman-webfont.eot?#iefix')) format('embedded-opentype'),
+         url(font-path('delicious-roman-webfont.woff')) format('woff'),
+         url(font-path('delicious-roman-webfont.ttf')) format('truetype'),
+         url(font-path('delicious-roman-webfont.svg#DeliciousRoman')) format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'DeliciousSmallCapsRegular';
+    src: url(font-path('delicious-smallcaps-webfont.eot'));
+    src: url(font-path('delicious-smallcaps-webfont.eot?#iefix')) format('embedded-opentype'),
+         url(font-path('delicious-smallcaps-webfont.woff')) format('woff'),
+         url(font-path('delicious-smallcaps-webfont.ttf')) format('truetype'),
+         url(font-path('delicious-smallcaps-webfont.svg#DeliciousSmallCapsRegular')) format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
diff --git a/config/application.rb b/config/application.rb
index 2b315b6de..3df327eb1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -90,7 +90,8 @@ module Alaveteli
     # grouped:
     config.assets.precompile += ['jquery.fancybox-1.3.4.pack.js',
                                  'jquery-ui-1.8.15.custom.css',
-                                 'excanvas.min.js']
+                                 'excanvas.min.js',
+                                 'fonts.css']
 
   end
 end
diff --git a/public/stylesheets/fonts.css b/public/stylesheets/fonts.css
deleted file mode 100644
index f63b4b1f8..000000000
--- a/public/stylesheets/fonts.css
+++ /dev/null
@@ -1,73 +0,0 @@
-
-@font-face {
-    font-family: 'DeliciousBold';
-    src: url('./fonts/delicious-bold-webfont.eot');
-    src: url('./fonts/delicious-bold-webfont.eot?#iefix') format('embedded-opentype'),
-         url('./fonts/delicious-bold-webfont.woff') format('woff'),
-         url('./fonts/delicious-bold-webfont.ttf') format('truetype'),
-         url('./fonts/delicious-bold-webfont.svg#DeliciousBold') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'DeliciousBoldItalic';
-    src: url('./fonts/delicious-bolditalic-webfont.eot');
-    src: url('./fonts/delicious-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('./fonts/delicious-bolditalic-webfont.woff') format('woff'),
-         url('./fonts/delicious-bolditalic-webfont.ttf') format('truetype'),
-         url('./fonts/delicious-bolditalic-webfont.svg#DeliciousBoldItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'DeliciousHeavyRegular';
-    src: url('./fonts/delicious-heavy-webfont.eot');
-    src: url('./fonts/delicious-heavy-webfont.eot?#iefix') format('embedded-opentype'),
-         url('./fonts/delicious-heavy-webfont.woff') format('woff'),
-         url('./fonts/delicious-heavy-webfont.ttf') format('truetype'),
-         url('./fonts/delicious-heavy-webfont.svg#DeliciousHeavyRegular') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'DeliciousItalic';
-    src: url('./fonts/delicious-italic-webfont.eot');
-    src: url('./fonts/delicious-italic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('./fonts/delicious-italic-webfont.woff') format('woff'),
-         url('./fonts/delicious-italic-webfont.ttf') format('truetype'),
-         url('./fonts/delicious-italic-webfont.svg#DeliciousItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'DeliciousRoman';
-    src: url('./fonts/delicious-roman-webfont.eot');
-    src: url('./fonts/delicious-roman-webfont.eot?#iefix') format('embedded-opentype'),
-         url('./fonts/delicious-roman-webfont.woff') format('woff'),
-         url('./fonts/delicious-roman-webfont.ttf') format('truetype'),
-         url('./fonts/delicious-roman-webfont.svg#DeliciousRoman') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'DeliciousSmallCapsRegular';
-    src: url('./fonts/delicious-smallcaps-webfont.eot');
-    src: url('./fonts/delicious-smallcaps-webfont.eot?#iefix') format('embedded-opentype'),
-         url('./fonts/delicious-smallcaps-webfont.woff') format('woff'),
-         url('./fonts/delicious-smallcaps-webfont.ttf') format('truetype'),
-         url('./fonts/delicious-smallcaps-webfont.svg#DeliciousSmallCapsRegular') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-