diff --git a/css/base/fonts.css b/css/base/fonts.css index 7312151..ec583cf 100755 --- a/css/base/fonts.css +++ b/css/base/fonts.css @@ -1,88 +1,129 @@ -/* alegreya-regular - latin */ +/* alegreya-regular - latin_latin-ext */ @font-face { font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ font-family: "Alegreya"; font-style: normal; font-weight: 400; - src: url("../../fonts/alegreya-v41-latin-regular.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ + src: url("../../fonts/alegreya-v41-latin_latin-ext-regular.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* alegreya-italic - latin */ +/* alegreya-italic - latin_latin-ext */ @font-face { font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ font-family: "Alegreya"; font-style: italic; font-weight: 400; - src: url("../../fonts/alegreya-v41-latin-italic.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ + src: url("../../fonts/alegreya-v41-latin_latin-ext-italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* alegreya-500 - latin */ +/* alegreya-500 - latin_latin-ext */ @font-face { font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ font-family: "Alegreya"; font-style: normal; font-weight: 500; - src: url("../../fonts/alegreya-v41-latin-500.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ + src: url("../../fonts/alegreya-v41-latin_latin-ext-500.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* alegreya-500italic - latin */ +/* alegreya-500italic - latin_latin-ext */ @font-face { font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ font-family: "Alegreya"; font-style: italic; font-weight: 500; - src: url("../../fonts/alegreya-v41-latin-500italic.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ + src: url("../../fonts/alegreya-v41-latin_latin-ext-500italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* alegreya-600 - latin */ +/* alegreya-600 - latin_latin-ext */ @font-face { font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ font-family: "Alegreya"; font-style: normal; font-weight: 600; - src: url("../../fonts/alegreya-v41-latin-600.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ + src: url("../../fonts/alegreya-v41-latin_latin-ext-600.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* barlow-regular - latin */ +/* alegreya-600italic - latin_latin-ext */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Alegreya"; + font-style: italic; + font-weight: 600; + src: url("../../fonts/alegreya-v41-latin_latin-ext-600italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* alegreya-700 - latin_latin-ext */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Alegreya"; + font-style: normal; + font-weight: 700; + src: url("../../fonts/alegreya-v41-latin_latin-ext-700.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* barlow-regular - latin_latin-ext */ @font-face { font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ font-family: "Barlow"; font-style: normal; font-weight: 400; - src: url("../../fonts/barlow-v13-latin-regular.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ + src: url("../../fonts/barlow-v13-latin_latin-ext-regular.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* barlow-italic - latin */ +/* barlow-italic - latin_latin-ext */ @font-face { font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ font-family: "Barlow"; font-style: italic; font-weight: 400; - src: url("../../fonts/barlow-v13-latin-italic.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ + src: url("../../fonts/barlow-v13-latin_latin-ext-italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* barlow-500 - latin */ +/* barlow-500 - latin_latin-ext */ @font-face { font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ font-family: "Barlow"; font-style: normal; font-weight: 500; - src: url("../../fonts/barlow-v13-latin-500.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ + src: url("../../fonts/barlow-v13-latin_latin-ext-500.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* barlow-500italic - latin */ +/* barlow-500italic - latin_latin-ext */ @font-face { font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ font-family: "Barlow"; font-style: italic; font-weight: 500; - src: url("../../fonts/barlow-v13-latin-500italic.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ + src: url("../../fonts/barlow-v13-latin_latin-ext-500italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* barlow-600 - latin */ +/* barlow-600 - latin_latin-ext */ @font-face { font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ font-family: "Barlow"; font-style: normal; font-weight: 600; - src: url("../../fonts/barlow-v13-latin-600.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ + src: url("../../fonts/barlow-v13-latin_latin-ext-600.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* barlow-600italic - latin */ +/* barlow-600italic - latin_latin-ext */ @font-face { font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ font-family: "Barlow"; font-style: italic; font-weight: 600; - src: url("../../fonts/barlow-v13-latin-600italic.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ + src: url("../../fonts/barlow-v13-latin_latin-ext-600italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* barlow-700 - latin_latin-ext */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Barlow"; + font-style: normal; + font-weight: 700; + src: url("../../fonts/barlow-v13-latin_latin-ext-700.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* barlow-700italic - latin_latin-ext */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Barlow"; + font-style: italic; + font-weight: 700; + src: url("../../fonts/barlow-v13-latin_latin-ext-700italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } diff --git a/css/base/fonts.css.bk b/css/base/fonts.css.bk new file mode 100755 index 0000000..7312151 --- /dev/null +++ b/css/base/fonts.css.bk @@ -0,0 +1,88 @@ +/* alegreya-regular - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Alegreya"; + font-style: normal; + font-weight: 400; + src: url("../../fonts/alegreya-v41-latin-regular.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* alegreya-italic - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Alegreya"; + font-style: italic; + font-weight: 400; + src: url("../../fonts/alegreya-v41-latin-italic.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* alegreya-500 - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Alegreya"; + font-style: normal; + font-weight: 500; + src: url("../../fonts/alegreya-v41-latin-500.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* alegreya-500italic - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Alegreya"; + font-style: italic; + font-weight: 500; + src: url("../../fonts/alegreya-v41-latin-500italic.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* alegreya-600 - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Alegreya"; + font-style: normal; + font-weight: 600; + src: url("../../fonts/alegreya-v41-latin-600.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* barlow-regular - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Barlow"; + font-style: normal; + font-weight: 400; + src: url("../../fonts/barlow-v13-latin-regular.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* barlow-italic - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Barlow"; + font-style: italic; + font-weight: 400; + src: url("../../fonts/barlow-v13-latin-italic.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* barlow-500 - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Barlow"; + font-style: normal; + font-weight: 500; + src: url("../../fonts/barlow-v13-latin-500.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* barlow-500italic - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Barlow"; + font-style: italic; + font-weight: 500; + src: url("../../fonts/barlow-v13-latin-500italic.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* barlow-600 - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Barlow"; + font-style: normal; + font-weight: 600; + src: url("../../fonts/barlow-v13-latin-600.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* barlow-600italic - latin */ +@font-face { + font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ + font-family: "Barlow"; + font-style: italic; + font-weight: 600; + src: url("../../fonts/barlow-v13-latin-600italic.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} diff --git a/fonts/alegreya-v41-latin_latin-ext-500.woff2 b/fonts/alegreya-v41-latin_latin-ext-500.woff2 new file mode 100644 index 0000000..d93695f Binary files /dev/null and b/fonts/alegreya-v41-latin_latin-ext-500.woff2 differ diff --git a/fonts/alegreya-v41-latin_latin-ext-500italic.woff2 b/fonts/alegreya-v41-latin_latin-ext-500italic.woff2 new file mode 100644 index 0000000..1018ada Binary files /dev/null and b/fonts/alegreya-v41-latin_latin-ext-500italic.woff2 differ diff --git a/fonts/alegreya-v41-latin_latin-ext-600.woff2 b/fonts/alegreya-v41-latin_latin-ext-600.woff2 new file mode 100644 index 0000000..760534c Binary files /dev/null and b/fonts/alegreya-v41-latin_latin-ext-600.woff2 differ diff --git a/fonts/alegreya-v41-latin_latin-ext-600italic.woff2 b/fonts/alegreya-v41-latin_latin-ext-600italic.woff2 new file mode 100644 index 0000000..0457af9 Binary files /dev/null and b/fonts/alegreya-v41-latin_latin-ext-600italic.woff2 differ diff --git a/fonts/alegreya-v41-latin_latin-ext-700.woff2 b/fonts/alegreya-v41-latin_latin-ext-700.woff2 new file mode 100644 index 0000000..c2bc425 Binary files /dev/null and b/fonts/alegreya-v41-latin_latin-ext-700.woff2 differ diff --git a/fonts/alegreya-v41-latin_latin-ext-italic.woff2 b/fonts/alegreya-v41-latin_latin-ext-italic.woff2 new file mode 100644 index 0000000..f8ad636 Binary files /dev/null and b/fonts/alegreya-v41-latin_latin-ext-italic.woff2 differ diff --git a/fonts/alegreya-v41-latin_latin-ext-regular.woff2 b/fonts/alegreya-v41-latin_latin-ext-regular.woff2 new file mode 100644 index 0000000..cfdcc9c Binary files /dev/null and b/fonts/alegreya-v41-latin_latin-ext-regular.woff2 differ diff --git a/fonts/barlow-v13-latin_latin-ext-500.woff2 b/fonts/barlow-v13-latin_latin-ext-500.woff2 new file mode 100644 index 0000000..3516cf3 Binary files /dev/null and b/fonts/barlow-v13-latin_latin-ext-500.woff2 differ diff --git a/fonts/barlow-v13-latin_latin-ext-500italic.woff2 b/fonts/barlow-v13-latin_latin-ext-500italic.woff2 new file mode 100644 index 0000000..a0d8669 Binary files /dev/null and b/fonts/barlow-v13-latin_latin-ext-500italic.woff2 differ diff --git a/fonts/barlow-v13-latin_latin-ext-600.woff2 b/fonts/barlow-v13-latin_latin-ext-600.woff2 new file mode 100644 index 0000000..4dae121 Binary files /dev/null and b/fonts/barlow-v13-latin_latin-ext-600.woff2 differ diff --git a/fonts/barlow-v13-latin_latin-ext-600italic.woff2 b/fonts/barlow-v13-latin_latin-ext-600italic.woff2 new file mode 100644 index 0000000..c6795d0 Binary files /dev/null and b/fonts/barlow-v13-latin_latin-ext-600italic.woff2 differ diff --git a/fonts/barlow-v13-latin_latin-ext-700.woff2 b/fonts/barlow-v13-latin_latin-ext-700.woff2 new file mode 100644 index 0000000..6aa6ca8 Binary files /dev/null and b/fonts/barlow-v13-latin_latin-ext-700.woff2 differ diff --git a/fonts/barlow-v13-latin_latin-ext-700italic.woff2 b/fonts/barlow-v13-latin_latin-ext-700italic.woff2 new file mode 100644 index 0000000..f0456a3 Binary files /dev/null and b/fonts/barlow-v13-latin_latin-ext-700italic.woff2 differ diff --git a/fonts/barlow-v13-latin_latin-ext-italic.woff2 b/fonts/barlow-v13-latin_latin-ext-italic.woff2 new file mode 100644 index 0000000..f7a8855 Binary files /dev/null and b/fonts/barlow-v13-latin_latin-ext-italic.woff2 differ diff --git a/fonts/barlow-v13-latin_latin-ext-regular.woff2 b/fonts/barlow-v13-latin_latin-ext-regular.woff2 new file mode 100644 index 0000000..1181ff1 Binary files /dev/null and b/fonts/barlow-v13-latin_latin-ext-regular.woff2 differ diff --git a/fonts/alegreya-v41-latin-500.woff2 b/fonts/old/alegreya-v41-latin-500.woff2 similarity index 100% rename from fonts/alegreya-v41-latin-500.woff2 rename to fonts/old/alegreya-v41-latin-500.woff2 diff --git a/fonts/alegreya-v41-latin-500italic.woff2 b/fonts/old/alegreya-v41-latin-500italic.woff2 similarity index 100% rename from fonts/alegreya-v41-latin-500italic.woff2 rename to fonts/old/alegreya-v41-latin-500italic.woff2 diff --git a/fonts/alegreya-v41-latin-600.woff2 b/fonts/old/alegreya-v41-latin-600.woff2 similarity index 100% rename from fonts/alegreya-v41-latin-600.woff2 rename to fonts/old/alegreya-v41-latin-600.woff2 diff --git a/fonts/alegreya-v41-latin-italic.woff2 b/fonts/old/alegreya-v41-latin-italic.woff2 similarity index 100% rename from fonts/alegreya-v41-latin-italic.woff2 rename to fonts/old/alegreya-v41-latin-italic.woff2 diff --git a/fonts/alegreya-v41-latin-regular.woff2 b/fonts/old/alegreya-v41-latin-regular.woff2 similarity index 100% rename from fonts/alegreya-v41-latin-regular.woff2 rename to fonts/old/alegreya-v41-latin-regular.woff2 diff --git a/fonts/barlow-v13-latin-500.woff2 b/fonts/old/barlow-v13-latin-500.woff2 similarity index 100% rename from fonts/barlow-v13-latin-500.woff2 rename to fonts/old/barlow-v13-latin-500.woff2 diff --git a/fonts/barlow-v13-latin-500italic.woff2 b/fonts/old/barlow-v13-latin-500italic.woff2 similarity index 100% rename from fonts/barlow-v13-latin-500italic.woff2 rename to fonts/old/barlow-v13-latin-500italic.woff2 diff --git a/fonts/barlow-v13-latin-600.woff2 b/fonts/old/barlow-v13-latin-600.woff2 similarity index 100% rename from fonts/barlow-v13-latin-600.woff2 rename to fonts/old/barlow-v13-latin-600.woff2 diff --git a/fonts/barlow-v13-latin-600italic.woff2 b/fonts/old/barlow-v13-latin-600italic.woff2 similarity index 100% rename from fonts/barlow-v13-latin-600italic.woff2 rename to fonts/old/barlow-v13-latin-600italic.woff2 diff --git a/fonts/barlow-v13-latin-italic.woff2 b/fonts/old/barlow-v13-latin-italic.woff2 similarity index 100% rename from fonts/barlow-v13-latin-italic.woff2 rename to fonts/old/barlow-v13-latin-italic.woff2 diff --git a/fonts/barlow-v13-latin-regular.woff2 b/fonts/old/barlow-v13-latin-regular.woff2 similarity index 100% rename from fonts/barlow-v13-latin-regular.woff2 rename to fonts/old/barlow-v13-latin-regular.woff2 diff --git a/templates/includes/preload.twig b/templates/includes/preload.twig old mode 100755 new mode 100644 index c69d5f3..3577d99 --- a/templates/includes/preload.twig +++ b/templates/includes/preload.twig @@ -8,18 +8,18 @@ */ #} - - - - - - - diff --git a/templates/includes/preload.twig.bk b/templates/includes/preload.twig.bk new file mode 100755 index 0000000..c69d5f3 --- /dev/null +++ b/templates/includes/preload.twig.bk @@ -0,0 +1,25 @@ +{# +/** +* @file +* Preload the non-bold & non-italic fonts for the headings and the body copy. +* +* Available variables: +* - oliveskspaces_path: Returns the path to the Oliveskspaces theme. +*/ +#} + + + + + + + + +