diff --git a/.DS_Store b/.DS_Store index cd3a2cf..09c736d 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/css/.DS_Store b/css/.DS_Store new file mode 100644 index 0000000..dbd07c1 Binary files /dev/null and b/css/.DS_Store differ diff --git a/css/base/base.css b/css/base/base.css index 9b0b2c2..3fcd47b 100755 --- a/css/base/base.css +++ b/css/base/base.css @@ -27,8 +27,8 @@ html { body { margin: 0; color: var(--color-text-neutral-medium); - /*background-color: var(--color--gray-100);*/ - background-color: #ece8e3; + background-color: var(--color--gray-100); + /* background-color: #ece8e3; */ /*background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='50' height='84' viewBox='0 0 50 84'%3e %3cpath opacity='0.05' fill='%230e6ba6' d='M25,61.7C25,68.5,19.4,74,12.5,74S0,68.5,0,61.7c0-5.7,3.9-9.6,7.4-12.9c2.3-2.2,4.5-4.4,5.1-6.8c0.7,2.4,2.8,4.6,5.1,6.8C21.1,52.2,25,56,25,61.7z M42.6,6.8c-2.3-2.2-4.5-4.4-5.1-6.8c-0.7,2.4-2.9,4.6-5.1,6.8C28.9,10.2,25,14,25,19.7C25,26.5,30.6,32,37.5,32S50,26.5,50,19.7C50,14,46.1,10.2,42.6,6.8z'/%3e%3c/svg%3e");*/ /*background-position: top left; [> LTR <]*/ } diff --git a/css/base/fonts.css b/css/base/fonts.css index 9bcfb2b..7312151 100755 --- a/css/base/fonts.css +++ b/css/base/fonts.css @@ -1,123 +1,88 @@ -/* - * DO NOT EDIT THIS FILE. - * See the following change record for more information, - * https://www.drupal.org/node/3084859 - * @preserve - */ - -/** - * @file - * Base Fonts. - */ - +/* alegreya-regular - latin */ @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-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-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-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-family: 'Source Sans 3'; - src: url('../../fonts/SourceSans3-Bold.woff2') format('woff2'), - url('../../fonts/SourceSans3-Bold.woff') format('woff'); - font-weight: bold; - font-style: normal; - font-display: swap; + 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-family: 'Source Sans 3'; - src: url('../../fonts/SourceSans3-Regular.woff2') format('woff2'), - url('../../fonts/SourceSans3-Regular.woff') format('woff'); - font-weight: normal; - font-style: normal; - font-display: swap; + 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-family: 'Source Sans 3'; - src: url('../../fonts/SourceSans3-Italic.woff2') format('woff2'), - url('../../fonts/SourceSans3-Italic.woff') format('woff'); - font-weight: normal; - font-style: italic; - font-display: swap; + 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+ */ } - -/* - *old stuff - */ - +/* alegreya-600 - latin */ @font-face { - font-family: metropolis; - src: url("../../fonts/metropolis/Metropolis-Regular.woff2") format("woff2"); - font-weight: normal; + 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-display: swap; + 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-family: metropolis; - src: url("../../fonts/metropolis/Metropolis-Bold.woff2") format("woff2"); - font-weight: 700; + 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-display: swap; + 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-family: metropolis; - src: url("../../fonts/metropolis/Metropolis-SemiBold.woff2") format("woff2"); - font-weight: 600; - font-style: normal; - font-display: swap; + 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+ */ } - -/* lora-regular - latin */ - +/* barlow-500 - 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-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-display: swap; + font-weight: 500; + src: url("../../fonts/barlow-v13-latin-500.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } - -/* lora-italic - latin */ - +/* barlow-500italic - 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-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-display: swap; + font-weight: 500; + src: url("../../fonts/barlow-v13-latin-500italic.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } - -/* lora-700 - latin */ - +/* barlow-600 - 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-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-display: swap; + 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/css/base/variables.css b/css/base/variables.css index dae2638..7ee16bf 100755 --- a/css/base/variables.css +++ b/css/base/variables.css @@ -29,6 +29,7 @@ /* Layout helpers. */ /*--max-width: 84.375rem;*/ --max-width: 89rem; + --max-width: 89rem; --max-bg-color: 98.125rem; /* Width to which the background color extends to. */ --sp: 1.125rem; /*--content-left: 5.625rem;*/ diff --git a/css/components/text-content.css b/css/components/text-content.css index 7b7832e..d579edc 100755 --- a/css/components/text-content.css +++ b/css/components/text-content.css @@ -13,7 +13,7 @@ .text-content, .cke_editable { color: var(--color-text-neutral-medium); - font-family: var(--font-serif); + font-family: var(--font-sans); line-height: var(--sp1-5); /* @@ -148,6 +148,7 @@ .cke_editable { font-size: 1.125rem; line-height: var(--sp2); + line-height: 1.7; } }