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

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;
@@ -75,24 +72,24 @@ blockquote {
 
   cite,
   & + .citation {
-    font-family: $font-family-sans-serif;
-    font-size: 1rem;
+    width: 80%;
+    margin: auto;
+    font-family: $font-family-serif;
+    font-size: $blockquote-font-size;
     line-height: 1.3rem;
-    font-weight: 400;
-    font-style: italic;
-    color: $gray-500;
+    font-weight: bold;
+    color: $foe-extradark;
     display: block;
-    text-align: right;
-    margin-top: 1em;
-    padding-left: 10%;
+    text-align: left;
+    margin-top: $spacer;
 
-    &::before {
-      content: "\2014\00A0\00A0";
-      color: $foe-primary;
+    @include media-breakpoint-up(sm) {
+      width: calc(100% * 4 / 6);
     }
   }
 
   & + .citation {
-    margin-top: $spacer * -1;
+    margin-top: $spacer * -2.75;
+    margin-bottom: $spacer * 2;
   }
 }

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/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:            #182f2a !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-sunset !default;
+$foe-donate-text:       $foe-extradark !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,7 +309,7 @@ $body-color:                $foe-text;
 //
 // Style anchor elements.
 
-$link-color:                theme-color("primary");
+$link-color:                theme-color("accent");
 $link-decoration:           none;
 $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;
 
@@ -452,7 +473,7 @@ $headings-margin-bottom:      calc($spacer / 2);
 $headings-font-family:        inherit;
 $headings-font-weight:        600;
 $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;
@@ -465,8 +486,8 @@ $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%;