Skip to content
This repository has been archived by the owner on Aug 9, 2024. It is now read-only.

Commit

Permalink
Update webfont linking
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndrwM
AndrwM committed Jun 11, 2020
1 parent e6bf77b commit 19f09a6
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 29 deletions.
46 changes: 23 additions & 23 deletions lib/sage-frontend/stylesheets/system/core/_fonts.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,143 +8,143 @@
font-style: normal;
font-weight: 100;
font-display: swap;
src: local("Inter-Thin"), asset-url("#{$sage-body-font-path}/Inter-Thin.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-Thin.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-Thin"), url("#{$sage-body-font-path}/Inter-Thin.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-Thin.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: italic;
font-weight: 100;
font-display: swap;
src: local("Inter-ThinItalic"), asset-url("#{$sage-body-font-path}/Inter-ThinItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-ThinItalic.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-ThinItalic"), url("#{$sage-body-font-path}/Inter-ThinItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-ThinItalic.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: normal;
font-weight: 200;
font-display: swap;
src: local("Inter-ExtraLight"), asset-url("#{$sage-body-font-path}/Inter-ExtraLight.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-ExtraLight.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-ExtraLight"), url("#{$sage-body-font-path}/Inter-ExtraLight.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-ExtraLight.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: italic;
font-weight: 200;
font-display: swap;
src: local("Inter-ExtraLightItalic"), asset-url("#{$sage-body-font-path}/Inter-ExtraLightItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-ExtraLightItalic.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-ExtraLightItalic"), url("#{$sage-body-font-path}/Inter-ExtraLightItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-ExtraLightItalic.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: normal;
font-weight: 300;
font-display: swap;
src: local("Inter-Light"), asset-url("#{$sage-body-font-path}/Inter-Light.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-Light.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-Light"), url("#{$sage-body-font-path}/Inter-Light.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-Light.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: italic;
font-weight: 300;
font-display: swap;
src: local("Inter-LightItalic"), asset-url("#{$sage-body-font-path}/Inter-LightItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-LightItalic.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-LightItalic"), url("#{$sage-body-font-path}/Inter-LightItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-LightItalic.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: normal;
font-weight: 400;
font-display: swap;
src: local("Inter-Regular"), asset-url("#{$sage-body-font-path}/Inter-Regular.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-Regular.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-Regular"), url("#{$sage-body-font-path}/Inter-Regular.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-Regular.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: italic;
font-weight: 400;
font-display: swap;
src: local("Inter-Italic"), asset-url("#{$sage-body-font-path}/Inter-Italic.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-Italic.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-Italic"), url("#{$sage-body-font-path}/Inter-Italic.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-Italic.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: normal;
font-weight: 500;
font-display: swap;
src: local("Inter-Medium"), asset-url("#{$sage-body-font-path}/Inter-Medium.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-Medium.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-Medium"), url("#{$sage-body-font-path}/Inter-Medium.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-Medium.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: italic;
font-weight: 500;
font-display: swap;
src: local("Inter-MediumItalic"), asset-url("#{$sage-body-font-path}/Inter-MediumItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-MediumItalic.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-MediumItalic"), url("#{$sage-body-font-path}/Inter-MediumItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-MediumItalic.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: normal;
font-weight: 600;
font-display: swap;
src: local("Inter-SemiBold"), asset-url("#{$sage-body-font-path}/Inter-SemiBold.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-SemiBold.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-SemiBold"), url("#{$sage-body-font-path}/Inter-SemiBold.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-SemiBold.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: italic;
font-weight: 600;
font-display: swap;
src: local("Inter-SemiBoldItalic"), asset-url("#{$sage-body-font-path}/Inter-SemiBoldItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-SemiBoldItalic.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-SemiBoldItalic"), url("#{$sage-body-font-path}/Inter-SemiBoldItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-SemiBoldItalic.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: normal;
font-weight: 700;
font-display: swap;
src: local("Inter-Bold"), asset-url("#{$sage-body-font-path}/Inter-Bold.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-Bold.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-Bold"), url("#{$sage-body-font-path}/Inter-Bold.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-Bold.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: italic;
font-weight: 700;
font-display: swap;
src: local("Inter-BoldItalic"), asset-url("#{$sage-body-font-path}/Inter-BoldItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-BoldItalic.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-BoldItalic"), url("#{$sage-body-font-path}/Inter-BoldItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-BoldItalic.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: normal;
font-weight: 800;
font-display: swap;
src: local("Inter-ExtraBold"), asset-url("#{$sage-body-font-path}/Inter-ExtraBold.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-ExtraBold.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-ExtraBold"), url("#{$sage-body-font-path}/Inter-ExtraBold.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-ExtraBold.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: italic;
font-weight: 800;
font-display: swap;
src: local("Inter-ExtraBoldItalic"), asset-url("#{$sage-body-font-path}/Inter-ExtraBoldItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-ExtraBoldItalic.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-ExtraBoldItalic"), url("#{$sage-body-font-path}/Inter-ExtraBoldItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-ExtraBoldItalic.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: normal;
font-weight: 900;
font-display: swap;
src: local("Inter-Black"), asset-url("#{$sage-body-font-path}/Inter-Black.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-Black.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-Black"), url("#{$sage-body-font-path}/Inter-Black.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-Black.woff?v=#{$sage-body-font-version}") format("woff");
}

@font-face {
font-family: "Inter";
font-style: italic;
font-weight: 900;
font-display: swap;
src: local("Inter-BlackItalic"), asset-url("#{$sage-body-font-path}/Inter-BlackItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), asset-url("#{$sage-body-font-path}/Inter-BlackItalic.woff?v=#{$sage-body-font-version}") format("woff");
src: local("Inter-BlackItalic"), url("#{$sage-body-font-path}/Inter-BlackItalic.woff2?v=#{$sage-body-font-version}") format("woff2"), url("#{$sage-body-font-path}/Inter-BlackItalic.woff?v=#{$sage-body-font-version}") format("woff");
}

/* ==================================================
Expand All @@ -163,7 +163,7 @@ Usage:
font-style: normal;
font-named-instance: "Regular";
font-display: swap;
src: asset-url("#{$sage-body-font-path}/Inter-roman.var.woff2?v=#{$sage-body-font-version}") format("woff2");
src: url("#{$sage-body-font-path}/Inter-roman.var.woff2?v=#{$sage-body-font-version}") format("woff2");
}

@font-face {
Expand All @@ -172,7 +172,7 @@ Usage:
font-style: italic;
font-named-instance: "Italic";
font-display: swap;
src: asset-url("#{$sage-body-font-path}/Inter-italic.var.woff2?v=#{$sage-body-font-version}") format("woff2");
src: url("#{$sage-body-font-path}/Inter-italic.var.woff2?v=#{$sage-body-font-version}") format("woff2");
}

/* Legacy naming compatibility */
Expand All @@ -182,7 +182,7 @@ Usage:
font-style: normal;
font-named-instance: "Regular";
font-display: swap;
src: asset-url("#{$sage-body-font-path}/Inter-roman.var.woff2?v=#{$sage-body-font-version}") format("woff2");
src: url("#{$sage-body-font-path}/Inter-roman.var.woff2?v=#{$sage-body-font-version}") format("woff2");
}

@font-face {
Expand All @@ -191,7 +191,7 @@ Usage:
font-style: italic;
font-named-instance: "Italic";
font-display: swap;
src: asset-url("#{$sage-body-font-path}/Inter-italic.var.woff2?v=#{$sage-body-font-version}") format("woff2");
src: url("#{$sage-body-font-path}/Inter-italic.var.woff2?v=#{$sage-body-font-version}") format("woff2");
}


Expand All @@ -214,5 +214,5 @@ explicitly, e.g.
font-weight: 100 900;
font-style: oblique 0deg 10deg;
font-display: swap;
src: asset-url("#{$sage-body-font-path}/Inter.var.woff2?v=#{$sage-body-font-version}") format("woff2");
src: url("#{$sage-body-font-path}/Inter.var.woff2?v=#{$sage-body-font-version}") format("woff2");
}
11 changes: 5 additions & 6 deletions lib/sage-frontend/stylesheets/system/core/_icons.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ $sage-icon-li-margin-right: 0.4em !default;

@font-face {
font-family: "Sage";
src: asset-url("#{$sage-icon-font-path}/Sage.eot");
src: asset-url("#{$sage-icon-font-path}/Sage.eot") format("embedded-opentype"),
asset-url("#{$sage-icon-font-path}/Sage.woff2") format("woff2"),
asset-url("#{$sage-icon-font-path}/Sage.woff") format("woff"),
asset-url("#{$sage-icon-font-path}/Sage.ttf") format("truetype"),
asset-url("#{$sage-icon-font-path}/Sage.svg") format("svg");
src: url("#{$sage-icon-font-path}/Sage.eot");
src: url("#{$sage-icon-font-path}/Sage.eot") format("embedded-opentype"),
url("#{$sage-icon-font-path}/Sage.woff") format("woff"),
url("#{$sage-icon-font-path}/Sage.ttf") format("truetype"),
url("#{$sage-icon-font-path}/Sage.svg") format("svg");
font-weight: normal;
font-style: normal;
}
Expand Down

0 comments on commit 19f09a6

Please sign in to comment.