From 5fd7c3e520b1cf411cfc41a1e17ca1217e860c6a Mon Sep 17 00:00:00 2001 From: Joshua Seigler Date: Wed, 27 Jul 2016 02:05:29 -0400 Subject: [PATCH] now I understand relative paths in SCSS better --- _config.yml | 1 + _sass/_typography.scss | 4 ++-- assets/fonts/worksans/{font.scss => font.css} | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename assets/fonts/worksans/{font.scss => font.css} (93%) diff --git a/_config.yml b/_config.yml index d94d78c..d2da067 100644 --- a/_config.yml +++ b/_config.yml @@ -15,6 +15,7 @@ exclude_from_localizations: ["assets"] sass: style: compressed cache: false + relative_assets: true gems: - jekyll-paginate diff --git a/_sass/_typography.scss b/_sass/_typography.scss index a31e2c3..1cf1029 100644 --- a/_sass/_typography.scss +++ b/_sass/_typography.scss @@ -1,7 +1,7 @@ -@import "../assets/fonts/worksans/font"; +@import "../fonts/worksans/font.css"; // imports are relative to /assets/css/style.scss body { - font-family: 'work_sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: 'Work Sans', Helvetica, Arial, sans-serif; } p { diff --git a/assets/fonts/worksans/font.scss b/assets/fonts/worksans/font.css similarity index 93% rename from assets/fonts/worksans/font.scss rename to assets/fonts/worksans/font.css index 2377949..5b912e5 100644 --- a/assets/fonts/worksans/font.scss +++ b/assets/fonts/worksans/font.css @@ -1,7 +1,7 @@ /* Generated by Font Squirrel (https://www.fontsquirrel.com) on July 27, 2016 */ @font-face { - font-family: 'work_sans'; + font-family: 'Work Sans'; src: url('worksans-bold-webfont.eot'); src: url('worksans-bold-webfont.eot?#iefix') format('embedded-opentype'), url('worksans-bold-webfont.woff2') format('woff2'), @@ -12,7 +12,7 @@ } @font-face { - font-family: 'work_sans'; + font-family: 'Work Sans'; src: url('worksans-regular-webfont.eot'); src: url('worksans-regular-webfont.eot?#iefix') format('embedded-opentype'), url('worksans-regular-webfont.woff2') format('woff2'), @@ -21,4 +21,3 @@ font-weight: normal; font-style: normal; } -