From 8fd321e6b8c895518e0198ecdba3d23ce434f8ab Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Thu, 6 Nov 2014 22:44:44 +0100 Subject: [PATCH] Moved location of font css file to get path working correctly in prod env. --- app/assets/stylesheets/application.css | 2 +- app/assets/stylesheets/fira-sans.css | 44 ++++++++++++++++++++++ app/assets/stylesheets/fonts/fira-sans.css | 44 ---------------------- 3 files changed, 45 insertions(+), 45 deletions(-) create mode 100755 app/assets/stylesheets/fira-sans.css delete mode 100755 app/assets/stylesheets/fonts/fira-sans.css diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 61d98b198..817288946 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -11,7 +11,7 @@ *= require ./bootstrap-tokenfield.css *= require ./noty_theme_twitter.css *= require ./sew.css - *= require ./fonts/fira-sans.css + *= require ./fira-sans.css *= require ./zammad.css.scss * *= require_tree ./custom/ diff --git a/app/assets/stylesheets/fira-sans.css b/app/assets/stylesheets/fira-sans.css new file mode 100755 index 000000000..f623074c3 --- /dev/null +++ b/app/assets/stylesheets/fira-sans.css @@ -0,0 +1,44 @@ +/* Generated by Font Squirrel (http://www.fontsquirrel.com) on July 15, 2014 */ + + + +@font-face { + font-family: 'Fira Sans'; + src: url('fonts/firasans-regular-webfont.eot'); + src: url('fonts/firasans-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/firasans-regular-webfont.woff') format('woff'), + url('fonts/firasans-regular-webfont.ttf') format('truetype'), + url('fonts/firasans-regular-webfont.svg#fira_sansregular') format('svg'); + font-weight: normal; + font-style: normal; + +} + + + + +@font-face { + font-family: 'Fira Sans'; + src: url('fonts/firasans-bold-webfont.eot'); + src: url('fonts/firasans-bold-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/firasans-bold-webfont.woff') format('woff'), + url('fonts/firasans-bold-webfont.ttf') format('truetype'), + url('fonts/firasans-bold-webfont.svg#fira_sansbold') format('svg'); + font-weight: bold; + font-style: normal; + +} + + + + +@font-face { + font-family: 'Fira Sans'; + src: url('fonts/firasans-light-webfont.eot'); + src: url('fonts/firasans-light-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/firasans-light-webfont.woff') format('woff'), + url('fonts/firasans-light-webfont.ttf') format('truetype'), + url('fonts/firasans-light-webfont.svg#fira_sanslight') format('svg'); + font-weight: 200; + font-style: normal; +} \ No newline at end of file diff --git a/app/assets/stylesheets/fonts/fira-sans.css b/app/assets/stylesheets/fonts/fira-sans.css deleted file mode 100755 index 5c68b4e07..000000000 --- a/app/assets/stylesheets/fonts/fira-sans.css +++ /dev/null @@ -1,44 +0,0 @@ -/* Generated by Font Squirrel (http://www.fontsquirrel.com) on July 15, 2014 */ - - - -@font-face { - font-family: 'Fira Sans'; - src: url('firasans-regular-webfont.eot'); - src: url('firasans-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('firasans-regular-webfont.woff') format('woff'), - url('firasans-regular-webfont.ttf') format('truetype'), - url('firasans-regular-webfont.svg#fira_sansregular') format('svg'); - font-weight: normal; - font-style: normal; - -} - - - - -@font-face { - font-family: 'Fira Sans'; - src: url('firasans-bold-webfont.eot'); - src: url('firasans-bold-webfont.eot?#iefix') format('embedded-opentype'), - url('firasans-bold-webfont.woff') format('woff'), - url('firasans-bold-webfont.ttf') format('truetype'), - url('firasans-bold-webfont.svg#fira_sansbold') format('svg'); - font-weight: bold; - font-style: normal; - -} - - - - -@font-face { - font-family: 'Fira Sans'; - src: url('firasans-light-webfont.eot'); - src: url('firasans-light-webfont.eot?#iefix') format('embedded-opentype'), - url('firasans-light-webfont.woff') format('woff'), - url('firasans-light-webfont.ttf') format('truetype'), - url('firasans-light-webfont.svg#fira_sanslight') format('svg'); - font-weight: 200; - font-style: normal; -} \ No newline at end of file