Skip to content

Commit

Permalink
use optimized font (#23)
Browse files Browse the repository at this point in the history 
* update font src to optimized

* increment

* remove ttf support

* update file names to match assets

* revert condensed because there is no optimized version
  • Loading branch information
@PeteSchuster @365erik
PeteSchuster authored and 365erik committed Sep 12, 2019
1 parent 5c7f6a2 commit eae3338
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 41 deletions.
68 changes: 28 additions & 40 deletions assets/sass/_xfinity_standard_fonts.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ $xfinity-standard-condensed: 'XfinityStandardCondensed', #{$xfinity-standard-fa
@mixin xfinity-standard-thin {
@font-face {
font-family: 'XfinityStandard';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Thin.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Thin.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Thin.ttf') format('truetype');
src: url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-thin.woff2') format('woff2'),
url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-thin.woff') format('woff');
font-weight: 100;
font-style: normal;
}
Expand All @@ -25,9 +24,8 @@ $xfinity-standard-condensed: 'XfinityStandardCondensed', #{$xfinity-standard-fa
@mixin xfinity-standard-thin-italic {
@font-face {
font-family: 'XfinityStandard';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-ThinItalic.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-ThinItalic.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-ThinItalic.ttf') format('truetype');
src: url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-thinitalic.woff2') format('woff2'),
url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-thinitalic.woff') format('woff');
font-weight: 100;
font-style: italic;
}
Expand All @@ -36,9 +34,8 @@ $xfinity-standard-condensed: 'XfinityStandardCondensed', #{$xfinity-standard-fa
@mixin xfinity-standard-extra-light {
@font-face {
font-family: 'XfinityStandard';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-ExtraLight.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-ExtraLight.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-ExtraLight.ttf') format('truetype');
src: url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-exlt.woff2') format('woff2'),
url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-exlt.woff') format('woff');
font-weight: 200;
font-style: normal;
}
Expand All @@ -47,9 +44,8 @@ $xfinity-standard-condensed: 'XfinityStandardCondensed', #{$xfinity-standard-fa
@mixin xfinity-standard-extra-light-italic {
@font-face {
font-family: 'XfinityStandard';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-ExtraLightItalic.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-ExtraLightItalic.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-ExtraLightItalic.ttf') format('truetype');
src: url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-exltitalic.woff2') format('woff2'),
url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-exltitalic.woff') format('woff');
font-weight: 200;
font-style: italic;
}
Expand All @@ -58,9 +54,8 @@ $xfinity-standard-condensed: 'XfinityStandardCondensed', #{$xfinity-standard-fa
@mixin xfinity-standard-light {
@font-face {
font-family: 'XfinityStandard';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Light.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Light.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Light.ttf') format('truetype');
src: url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-light.woff2') format('woff2'),
url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-light.woff') format('woff');
font-weight: 300;
font-style: normal;
}
Expand All @@ -69,9 +64,8 @@ $xfinity-standard-condensed: 'XfinityStandardCondensed', #{$xfinity-standard-fa
@mixin xfinity-standard-light-italic {
@font-face {
font-family: 'XfinityStandard';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-LightItalic.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-LightItalic.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-LightItalic.ttf') format('truetype');
src: url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-lightitalic.woff2') format('woff2'),
url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-lightitalic.woff') format('woff');
font-weight: 300;
font-style: italic;
}
Expand All @@ -80,9 +74,8 @@ $xfinity-standard-condensed: 'XfinityStandardCondensed', #{$xfinity-standard-fa
@mixin xfinity-standard-regular {
@font-face {
font-family: 'XfinityStandard';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Regular.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Regular.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Regular.ttf') format('truetype');
src: url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-regular.woff2') format('woff2'),
url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-regular.woff') format('woff');
font-weight: 400;
font-style: normal;
}
Expand All @@ -91,9 +84,8 @@ $xfinity-standard-condensed: 'XfinityStandardCondensed', #{$xfinity-standard-fa
@mixin xfinity-standard-regular-italic {
@font-face {
font-family: 'XfinityStandard';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-RegularItalic.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-RegularItalic.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-RegularItalic.ttf') format('truetype');
src: url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-regularitalic.woff2') format('woff2'),
url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-regularitalic.woff') format('woff');
font-weight: 400;
font-style: italic;
}
Expand All @@ -102,9 +94,8 @@ $xfinity-standard-condensed: 'XfinityStandardCondensed', #{$xfinity-standard-fa
@mixin xfinity-standard-medium {
@font-face {
font-family: 'XfinityStandard';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Medium.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Medium.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Medium.ttf') format('truetype');
src: url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-medium.woff2') format('woff2'),
url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-medium.woff') format('woff');
font-weight: 500;
font-style: normal;
}
Expand All @@ -113,9 +104,8 @@ $xfinity-standard-condensed: 'XfinityStandardCondensed', #{$xfinity-standard-fa
@mixin xfinity-standard-medium-italic {
@font-face {
font-family: 'XfinityStandard';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-MediumItalic.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-MediumItalic.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-MediumItalic.ttf') format('truetype');
src: url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-mediumitalic.woff2') format('woff2'),
url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-mediumitalic.woff') format('woff');
font-weight: 500;
font-style: italic;
}
Expand All @@ -124,9 +114,8 @@ $xfinity-standard-condensed: 'XfinityStandardCondensed', #{$xfinity-standard-fa
@mixin xfinity-standard-bold {
@font-face {
font-family: 'XfinityStandard';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Bold.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Bold.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-Bold.ttf') format('truetype');
src: url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-bold.woff2') format('woff2'),
url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-bold.woff') format('woff');
font-weight: 700;
font-style: normal;
}
Expand All @@ -135,31 +124,30 @@ $xfinity-standard-condensed: 'XfinityStandardCondensed', #{$xfinity-standard-fa
@mixin xfinity-standard-bold-italic {
@font-face {
font-family: 'XfinityStandard';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-BoldItalic.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-BoldItalic.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard/XfinityStandard-BoldItalic.ttf') format('truetype');
src: url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-bolditalic.woff2') format('woff2'),
url('https://static.cimcontent.net/common-web-assets/fonts/xfinity-standard-optimized/xfinitystandard-bolditalic.woff') format('woff');
font-weight: 700;
font-style: italic;
}
}

// deprecated
@mixin xfinity-standard-condensed-medium {
@font-face {
font-family: 'XfinityStandardCondensed';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard_Condensed/XfinityStandardCondensed-Medium.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard_Condensed/XfinityStandardCondensed-Medium.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard_Condensed/XfinityStandardCondensed-Medium.ttf') format('truetype');
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard_Condensed/XfinityStandardCondensed-Medium.woff') format('woff');
font-weight: 500;
font-style: normal;
}
}

// deprecated
@mixin xfinity-standard-condensed-bold {
@font-face {
font-family: 'XfinityStandardCondensed';
src: url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard_Condensed/XfinityStandardCondensed-Bold.woff2') format('woff2'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard_Condensed/XfinityStandardCondensed-Bold.woff') format('woff'),
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard_Condensed/XfinityStandardCondensed-Bold.ttf') format('truetype');
url('https://static.cimcontent.net/fonts/latest/Xfinity_Standard_Condensed/XfinityStandardCondensed-Bold.woff') format('woff');
font-weight: 700;
font-style: normal;
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "all-digital",
"version": "3.0.1",
"version": "3.1.0",
"description": "CSS for All Digital",
"repository": {
"type": "git",
Expand Down

0 comments on commit eae3338

Please sign in to comment.