Update webfont, avoid issues with path resolving

This commit is contained in:
Björn Fromme
2020-02-04 16:45:30 +01:00
parent a77b4087b9
commit 3a600d4e01
38 changed files with 63 additions and 35 deletions
@@ -1,4 +1,59 @@
@include font-face('Lato', '../fonts/lato-v14-latin-300', 300);
@include font-face('Lato', '../fonts/lato-v14-latin-regular', 400);
@include font-face('Lato', '../fonts/lato-v14-latin-700', 700);
@include font-face('Lato', '../fonts/lato-v14-latin-900', 900);
/* lato-300 - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 300;
font-display: swap;
src: url('../fonts/lato-v16-latin-300.eot'); /* IE9 Compat Modes */
src: local('Lato Light'), local('Lato-Light'),
url('../fonts/lato-v16-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/lato-v16-latin-300.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/lato-v16-latin-300.woff') format('woff'), /* Modern Browsers */
url('../fonts/lato-v16-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/lato-v16-latin-300.svg#Lato') format('svg'); /* Legacy iOS */
}
/* lato-regular - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 400;
font-display: swap;
src: url('../fonts/lato-v16-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Lato Regular'), local('Lato-Regular'),
url('../fonts/lato-v16-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/lato-v16-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/lato-v16-latin-regular.woff') format('woff'), /* Modern Browsers */
url('../fonts/lato-v16-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/lato-v16-latin-regular.svg#Lato') format('svg'); /* Legacy iOS */
}
/* lato-700 - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 700;
font-display: swap;
src: url('../fonts/lato-v16-latin-700.eot'); /* IE9 Compat Modes */
src: local('Lato Bold'), local('Lato-Bold'),
url('../fonts/lato-v16-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/lato-v16-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/lato-v16-latin-700.woff') format('woff'), /* Modern Browsers */
url('../fonts/lato-v16-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/lato-v16-latin-700.svg#Lato') format('svg'); /* Legacy iOS */
}
/* lato-900 - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 900;
font-display: swap;
src: url('../fonts/lato-v16-latin-900.eot'); /* IE9 Compat Modes */
src: local('Lato Black'), local('Lato-Black'),
url('../fonts/lato-v16-latin-900.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/lato-v16-latin-900.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/lato-v16-latin-900.woff') format('woff'), /* Modern Browsers */
url('../fonts/lato-v16-latin-900.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/lato-v16-latin-900.svg#Lato') format('svg'); /* Legacy iOS */
}
@@ -78,34 +78,3 @@
opacity: 1;
}
}
@mixin font-face(
$font-family,
$file-path,
$weight: normal,
$style: normal,
$asset-pipeline: $asset-pipeline,
$file-formats: eot woff2 woff ttf svg) {
$user-deprecation-warnings-setting: $output-bourbon-deprecation-warnings;
$output-bourbon-deprecation-warnings: false !global;
$font-url-prefix: font-url-prefixer($asset-pipeline);
@font-face {
font-family: $font-family;
font-style: $style;
font-weight: $weight;
font-display: swap;
src: font-source-declaration(
$font-family,
$file-path,
$asset-pipeline,
$file-formats,
$font-url-prefix
);
}
$output-bourbon-deprecation-warnings: $user-deprecation-warnings-setting !global;
}
@@ -5,6 +5,7 @@
@import "remix/colors";
// vendor styles
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "mixins";
@@ -7,6 +7,7 @@
@import "remix/colors_boarderweek";
// vendor styles
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "mixins";
@@ -7,6 +7,7 @@
@import "remix/colors_snowzone";
// vendor styles
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "mixins";
@@ -7,6 +7,7 @@
@import "remix/colors_unichamp";
// vendor styles
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "mixins";