@foeewni/web-core 3.0.0-alpha.1 → 3.0.0-alpha.10

package/src/components/tools/jaunty.js

@@ -0,0 +1,246 @@
+/* @docs
+
+# Scripts:Jaunty
+
+Jauntifies a text header with the data-jaunt-factor attribute.
+
+Usage:
+```
+<h1 data-jaunt-factor="1">Jaunty Title</h1>
+
+<h2 data-jaunt-factor="2">Very Jaunty Title</h2>
+```
+
+Based on James South Codepen https://codepen.io/jrsouth/pen/ZEmeoJz with ideas from
+https://www.bennadel.com/blog/4310-detecting-rendered-line-breaks-in-a-text-node-in-javascript.htm
+*/
+
+(() => {
+  // Config
+  const ROTATION_MAX_DEGREES = 3; // Degrees. "Normal" is around 2.5
+  const BACKGROUND_EXTENSION = 0.5; // rem. Normal is around 1
+  const CORNER_JIGGLE_MAX = 1; // rem. Normal is around .2
+  let oneRemInPx = 0;
+  let extension = 0;
+
+  // Helpers
+  const generateRandomHex = (length) => {
+    let result = '';
+    const characters = 'ABCDEF1234567890';
+    const charactersLength = characters.length;
+    for (let i = 0; i < length; i++) {
+      result += characters.charAt(Math.floor(Math.random() * charactersLength));
+    }
+    return result;
+  };
+
+  const drawPolygon = (context, points) => {
+    context.beginPath();
+    context.moveTo(points[0].x, points[0].y);
+    for (let i = 1; i < points.length; i++) {
+      context.lineTo(points[i].x, points[i].y);
+    }
+    context.lineTo(points[0].x, points[0].y);
+    context.fill();
+    context.stroke();
+  };
+
+  // const drawPoint = (context, x, y) => {
+  //   if (!context.fillStyle) {
+  //     context.fillStyle = "#61bdaa";
+  //   }
+  //   context.fillRect(x - 1.5, y - 1.5, 3, 3);
+  // };
+
+  const jauntTarget = (target) => {
+    if (!target.firstChild || target.firstChild.nodeType !== Node.TEXT_NODE) {
+      return;
+    }
+
+    // Create a unique ID to link this element with the canvas background
+    if (!target.dataset.backgroundCanvasId) {
+      target.dataset.backgroundCanvasId = generateRandomHex(12);
+    }
+
+    // Clean up any existing jauntiness
+    const existingCanvas = document.getElementById(
+      target.dataset.backgroundCanvasId
+    );
+    if (existingCanvas) {
+      existingCanvas.remove();
+    }
+    const previousTransform = getComputedStyle(target).transform;
+    target.style.transition = 'none';
+    target.style.transform = null;
+
+    // Set up the parameters
+    const jauntFactor = parseFloat(target.dataset.jauntFactor);
+    extension = BACKGROUND_EXTENSION * oneRemInPx * jauntFactor;
+    // jauntSeed is stored on page so remains constant when resizing or hovering
+    const jauntSeed = target.dataset.jauntSeed ? target.dataset.jauntSeed : generateRandomHex(4 * 8);
+    target.dataset.jauntSeed = jauntSeed;
+
+    // Figure out the bounding boxes
+
+    // Collapse whitespace
+    target.textContent = target.textContent.replace(/\s+/g, ' ').trim();
+
+    // Get the individual lines as rendered on screen
+    const { textContent } = target.firstChild;
+    const range = document.createRange();
+    range.setStart(target.firstChild, 0);
+    range.setEnd(target.firstChild, textContent.length);
+
+    // Get the bounding boxes
+    const targetBox = target.getBoundingClientRect();
+    const parentBox = target.offsetParent ? target.offsetParent.getBoundingClientRect() : targetBox;
+    const outerBox = range.getBoundingClientRect();
+    const boxes = Array.from(range.getClientRects());
+
+    // Insert the new 2D canvas element
+    const canvas = document.createElement('canvas');
+    canvas.id = target.dataset.backgroundCanvasId;
+    target.parentNode.insertBefore(canvas, target);
+    canvas.style.position = 'absolute';
+    canvas.style.zIndex = -1;
+    canvas.style.top = `${(targetBox.top - parentBox.top) - 2 * extension}px`;
+    canvas.style.left = `${(targetBox.left - parentBox.left) - 2 * extension}px`;
+    canvas.style.width = `${targetBox.width + 4 * extension}px`;
+    canvas.style.height = `${targetBox.height + 4 * extension}px`;
+    canvas.width = targetBox.width + 4 * extension;
+    canvas.height = targetBox.height + 4 * extension;
+    canvas.style.pointerEvents = 'none';
+
+    // Draw the background boxes
+    const context = canvas.getContext('2d');
+
+    // set the background color and remove and existing background
+    target.style.backgroundColor = null;
+    target.style.borderColor = null;
+    context.fillStyle = getComputedStyle(target).backgroundColor;
+    if (!context.fillStyle) {
+      context.fillStyle = '#61bdaa';
+    }
+    context.strokeStyle = getComputedStyle(target).borderColor;
+    target.style.backgroundColor = 'transparent';
+    target.style.borderColor = 'transparent';
+
+    const leftShift = getComputedStyle(target).textAlign === 'center'
+      ? (targetBox.width - outerBox.width) / 2 - extension
+      : 0;
+    boxes.forEach((lineBox, i) => {
+      const points = [];
+
+      points.push({
+        // Top left
+        x: leftShift + lineBox.left - outerBox.left + 2 * extension,
+        y: lineBox.top - outerBox.top + 2 * extension,
+      });
+      points.push({
+        // Top right
+        x: points[0].x + lineBox.width + 2 * extension,
+        y: points[0].y,
+      });
+      points.push({
+        // Bottom right
+        x: points[0].x + lineBox.width + 2 * extension,
+        y: points[0].y + lineBox.height + 2 * extension,
+      });
+      points.push({
+        // Bottom left
+        x: points[0].x,
+        y: points[0].y + lineBox.height + 2 * extension,
+      });
+
+      // context.fillRect(
+      //   lineBox.left - outerBox.left + 2 * extension,
+      //   lineBox.top - outerBox.top + 2 * extension,
+      //   lineBox.width + 2 * extension,
+      //   lineBox.height + 2 * extension,
+      // );
+
+      // Jiggle them points around
+      const boxSeed = jauntSeed.substring(i) + jauntSeed.substring(0, i);
+      const seedLength = boxSeed.length;
+      const pointSeedLength = seedLength / points.length;
+      points.forEach((point, index) => {
+        const startPoint = index * pointSeedLength;
+        const endPointX = startPoint + (pointSeedLength / 2);
+        const endPointY = startPoint + pointSeedLength;
+        const middle = pointSeedLength / 2 + 1;
+        let xRandom = boxSeed.substring(startPoint, endPointX);
+        let yRandom = boxSeed.substring(endPointX, endPointY);
+        xRandom = Number(`0x${xRandom}`);
+        yRandom = Number(`0x${yRandom}`);
+        xRandom /= 10 ** middle;
+        yRandom /= 10 ** middle;
+        points[index] = {
+          x:
+            point.x
+            + (xRandom * 2 - 1)
+              * oneRemInPx
+              * CORNER_JIGGLE_MAX
+              * jauntFactor,
+          y:
+            point.y
+            + (yRandom * 2 - 1)
+              * oneRemInPx
+              * CORNER_JIGGLE_MAX
+              * jauntFactor,
+        };
+      });
+
+      // points.forEach((point) => {
+      //   drawPoint(context, point.x, point.y);
+      // });
+
+      drawPolygon(context, points);
+    });
+
+    target.style.transform = previousTransform;
+    target.style.transition = null;
+
+    // Add rotation
+    const middle = jauntSeed.length / 2 + 1;
+    let rotationSeed = jauntSeed.substring(1, middle);
+    rotationSeed = Number(`0x${jauntSeed}`);
+    rotationSeed /= 10 ** (`${rotationSeed}`).length;
+    const rotationFactor = ROTATION_MAX_DEGREES * jauntFactor
+      * (rotationSeed * 2 - 1); // -1 to  +1
+    target.style.transform = `rotate(${rotationFactor}deg)`;
+    canvas.style.transform = `rotate(${rotationFactor}deg)`;
+  };
+
+  // The main event
+  const createBackground = () => {
+    oneRemInPx = parseFloat(
+      getComputedStyle(document.documentElement).fontSize
+    );
+
+    const targets = document.querySelectorAll('[data-jaunt-factor]');
+
+    // Insert some jaunt
+    targets.forEach((target) => {
+      jauntTarget(target);
+      [
+        'mouseenter',
+        'mouseleave',
+        'focus',
+      ].forEach((action) => {
+        target.addEventListener(action, (e) => {
+          jauntTarget(e.target);
+        });
+      });
+    });
+  };
+
+  const init = () => {
+    createBackground();
+  };
+
+  // Go time
+  document.addEventListener('DOMContentLoaded', init);
+  document.addEventListener('load', init);
+  window.addEventListener('resize', createBackground);
+  window.runJaunt = init;
+})();

package/src/components/typography/blockquotes.scss

@@ -19,21 +19,18 @@ The Friends of the Earth blockquotes use the secondary font
 @import '../../utils/scss/loader';
 
 blockquote {
-  border-color: $gray-400;
-  border-style: double;
-  border-width: .2em 0;
-  padding: $spacer*1.5 0;
+  padding: $spacer * 1.5 0;
   width: 80%;
-  margin: $spacer*2 auto;
+  margin: ($spacer * 2) auto;
   float: none;
   clear: both;
 
   p {
     font-family: $font-family-serif;
-    font-weight: 700;
+    font-weight: normal;
     font-size: $blockquote-font-size;
     line-height: $blockquote-font-size * 1.35;
-    color: $foe-primary;
+    color: $foe-extradark;
 
     @include media-breakpoint-down(sm) {
       font-size: strip-units($blockquote-font-size) * $font-size-sm;
@@ -54,8 +51,6 @@ blockquote {
   }
 
   @include media-breakpoint-up(sm) {
-    width: calc(100% * 4 / 6);
-
     // NOTE: The width, margin-left, and margin-right values below are
     // over-ridden for sanity within CKEditor contexts.
     &.left {
@@ -63,6 +58,7 @@ blockquote {
       clear: left;
       margin-left: calc(-100% / 6);
       margin-right: 2em;
+      width: calc(100% * 4 / 6);
     }
 
     &.right {
@@ -70,29 +66,27 @@ blockquote {
       clear: right;
       margin-left: 2em;
       margin-right: calc(-100% / 6);
+      width: calc(100% * 4 / 6);
     }
   }
 
   cite,
   & + .citation {
-    font-family: $font-family-sans-serif;
-    font-size: 1rem;
-    line-height: 1.3rem;
-    font-weight: 400;
-    font-style: italic;
-    color: $gray-500;
+    width: 80%;
+    margin: auto;
+    font-family: $font-family-serif;
+    font-size: $blockquote-font-size;
+    line-height: $spacer * 2;
+    font-weight: bold;
+    color: $foe-extradark;
     display: block;
-    text-align: right;
-    margin-top: 1em;
-    padding-left: 10%;
-
-    &::before {
-      content: "\2014\00A0\00A0";
-      color: $foe-primary;
-    }
+    text-align: left;
+    margin-top: $spacer;
   }
 
   & + .citation {
-    margin-top: $spacer * -1;
+    margin-top: $spacer * -2.5;
+    margin-bottom: $spacer * 2;
+    text-align: center;
   }
 }

package/src/components/typography/fonts.scss

@@ -20,8 +20,8 @@ Our type system is comprised of two fonts:
 To use them on your CSS please import the webfonts through Google Fonts
 
 ```
-@import url('https://fonts.googleapis.com/css2?family=Libre+Baskerville:ital@0;1&family=Libre+Franklin:ital,wght@0,400;0,700;1,400;1,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Libre+Baskerville:ital@0;1&family=Libre+Franklin:ital,wght@0,400;0,700;0,900;1,400;1,700;1,900&display=swap');
 ```
 
 */
-@import url('https://fonts.googleapis.com/css2?family=Libre+Baskerville:ital@0;1&family=Libre+Franklin:ital,wght@0,400;0,700;1,400;1,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Libre+Baskerville:ital@0;1&family=Libre+Franklin:ital,wght@0,400;0,700;0,900;1,400;1,700;1,900&display=swap');

package/src/fonts.js

@@ -32,6 +32,7 @@ To use them on your CSS please import the webfonts through Google Fonts
 // Note, single line deep imports are needed here, for some reason fontawesome messes up
 // with normal imports and webpack ends up bundling the whole library (1.25mb!)
 import { library, dom } from '@fortawesome/fontawesome-svg-core';
+
 import { faEnvelope } from '@fortawesome/free-solid-svg-icons/faEnvelope';
 import { faSearch } from '@fortawesome/free-solid-svg-icons/faSearch';
 import { faTimes } from '@fortawesome/free-solid-svg-icons/faTimes';
@@ -40,19 +41,6 @@ import { faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons/faExt
 import { faArrowAltCircleUp } from '@fortawesome/free-solid-svg-icons/faArrowAltCircleUp';
 import { faShare } from '@fortawesome/free-solid-svg-icons/faShare';
 import { faLink } from '@fortawesome/free-solid-svg-icons/faLink';
-import { faTwitter } from '@fortawesome/free-brands-svg-icons/faTwitter';
-import { faFacebook } from '@fortawesome/free-brands-svg-icons/faFacebook';
-import { faFacebookF } from '@fortawesome/free-brands-svg-icons/faFacebookF';
-import { faPinterest } from '@fortawesome/free-brands-svg-icons/faPinterest';
-import { faLinkedin } from '@fortawesome/free-brands-svg-icons/faLinkedin';
-import { faInstagram } from '@fortawesome/free-brands-svg-icons/faInstagram';
-import { faYoutube } from '@fortawesome/free-brands-svg-icons/faYoutube';
-import { faTumblr } from '@fortawesome/free-brands-svg-icons/faTumblr';
-import { faWhatsapp } from '@fortawesome/free-brands-svg-icons/faWhatsapp';
-import { faFacebookMessenger } from '@fortawesome/free-brands-svg-icons/faFacebookMessenger';
-import { faTelegram } from '@fortawesome/free-brands-svg-icons/faTelegram';
-import { faTelegramPlane } from '@fortawesome/free-brands-svg-icons/faTelegramPlane';
-import { faTiktok } from '@fortawesome/free-brands-svg-icons/faTiktok';
 import { faChevronDown } from '@fortawesome/free-solid-svg-icons/faChevronDown';
 import { faChevronUp } from '@fortawesome/free-solid-svg-icons/faChevronUp';
 import { faAngleDown } from '@fortawesome/free-solid-svg-icons/faAngleDown';
@@ -76,6 +64,23 @@ import { faSave } from '@fortawesome/free-solid-svg-icons/faSave';
 import { faSignInAlt } from '@fortawesome/free-solid-svg-icons/faSignInAlt';
 import { faTrashAlt } from '@fortawesome/free-solid-svg-icons/faTrashAlt';
 
+import { faTwitter } from '@fortawesome/free-brands-svg-icons/faTwitter';
+import { faXTwitter } from '@fortawesome/free-brands-svg-icons/faXTwitter';
+import { faFacebook } from '@fortawesome/free-brands-svg-icons/faFacebook';
+import { faFacebookF } from '@fortawesome/free-brands-svg-icons/faFacebookF';
+import { faPinterest } from '@fortawesome/free-brands-svg-icons/faPinterest';
+import { faLinkedin } from '@fortawesome/free-brands-svg-icons/faLinkedin';
+import { faInstagram } from '@fortawesome/free-brands-svg-icons/faInstagram';
+import { faYoutube } from '@fortawesome/free-brands-svg-icons/faYoutube';
+import { faTumblr } from '@fortawesome/free-brands-svg-icons/faTumblr';
+import { faWhatsapp } from '@fortawesome/free-brands-svg-icons/faWhatsapp';
+import { faFacebookMessenger } from '@fortawesome/free-brands-svg-icons/faFacebookMessenger';
+import { faTelegram } from '@fortawesome/free-brands-svg-icons/faTelegram';
+import { faTelegramPlane } from '@fortawesome/free-brands-svg-icons/faTelegramPlane';
+import { faTiktok } from '@fortawesome/free-brands-svg-icons/faTiktok';
+import { faBluesky } from '@fortawesome/free-brands-svg-icons/faBluesky';
+import { faThreads } from '@fortawesome/free-brands-svg-icons/faThreads';
+
 
 // Add actually used FA icons
 library.add(
@@ -88,6 +93,7 @@ library.add(
   faShare,
   faLink,
   faTwitter,
+  faXTwitter,
   faFacebook,
   faFacebookF,
   faPinterest,
@@ -121,20 +127,25 @@ library.add(
   faSave,
   faTrashAlt,
   faCloudUploadAlt,
-  faSignInAlt
+  faSignInAlt,
+  faBluesky,
+  faThreads
 );
 
 // Look for Google fonts and append them if they are not there already
 // We avoiding using @import url(); because the new URL has semicolons on it
 // and it tremendously gets broken from some preprocessors.
 
-const fonts = window.document.createElement('link');
 // eslint-disable-next-line max-len
-const href = 'https://fonts.googleapis.com/css2?family=Libre+Baskerville:ital@0;1&family=Libre+Franklin:ital,wght@0,400;0,700;1,400;1,700&display=swap';
-fonts.setAttribute('rel', 'stylesheet');
-fonts.setAttribute('crossorigin', 'anonymous');
-fonts.setAttribute('href', href);
-document.head.appendChild(fonts);
+const googleFontsHref = 'https://fonts.googleapis.com/css2?family=Libre+Baskerville:ital@0;1&family=Libre+Franklin:ital,wght@0,400;0,700;1,400;1,700&display=swap';
+const googleFontsLink = window.document.querySelector(`link[href="${googleFontsHref}"]`);
+if (!googleFontsLink) {
+  const fonts = window.document.createElement('link');
+  fonts.setAttribute('rel', 'stylesheet');
+  fonts.setAttribute('crossorigin', 'anonymous');
+  fonts.setAttribute('href', googleFontsHref);
+  document.head.appendChild(fonts);
+}
 
 // Kicks off the process of finding <i> tags and replacing with <svg>
 dom.watch();

package/src/main.js

@@ -19,6 +19,7 @@ import './components/tools/data-click-track';
 import './components/tools/rubik-tracking';
 import './components/tools/data-defer-src';
 import './components/tools/stickystack';
+import './components/tools/jaunty';
 
 // Bootstrap helpers
 import './components/layout/alerts.scss';

package/src/utils/scss/helpers/_mixins.scss

@@ -31,12 +31,13 @@
 
 // Applies colours to <p> and <a> elements
 @mixin text_colours ($main, $link) {
-  p,
-  li {
+  label,
+  li,
+  p {
     color: $main;
   }
 
-  a:not(.foe-cta) {
+  a:not(.foe-cta):not(.btn) {
     color: $link;
 
     &:hover {

package/src/utils/scss/helpers/_variables.scss

@@ -8,28 +8,44 @@
 //
 
 // Colours
-$foe-primary:         #56a085 !default;
-$foe-light:           #7ae1bd !default;
-$foe-secondary:         $foe-light !default;
-$foe-dark:            #3b867f !default;
-// $foe-extradark:       #232f4a !default;
-$foe-extradark:       #a01fed !default;
-$foe-sunset:          #ea5c5c !default;
-
-$foe-white:           #f3f3f7 !default;
+$foe-leaf:            #61bdaa !default;
+$foe-iris:            #5a54a0 !default;
+$foe-sunset:          #ed6132 !default;
+$foe-space:           #1e234d !default;
+$foe-ice:             #f3f3f7 !default;
+$foe-conch:           #f1e2d4 !default;
+
+// Tints, would prefer to do this algorithmically but it's useful to have the hex codes on hand to compare with figmas
+$foe-leaf-75:         #81cabb !default;
+$foe-leaf-50:         #c0e5dd !default;
+$foe-leaf-25:         #dff2ee !default;
+$foe-sunset-75:       #f1815b !default;
+$foe-sunset-50:       #f6b099 !default;
+$foe-sunset-25:       #fbdfd6 !default;
+$foe-iris-75:         #6d68a7 !default;
+$foe-iris-50:         #adaad0 !default;
+$foe-iris-25:         #deddec !default;
+
+$foe-primary:         $foe-leaf !default;
+$foe-light:           $foe-leaf-25 !default;
+$foe-secondary:       $foe-light !default;
+$foe-dark:            $foe-iris !default;
+$foe-extradark:       $foe-space !default;
+
+$foe-white:           #fff !default;
 $foe-gray:            #b1b8c0 !default;
-$foe-accent:          #34da96 !default;
-$foe-offwhite:        #f3f3f7 !default;
+$foe-accent:          $foe-iris !default;
+$foe-offwhite:        $foe-ice !default;
 
 $foe-success:         #5cb85c !default;
 $foe-info:            #5bc0de !default;
 $foe-warning:         #f0ad4e !default;
 $foe-danger:          #d9534f !default;
 
-$foe-text:            #6b6b6f !default;
+$foe-text:            $foe-extradark !default;
 
-$foe-donate:          #ea4848 !default;
-$foe-donate-text:       $foe-offwhite !default;
+$foe-donate:            $foe-iris !default;
+$foe-donate-text:       $foe-ice !default;
 
 $foe-join:            #ffef1e !default;
 $foe-join-text:         $foe-text !default;
@@ -51,6 +67,11 @@ $foe-nav-shadow:  0 0 .5em .2em rgba(0, 0, 0, .25);
 
 $foe-text-shadow: 0 0 .5rem $foe-tint-overlay-heavy !default;
 
+$foe-backgrounds:
+  $foe-leaf-50,
+  $foe-sunset-50,
+  $foe-iris-50;
+
 //
 // Palettes vars, needed for Campaignion (mostly) maybe also D8
 //
@@ -219,11 +240,11 @@ $theme-colors: map-merge(
 $theme-color-interval:      8%;
 
 // The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
-$yiq-contrasted-threshold:  150;
+$yiq-contrasted-threshold:  142; // this works for a hover cover for text-dark over leaf - any higher and it uses text-light.
 
 // Customize the light and dark text colors for use in our YIQ color contrast function.
-$yiq-text-dark:             $gray-900;
-$yiq-text-light:            $white;
+$yiq-text-dark:             $foe-extradark;
+$yiq-text-light:            $foe-offwhite;
 
 // Options
 //
@@ -288,8 +309,8 @@ $body-color:                $foe-text;
 //
 // Style anchor elements.
 
-$link-color:                theme-color("primary");
-$link-decoration:           none;
+$link-color:                theme-color("accent");
+$link-decoration:           underline;
 $link-hover-color:          darken($link-color, 15%);
 $link-hover-decoration:     underline;
 
@@ -391,7 +412,7 @@ $line-height-sm:              1.5;
 $border-width:                1px;
 $border-color:                $gray-300;
 
-$border-radius:               .1rem * 3;
+$border-radius:               0; // .1rem * 3;
 $border-radius-lg:            .1rem * 4;
 $border-radius-sm:            .1rem * 2;
 
@@ -399,8 +420,8 @@ $box-shadow-sm:               0 .125rem .25rem rgba($black, .075);
 $box-shadow:                  0 .5rem 1rem rgba($black, .15);
 $box-shadow-lg:               0 1rem 3rem rgba($black, .175);
 
-$component-active-color:      $gray-900;
-$component-active-bg:         theme-color("accent");
+$component-active-color:      $foe-extradark;
+$component-active-bg:         theme-color("primary");
 
 $caret-width:                 .3em;
 
@@ -408,6 +429,12 @@ $transition-base:             all .2s ease-in-out;
 $transition-fade:             opacity .15s linear;
 $transition-collapse:         height .35s ease;
 
+$foe-element-default-focus-width: .125rem;
+$foe-element-default-focus-color: $black;
+
+$foe-element-default-outline: .125rem solid $white;
+$foe-element-default-outline-offset: .125rem;
+
 
 // Fonts
 //
@@ -422,7 +449,8 @@ $font-family-base:            $font-family-sans-serif;
 
 $font-size-base:              1rem; // Assumes the browser default, typically `16px`
 $font-size-lg:                ($font-size-base * 1.25);
-$font-size-sm:                ($font-size-base * .7);
+// #13222 increase small text to just above 12px as per footer design https://www.figma.com/design/gimnDUG8AGkZdwuLTSGdkK/Design-system-%E2%80%93-Meg?node-id=197-22&t=bFuYz1SRqubH1qkg-0
+$font-size-sm:                ($font-size-base * .8);
 
 $font-weight-light:           300;
 $font-weight-normal:          400;
@@ -432,9 +460,9 @@ $font-weight-heavy:           700;
 $font-weight-base:            $font-weight-normal;
 $line-height-base:            1.5;
 
-$h1-font-size:                calc(56 / 16) * $font-size-base;
-$h2-font-size:                calc(44 / 16) * $font-size-base;
-$h3-font-size:                calc(34 / 16) * $font-size-base;
+$h1-font-size:                calc(60 / 16) * $font-size-base;
+$h2-font-size:                calc(40 / 16) * $font-size-base;
+$h3-font-size:                calc(32 / 16) * $font-size-base;
 $h4-font-size:                calc(26 / 16) * $font-size-base;
 $h5-font-size:                calc(20 / 16) * $font-size-base;
 $h6-font-size:                calc(16 / 16) * $font-size-base;
@@ -450,23 +478,23 @@ $headings-map: (
 
 $headings-margin-bottom:      calc($spacer / 2);
 $headings-font-family:        inherit;
-$headings-font-weight:        600;
+$headings-font-weight:        900;
 $headings-line-height:        1.2;
-$headings-color:              $foe-primary;
+$headings-color:              $foe-accent;
 
 $display1-size:               calc(60 / 16) * $font-size-base;
 $display2-size:               calc(60 / 16) * $font-size-base;
 $display3-size:               4.5rem;
 $display4-size:               3.5rem;
 
-$display1-weight:             600;
+$display1-weight:             900;
 $display2-weight:             300;
 $display3-weight:             300;
 $display4-weight:             300;
 $display-line-height:         $headings-line-height;
 
-$lead-font-size:              ($font-size-base * 1.25);
-$lead-font-weight:            300;
+$lead-font-size:              $font-size-base;
+$lead-font-weight:            bold;
 
 $small-font-size:             80%;
 
@@ -528,9 +556,9 @@ $input-btn-padding-y:         .5rem;
 $input-btn-padding-x:         .75rem;
 $input-btn-line-height:       $line-height-base;
 
-$input-btn-focus-width:       .2rem;
-$input-btn-focus-color:       rgba($component-active-bg, .75);
-$input-btn-focus-box-shadow:  0 0 0 $input-btn-focus-width $input-btn-focus-color;
+$input-btn-focus-width:       $foe-element-default-focus-width;
+$input-btn-focus-color:       $foe-element-default-focus-color;
+$input-btn-focus-box-shadow:  0 0 0 $input-btn-focus-width $input-btn-focus-color !important; //to override bootstrap default in button-variant mixin
 
 $input-btn-padding-y-sm:      .25rem;
 $input-btn-padding-x-sm:      .5rem;