From 1696dad7d0e0dcb78f0629a08e9bed1e148169c2 Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Fri, 22 Nov 2013 12:31:05 +0100 Subject: [PATCH] Fix the font references --- .../{stylesheets => }/fonts/SourceSansPro-Bold.ttf | Bin .../fonts/SourceSansPro-BoldItalic.ttf | Bin .../fonts/SourceSansPro-Italic.ttf | Bin .../{stylesheets => }/fonts/SourceSansPro-Light.ttf | Bin .../fonts/SourceSansPro-LightItalic.ttf | Bin .../fonts/SourceSansPro-Regular.ttf | Bin .../fonts/SourceSansPro-Semibold.ttf | Bin .../fonts/SourceSansPro-SemiboldItalic.ttf | Bin ...{source-sans-pro.css => source-sans-pro.css.erb} | 10 +++++----- .../{bootstrap.css => bootstrap.css.erb} | 4 ++-- 10 files changed, 7 insertions(+), 7 deletions(-) rename app/assets/{stylesheets => }/fonts/SourceSansPro-Bold.ttf (100%) rename app/assets/{stylesheets => }/fonts/SourceSansPro-BoldItalic.ttf (100%) rename app/assets/{stylesheets => }/fonts/SourceSansPro-Italic.ttf (100%) rename app/assets/{stylesheets => }/fonts/SourceSansPro-Light.ttf (100%) rename app/assets/{stylesheets => }/fonts/SourceSansPro-LightItalic.ttf (100%) rename app/assets/{stylesheets => }/fonts/SourceSansPro-Regular.ttf (100%) rename app/assets/{stylesheets => }/fonts/SourceSansPro-Semibold.ttf (100%) rename app/assets/{stylesheets => }/fonts/SourceSansPro-SemiboldItalic.ttf (100%) rename app/assets/stylesheets/{source-sans-pro.css => source-sans-pro.css.erb} (66%) rename vendor/assets/stylesheets/{bootstrap.css => bootstrap.css.erb} (99%) diff --git a/app/assets/stylesheets/fonts/SourceSansPro-Bold.ttf b/app/assets/fonts/SourceSansPro-Bold.ttf similarity index 100% rename from app/assets/stylesheets/fonts/SourceSansPro-Bold.ttf rename to app/assets/fonts/SourceSansPro-Bold.ttf diff --git a/app/assets/stylesheets/fonts/SourceSansPro-BoldItalic.ttf b/app/assets/fonts/SourceSansPro-BoldItalic.ttf similarity index 100% rename from app/assets/stylesheets/fonts/SourceSansPro-BoldItalic.ttf rename to app/assets/fonts/SourceSansPro-BoldItalic.ttf diff --git a/app/assets/stylesheets/fonts/SourceSansPro-Italic.ttf b/app/assets/fonts/SourceSansPro-Italic.ttf similarity index 100% rename from app/assets/stylesheets/fonts/SourceSansPro-Italic.ttf rename to app/assets/fonts/SourceSansPro-Italic.ttf diff --git a/app/assets/stylesheets/fonts/SourceSansPro-Light.ttf b/app/assets/fonts/SourceSansPro-Light.ttf similarity index 100% rename from app/assets/stylesheets/fonts/SourceSansPro-Light.ttf rename to app/assets/fonts/SourceSansPro-Light.ttf diff --git a/app/assets/stylesheets/fonts/SourceSansPro-LightItalic.ttf b/app/assets/fonts/SourceSansPro-LightItalic.ttf similarity index 100% rename from app/assets/stylesheets/fonts/SourceSansPro-LightItalic.ttf rename to app/assets/fonts/SourceSansPro-LightItalic.ttf diff --git a/app/assets/stylesheets/fonts/SourceSansPro-Regular.ttf b/app/assets/fonts/SourceSansPro-Regular.ttf similarity index 100% rename from app/assets/stylesheets/fonts/SourceSansPro-Regular.ttf rename to app/assets/fonts/SourceSansPro-Regular.ttf diff --git a/app/assets/stylesheets/fonts/SourceSansPro-Semibold.ttf b/app/assets/fonts/SourceSansPro-Semibold.ttf similarity index 100% rename from app/assets/stylesheets/fonts/SourceSansPro-Semibold.ttf rename to app/assets/fonts/SourceSansPro-Semibold.ttf diff --git a/app/assets/stylesheets/fonts/SourceSansPro-SemiboldItalic.ttf b/app/assets/fonts/SourceSansPro-SemiboldItalic.ttf similarity index 100% rename from app/assets/stylesheets/fonts/SourceSansPro-SemiboldItalic.ttf rename to app/assets/fonts/SourceSansPro-SemiboldItalic.ttf diff --git a/app/assets/stylesheets/source-sans-pro.css b/app/assets/stylesheets/source-sans-pro.css.erb similarity index 66% rename from app/assets/stylesheets/source-sans-pro.css rename to app/assets/stylesheets/source-sans-pro.css.erb index 3493529..2769802 100644 --- a/app/assets/stylesheets/source-sans-pro.css +++ b/app/assets/stylesheets/source-sans-pro.css.erb @@ -2,29 +2,29 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 300; - src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url("fonts/SourceSansPro-Light.ttf") format('truetype'); + src: local('Source Sans Pro Light'), local('SourceSansPro-Light'), url("<%= asset_path("SourceSansPro-Light.ttf") %>") format('truetype'); } @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 400; - src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url("fonts/SourceSansPro-Regular.ttf") format('truetype'); + src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url("<%= asset_path("SourceSansPro-Regular.ttf") %>") format('truetype'); } @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 600; - src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url("fonts/SourceSansPro-Semibold.ttf") format('truetype'); + src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('<%= asset_path("SourceSansPro-Semibold.ttf") %>') format('truetype'); } @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 700; - src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url("fonts/SourceSansPro-Bold.ttf") format('truetype'); + src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url('<%= asset_path("SourceSansPro-Bold.ttf") %>') format('truetype'); } @font-face { font-family: 'Source Sans Pro'; font-style: italic; font-weight: 400; - src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url("fonts/SourceSansPro-Italic.ttf") format('truetype'); + src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('<%= asset_path("SourceSansPro-Italic.ttf") %>') format('truetype'); } diff --git a/vendor/assets/stylesheets/bootstrap.css b/vendor/assets/stylesheets/bootstrap.css.erb similarity index 99% rename from vendor/assets/stylesheets/bootstrap.css rename to vendor/assets/stylesheets/bootstrap.css.erb index 2ff967c..812a487 100644 --- a/vendor/assets/stylesheets/bootstrap.css +++ b/vendor/assets/stylesheets/bootstrap.css.erb @@ -2385,8 +2385,8 @@ input[type="button"].btn-block { @font-face { font-family: 'Glyphicons Halflings'; - src: url('/assets/glyphicons-halflings-regular.eot'); - src: url('/assets/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('/assets/glyphicons-halflings-regular.woff') format('woff'), url('/assets/glyphicons-halflings-regular.ttf') format('truetype'), url('/assets/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg'); + src: url('<%= asset_path('glyphicons-halflings-regular.eot') %>'); + src: url('<%= asset_path('glyphicons-halflings-regular.eot?#iefix') %>') format('embedded-opentype'), url('<%= asset_path('glyphicons-halflings-regular.woff') %>') format('woff'), url('<%= asset_path('glyphicons-halflings-regular.ttf') %>') format('truetype'), url('<%= asset_path('glyphicons-halflings-regular.svg#glyphicons-halflingsregular') %>') format('svg'); } .glyphicon {