From 104365fc402e97b34d6a50df30e0b58e926403f9 Mon Sep 17 00:00:00 2001 From: Qeole Date: Fri, 3 Jun 2016 23:45:13 +0200 Subject: [PATCH] =?UTF-8?q?fira-sans.*:=20local=20font=20=E2=80=9CFira=20S?= =?UTF-8?q?ans=20Regular=20*=E2=80=9D=20=E2=86=92=20=E2=80=9CFira=20Sans?= =?UTF-8?q?=20*=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit At least under Linux (Ubuntu), the regular and regular italic system fonts are recognized as “Fira Sans” and “Fira Sans Italic”, while the stylesheets for CSS pre-processors call them as “Fira Sans Regular” and “Fira Sans Regular Italic”, respectively. This commit fixes the names by removing the “Regular” part. Note that I do not know how fonts are treated on other systems (it might be worth checking that this commit does not breaks things under Windows?) --- fira-sans.less | 4 ++-- fira-sans.sass | 4 ++-- fira-sans.scss | 4 ++-- fira-sans.styl | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fira-sans.less b/fira-sans.less index d27c3ce11..987cd6186 100644 --- a/fira-sans.less +++ b/fira-sans.less @@ -25,7 +25,7 @@ @font-face{ font-family: 'Fira Sans'; src: url('eot/FiraSans-Regular.eot'); - src: local('Fira Sans Regular'), + src: local('Fira Sans'), url('eot/FiraSans-Regular.eot') format('embedded-opentype'), url('woff/FiraSans-Regular.woff') format('woff'), url('ttf/FiraSans-Regular.ttf') format('truetype'); @@ -36,7 +36,7 @@ @font-face{ font-family: 'Fira Sans'; src: url('eot/FiraSans-RegularItalic.eot'); - src: local('Fira Sans Regular Italic'), + src: local('Fira Sans Italic'), url('eot/FiraSans-RegularItalic.eot') format('embedded-opentype'), url('woff/FiraSans-RegularItalic.woff') format('woff'), url('ttf/FiraSans-RegularItalic.ttf') format('truetype'); diff --git a/fira-sans.sass b/fira-sans.sass index 26aa56ba2..b61abd01a 100644 --- a/fira-sans.sass +++ b/fira-sans.sass @@ -17,14 +17,14 @@ @font-face font-family: 'Fira Sans' src: url("eot/FiraSans-Regular.eot") - src: local("Fira Sans Regular"), url("eot/FiraSans-Regular.eot") format("embedded-opentype"), url("woff/FiraSans-Regular.woff") format("woff"), url("ttf/FiraSans-Regular.ttf") format("truetype") + src: local("Fira Sans"), url("eot/FiraSans-Regular.eot") format("embedded-opentype"), url("woff/FiraSans-Regular.woff") format("woff"), url("ttf/FiraSans-Regular.ttf") format("truetype") font-weight: 400 font-style: normal @font-face font-family: 'Fira Sans' src: url("eot/FiraSans-RegularItalic.eot") - src: local("Fira Sans Regular Italic"), url("eot/FiraSans-RegularItalic.eot") format("embedded-opentype"), url("woff/FiraSans-RegularItalic.woff") format("woff"), url("ttf/FiraSans-RegularItalic.ttf") format("truetype") + src: local("Fira Sans Italic"), url("eot/FiraSans-RegularItalic.eot") format("embedded-opentype"), url("woff/FiraSans-RegularItalic.woff") format("woff"), url("ttf/FiraSans-RegularItalic.ttf") format("truetype") font-weight: 400 font-style: italic diff --git a/fira-sans.scss b/fira-sans.scss index 593253e96..dc2d81b28 100644 --- a/fira-sans.scss +++ b/fira-sans.scss @@ -25,7 +25,7 @@ @font-face{ font-family: 'Fira Sans'; src: url("eot/FiraSans-Regular.eot"); - src: local("Fira Sans Regular"), + src: local("Fira Sans"), url("eot/FiraSans-Regular.eot") format("embedded-opentype"), url("woff/FiraSans-Regular.woff") format("woff"), url("ttf/FiraSans-Regular.ttf") format("truetype"); @@ -36,7 +36,7 @@ @font-face{ font-family: 'Fira Sans'; src: url("eot/FiraSans-RegularItalic.eot"); - src: local("Fira Sans Regular Italic"), + src: local("Fira Sans Italic"), url("eot/FiraSans-RegularItalic.eot") format("embedded-opentype"), url("woff/FiraSans-RegularItalic.woff") format("woff"), url("ttf/FiraSans-RegularItalic.ttf") format("truetype"); diff --git a/fira-sans.styl b/fira-sans.styl index 2ed5ed6d8..edf25cc82 100644 --- a/fira-sans.styl +++ b/fira-sans.styl @@ -17,14 +17,14 @@ @font-face font-family: 'Fira Sans' src: url("eot/FiraSans-Regular.eot") - src: local("Fira Sans Regular"), url("eot/FiraSans-Regular.eot") format("embedded-opentype"), url("woff/FiraSans-Regular.woff") format("woff"), url("ttf/FiraSans-Regular.ttf") format("truetype") + src: local("Fira Sans"), url("eot/FiraSans-Regular.eot") format("embedded-opentype"), url("woff/FiraSans-Regular.woff") format("woff"), url("ttf/FiraSans-Regular.ttf") format("truetype") font-weight: 400 font-style: normal @font-face font-family: 'Fira Sans' src: url("eot/FiraSans-RegularItalic.eot") - src: local("Fira Sans Regular Italic"), url("eot/FiraSans-RegularItalic.eot") format("embedded-opentype"), url("woff/FiraSans-RegularItalic.woff") format("woff"), url("ttf/FiraSans-RegularItalic.ttf") format("truetype") + src: local("Fira Sans Italic"), url("eot/FiraSans-RegularItalic.eot") format("embedded-opentype"), url("woff/FiraSans-RegularItalic.woff") format("woff"), url("ttf/FiraSans-RegularItalic.ttf") format("truetype") font-weight: 400 font-style: italic