Merge branch 'master' of https://git.library.upei.ca/rdrew/olivesnews

css/base/fonts.css

@@ -1,46 +1,31 @@
-/*
- * DO NOT EDIT THIS FILE.
- * See the following change record for more information,
- * https://www.drupal.org/node/3084859
- * @preserve
- */
-
-/**
- * @file
- * Base Fonts.
- */
 
 @font-face {
-    font-family: 'Libre Bodoni';
-    src: url('../../fonts/LibreBodoni-Bold.woff2') format('woff2'),
-        url('../../fonts/LibreBodoni-Bold.woff') format('woff');
-    font-weight: bold;
-    font-style: normal;
-    font-display: swap;
+  font-family: "Manufacturing Consent";
+  src: url("../fonts/Manufacturing_Consent/ManufacturingConsent-Regular.woff2") format("woff2");
+  font-weight: 400 700;
+  font-style: normal;
+  font-display: swap;
 }
-
 @font-face {
-    font-family: 'Libre Bodoni';
-    src: url('../../fonts/LibreBodoni-Italic.woff2') format('woff2'),
-        url('../../fonts/LibreBodoni-Italic.woff') format('woff');
-    font-weight: normal;
-    font-style: italic;
-    font-display: swap;
+  font-family: "Libre Baskerville";
+  src: url("../fonts/Libre_Baskerville/LibreBaskerville-VariableFont_wght.woff2") format("woff2");
+  font-weight: 400 700;
+  font-style: normal;
+  font-display: swap;
 }
 
 @font-face {
-    font-family: 'Libre Bodoni';
-    src: url('../../fonts/LibreBodoni-Regular.woff2') format('woff2'),
-        url('../../fonts/LibreBodoni-Regular.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
-    font-display: swap;
+  font-family: "Libre Baskerville";
+  src: url("../fonts/Libre_Baskerville/LibreBaskerville-Italic-VariableFont_wght.woff2") format("woff2");
+  font-weight: 400 700;
+  font-style: italic;
+  font-display: swap;
 }
 
 @font-face {
     font-family: 'Source Sans 3';
-    src: url('../../fonts/SourceSans3-Bold.woff2') format('woff2'),
-        url('../../fonts/SourceSans3-Bold.woff') format('woff');
+    src: url('../../fonts/SourceSans3/SourceSans3-Bold.woff2') format('woff2'),
+        url('../../fonts/SourceSans3/SourceSans3-Bold.woff') format('woff');
     font-weight: bold;
     font-style: normal;
     font-display: swap;
@@ -48,8 +33,8 @@
 
 @font-face {
     font-family: 'Source Sans 3';
-    src: url('../../fonts/SourceSans3-Regular.woff2') format('woff2'),
-        url('../../fonts/SourceSans3-Regular.woff') format('woff');
+    src: url('../../fonts/SourceSans3/SourceSans3-Regular.woff2') format('woff2'),
+        url('../../fonts/SourceSans3/SourceSans3-Regular.woff') format('woff');
     font-weight: normal;
     font-style: normal;
     font-display: swap;
@@ -57,67 +42,10 @@
 
 @font-face {
     font-family: 'Source Sans 3';
-    src: url('../../fonts/SourceSans3-Italic.woff2') format('woff2'),
-        url('../../fonts/SourceSans3-Italic.woff') format('woff');
+    src: url('../../fonts/SourceSans3/SourceSans3-Italic.woff2') format('woff2'),
+        url('../../fonts/SourceSans3/SourceSans3-Italic.woff') format('woff');
     font-weight: normal;
     font-style: italic;
     font-display: swap;
 }
 
-/*
- *old stuff
- */
-
-@font-face {
-  font-family: metropolis;
-  src: url("../../fonts/metropolis/Metropolis-Regular.woff2") format("woff2");
-  font-weight: normal;
-  font-style: normal;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: metropolis;
-  src: url("../../fonts/metropolis/Metropolis-Bold.woff2") format("woff2");
-  font-weight: 700;
-  font-style: normal;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: metropolis;
-  src: url("../../fonts/metropolis/Metropolis-SemiBold.woff2") format("woff2");
-  font-weight: 600;
-  font-style: normal;
-  font-display: swap;
-}
-
-/* lora-regular - latin */
-
-@font-face {
-  font-family: Lora;
-  src: local("Lora Regular"), local("Lora-Regular"), url("../../fonts/lora/lora-v14-latin-regular.woff2") format("woff2");
-  font-weight: 400;
-  font-style: normal;
-  font-display: swap;
-}
-
-/* lora-italic - latin */
-
-@font-face {
-  font-family: Lora;
-  src: local("Lora Italic"), local("Lora-Italic"), url("../../fonts/lora/lora-v14-latin-italic.woff2") format("woff2");
-  font-weight: 400;
-  font-style: italic;
-  font-display: swap;
-}
-
-/* lora-700 - latin */
-
-@font-face {
-  font-family: Lora;
-  src: local("Lora Bold"), local("Lora-Bold"), url("../../fonts/lora/lora-v14-latin-700.woff2") format("woff2");
-  font-weight: 700;
-  font-style: normal;
-  font-display: swap;
-}

css/base/variables.css

@@ -13,9 +13,10 @@
 
 :root {
   /*--font-sans: "metropolis", sans-serif;*/
-  --font-sans: "metropolis", sans-serif;
+  --font-sans: "Source Sans 3", sans-serif;
   /*--font-serif: "Lora", "georgia", serif;*/
-  --font-serif: "Lora", "georgia", serif;
+  --font-serif: "Libre Baskerville", "georgia", serif;
+  --font-logo: "Manufacturing Consent", "georgia", serif;
 
   /* Typography helpers. */
   --font-size-base: 1rem;

fonts/Libre_Baskerville/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2012 The Libre Baskerville Project Authors (https://github.com/impallari/Libre-Baskerville) with Reserved Font Name Libre Baskerville.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

fonts/Libre_Baskerville/README.txt

@@ -0,0 +1,71 @@
+Libre Baskerville Variable Font
+===============================
+
+This download contains Libre Baskerville as both variable fonts and static fonts.
+
+Libre Baskerville is a variable font with this axis:
+  wght
+
+This means all the styles are contained in these files:
+  Libre_Baskerville/LibreBaskerville-VariableFont_wght.ttf
+  Libre_Baskerville/LibreBaskerville-Italic-VariableFont_wght.ttf
+
+If your app fully supports variable fonts, you can now pick intermediate styles
+that aren’t available as static fonts. Not all apps support variable fonts, and
+in those cases you can use the static font files for Libre Baskerville:
+  Libre_Baskerville/static/LibreBaskerville-Regular.ttf
+  Libre_Baskerville/static/LibreBaskerville-Medium.ttf
+  Libre_Baskerville/static/LibreBaskerville-SemiBold.ttf
+  Libre_Baskerville/static/LibreBaskerville-Bold.ttf
+  Libre_Baskerville/static/LibreBaskerville-Italic.ttf
+  Libre_Baskerville/static/LibreBaskerville-MediumItalic.ttf
+  Libre_Baskerville/static/LibreBaskerville-SemiBoldItalic.ttf
+  Libre_Baskerville/static/LibreBaskerville-BoldItalic.ttf
+
+Get started
+-----------
+
+1. Install the font files you want to use
+
+2. Use your app's font picker to view the font family and all the
+available styles
+
+Learn more about variable fonts
+-------------------------------
+
+  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
+  https://variablefonts.typenetwork.com
+  https://medium.com/variable-fonts
+
+In desktop apps
+
+  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
+  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
+
+Online
+
+  https://developers.google.com/fonts/docs/getting_started
+  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
+  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
+
+Installing fonts
+
+  MacOS: https://support.apple.com/en-us/HT201749
+  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
+  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
+
+Android Apps
+
+  https://developers.google.com/fonts/docs/android
+  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
+
+License
+-------
+Please read the full license text (OFL.txt) to understand the permissions,
+restrictions and requirements for usage, redistribution, and modification.
+
+You can use them in your products & projects – print or digital,
+commercial or otherwise.
+
+This isn't legal advice, please consider consulting a lawyer and see the full
+license for all details.

fonts/Manufacturing_Consent/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2019 The Manufacturing Consent Project Authors (https://github.com/googlefonts/manufacturing-consent-font)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

templates/includes/preload.twig

@@ -1,20 +1,4 @@
-{#
-/**
- * @file
- * Preload the non-bold & non-italic fonts for the headings and the body copy.
- *
- * Available variables:
- * - olivesnews_path: Returns the path to the Olivesnews theme.
- */
-#}
-
-<link rel="preload" href="{{ olivesnews_path }}/fonts/metropolis/Metropolis-Regular.woff2" as="font" type="font/woff2" crossorigin>
-<link rel="preload" href="{{ olivesnews_path }}/fonts/metropolis/Metropolis-SemiBold.woff2" as="font" type="font/woff2" crossorigin>
-<link rel="preload" href="{{ olivesnews_path }}/fonts/metropolis/Metropolis-Bold.woff2" as="font" type="font/woff2" crossorigin>
-<link rel="preload" href="{{ olivesnews_path }}/fonts/lora/lora-v14-latin-regular.woff2" as="font" type="font/woff2" crossorigin>
-{#<link rel="preload" href="{{ olivesnews_path }}/fonts/LibreBodoni-Bold.woff2" as="font" type="font/woff2" crossorigin>#}
-{#<link rel="preload" href="{{ olivesnews_path }}/fonts/LibreBodoni-Italic.woff2" as="font" type="font/woff2" crossorigin>#}
-{#<link rel="preload" href="{{ olivesnews_path }}/fonts/LibreBodoni-Regular.woff2" as="font" type="font/woff2" crossorigin>#}
-{#<link rel="preload" href="{{ olivesnews_path }}/fonts/SourceSans3-Bold.woff2" as="font" type="font/woff2" crossorigin>#}
-{#<link rel="preload" href="{{ olivesnews_path }}/fonts/SourceSans3-Regular.woff2" as="font" type="font/woff2" crossorigin>#}
-{#<link rel="preload" href="{{ olivesnews_path }}/fonts/SourceSans3-Italic.woff2" as="font" type="font/woff2" crossorigin>#}
+<link rel="preload" href="{{ olivesnews_path }}/fonts/Libre_Baskerville/LibreBaskerville-Italic-VariableFont_wght.woff2" as="font" type="font/woff2" crossorigin>
+<link rel="preload" href="{{ olivesnews_path }}/fonts/Libre_Baskerville/LibreBaskerville-VariableFont_wght.woff2" as="font" type="font/woff2" crossorigin>
+<link rel="preload" href="{{ olivesnews_path }}/fonts/SourceSans3/SourceSans3-Regular.woff2" as="font" type="font/woff2" crossorigin>
+<link rel="preload" href="{{ olivesnews_path }}/fonts/Manufacturing_Consent/ManufacturingConsent-Regular.woff2" as="font" type="font/woff2" crossorigin>