Merge pull request #208 from yalesites-org/develop

Release
yalesites-org · Feb 26, 2024 · 83ba8e6 · 83ba8e6
2 parents c6631de + 1bc63a4
commit 83ba8e6
Show file tree

Hide file tree

Showing 17 changed files with 73 additions and 31 deletions.
diff --git a/atomic.libraries.yml b/atomic.libraries.yml
@@ -1,59 +1,73 @@
 global:
   css:
     theme:
-      'https://yale-webfonts.yalespace.org/fonts.min.css': { type: external }
+      "https://yale-webfonts.yalespace.org/fonts.min.css": { type: external }
       node_modules/@yalesites-org/component-library-twig/dist/style.css: {}
       components/_settings/_config.css: {}
       css/admin-theme.css: {}
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/menu/menu-toggle/yds-menu-toggle.js: {}
-    node_modules/@yalesites-org/component-library-twig/dist/js/00-tokens/layout/yds-layout.js: {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/menu/menu-toggle/yds-menu-toggle.js:
+      {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/00-tokens/layout/yds-layout.js:
+      {}
     node_modules/@yalesites-org/component-library-twig/dist/js/ys-link.js: {}
   dependencies:
     - core/drupal
 
 accordion:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/accordion/yds-accordion.js: {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/accordion/yds-accordion.js:
+      {}
 
 alert:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/alert/yds-alert.js: {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/alert/yds-alert.js:
+      {}
 
 primary-nav:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/03-organisms/menu/primary-nav/yds-primary-nav.js: {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/03-organisms/menu/primary-nav/yds-primary-nav.js:
+      {}
 
 reference-card:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/cards/reference-card/yds-reference-card.js: {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/cards/reference-card/yds-reference-card.js:
+      {}
 
 custom-card:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/cards/custom-card/yds-custom-card.js: {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/cards/custom-card/yds-custom-card.js:
+      {}
 
 breadcrumbs:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/03-organisms/menu/breadcrumbs/yds-breadcrumbs.js: {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/03-organisms/menu/breadcrumbs/yds-breadcrumbs.js:
+      {}
 
 tabs:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/tabs/yds-tabs.js: {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/tabs/yds-tabs.js:
+      {}
 
 gallery:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/03-organisms/galleries/media-grid/yds-media-grid-interactive.js: {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/03-organisms/galleries/media-grid/yds-media-grid-interactive.js:
+      {}
 
 background-video:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/videos/video-background/yds-video-background.js: {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/videos/video-background/yds-video-background.js:
+      {}
 
 fontawesome:
   css:
     theme:
-      node_modules/@yalesites-org/component-library-twig/dist/fonts/fontawesome/css/fontawesome.css: {}
-      node_modules/@yalesites-org/component-library-twig/dist/fonts/fontawesome/css/regular.css: {}
-      node_modules/@yalesites-org/component-library-twig/dist/fonts/fontawesome/css/solid.css: {}
+      node_modules/@yalesites-org/component-library-twig/dist/fonts/fontawesome/css/fontawesome.css:
+        {}
+      node_modules/@yalesites-org/component-library-twig/dist/fonts/fontawesome/css/regular.css:
+        {}
+      node_modules/@yalesites-org/component-library-twig/dist/fonts/fontawesome/css/solid.css:
+        {}
 
 layout-builder:
   css:
@@ -62,8 +76,14 @@ layout-builder:
 
 text-link:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/controls/text-link/yds-text-link.js: {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/controls/text-link/yds-text-link.js:
+      {}
 
 text-copy-button:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/controls/text-copy-button/yds-text-copy-button.js: {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/controls/text-copy-button/yds-text-copy-button.js:
+      {}
+spotlights:
+  js:
+    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/content-spotlight-portrait/content-spotlights.js:
+      {}
diff --git a/css/admin-theme.css b/css/admin-theme.css
@@ -162,3 +162,9 @@
 .js.gin--dark-mode .paragraphs-description .summary-content {
   color: var(--gin-color-text) !important;
 }
+
+/* In light mode, gin is displaying a mustard background with a black 
+foreground. This causes contrast issues.  */
+html:not(.gin--dark-mode) #drupal-off-canvas:not(.drupal-off-canvas-reset).ui-dialog-content div:not([data-drupal-ck-style-fence] *), #drupal-off-canvas-wrapper .ui-dialog-content div:not([data-drupal-ck-style-fence] *) {
+  color: var(--color-basic-white);
+}
diff --git a/css/layout-builder.css b/css/layout-builder.css
@@ -47,7 +47,9 @@ need to have margin-bottom set to 0 */
 .main-content .layout.layout--onecol:last-of-type .layout__region--content:last-child .callouts:last-child,
 .main-content .layout.layout--onecol:last-of-type .layout__region--content:last-child .cta-banner:last-child,
 .main-content .layout.layout--onecol:last-of-type .layout__region--content:last-child .grand-hero-banner:last-child,
-.main-content .layout.layout--onecol:last-of-type .layout__region--content:last-child .quick-links:last-child {
+.main-content .layout.layout--onecol:last-of-type .layout__region--content:last-child .quick-links:last-child,
+.main-content .layout.layout--onecol:last-of-type .layout__region--content:last-child .text-with-image:not([data-component-theme='default']):last-child, 
+.main-content .layout.layout--onecol:last-of-type .layout__region--content:last-child .content-spotlight-portrait:not([data-component-theme='default']):last-child {
   margin-bottom: 0;
 }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/templates/block/layout-builder/block--inline-block--content-spotlight-portrait.html.twig b/templates/block/layout-builder/block--inline-block--content-spotlight-portrait.html.twig
@@ -1,10 +1,11 @@
 {% extends "@atomic/block/layout-builder/_layout-builder-block-template.twig" %}
 
 {% block content %}
+  {{ attach_library('atomic/spotlights') }}
 
   {% embed "@molecules/content-spotlight-portrait/yds-content-spotlight-portrait.twig" with {
-      content_spotlight_portrait__heading: content.field_heading,
-      content_spotlight_portrait__subheading: content.field_subheading,
+      content_spotlight_portrait__heading: content.field_heading.0,
+      content_spotlight_portrait__subheading: content.field_subheading.0,
       content_spotlight_portrait__text: content.field_text,
       content_spotlight_portrait__link__content: content.field_link.0['#title'],
       content_spotlight_portrait__link__url: content.field_link.0['#url_title'],

diff --git a/templates/block/layout-builder/block--inline-block--content-spotlight.html.twig b/templates/block/layout-builder/block--inline-block--content-spotlight.html.twig
@@ -1,10 +1,11 @@
 {% extends "@atomic/block/layout-builder/_layout-builder-block-template.twig" %}
 
 {% block content %}
+  {{ attach_library('atomic/spotlights') }}
 
   {% embed "@molecules/text-with-image/yds-text-with-image.twig" with {
-    text_with_image__heading: content.field_heading,
-    text_with_image__subheading: content.field_subheading,
+    text_with_image__heading: content.field_heading.0,
+    text_with_image__subheading: content.field_subheading.0,
     text_with_image__text: content.field_text,
     text_with_image__link__content: content.field_link.0['#title'],
     text_with_image__link__url: content.field_link.0['#url_title'],

diff --git a/templates/block/layout-builder/block--inline-block--custom-cards.html.twig b/templates/block/layout-builder/block--inline-block--custom-cards.html.twig
@@ -1,6 +1,6 @@
 {% extends "@atomic/block/layout-builder/_layout-builder-block-template.twig" %}
 
-{% block content %}
+{% block content %} 
 
   {% embed "@organisms/custom-card-collection/yds-custom-card-collection.twig" with {
     custom_card_collection__heading: content.field_heading.0['#text'],

diff --git a/templates/node/node--page--card.html.twig b/templates/node/node--page--card.html.twig
@@ -1,6 +1,7 @@
 {{ attach_library('atomic/reference-card') }}
 
 {% set heading = content.field_teaser_title.0 ? content.field_teaser_title : label %}
+{% set url = content.field_external_source[0]['#url']|render ? content.field_external_source[0]['#url']|render : url %}
 
 {% embed "@molecules/cards/reference-card/yds-reference-card.twig" with {
   reference_card__heading: heading,

diff --git a/templates/node/node--page--condensed.html.twig b/templates/node/node--page--condensed.html.twig
@@ -2,6 +2,7 @@
 
 {% set heading = content.field_teaser_title.0 ? content.field_teaser_title : label %}
 {% set reference_card__image = 'false' %}
+{% set url = content.field_external_source[0]['#url']|render ? content.field_external_source[0]['#url']|render : url %}
 
 {% embed "@molecules/cards/reference-card/yds-reference-card.twig" with {
   reference_card__heading: heading,

diff --git a/templates/node/node--page--list-item.html.twig b/templates/node/node--page--list-item.html.twig
@@ -1,6 +1,7 @@
 {{ attach_library('atomic/reference-card') }}
 
 {% set heading = content.field_teaser_title.0 ? content.field_teaser_title : label %}
+{% set url = content.field_external_source[0]['#url']|render ? content.field_external_source[0]['#url']|render : url %}
 
 {% embed "@molecules/cards/reference-card/yds-reference-card.twig" with {
   reference_card__heading: heading,

diff --git a/templates/node/node--post--card.html.twig b/templates/node/node--post--card.html.twig
@@ -8,6 +8,7 @@
 {% endset %}
 
 {% set heading = content.field_teaser_title.0 ? content.field_teaser_title : label %}
+{% set url = content.field_external_source[0]['#url']|render ? content.field_external_source[0]['#url']|render : url %}
 
 {% embed "@molecules/cards/reference-card/yds-reference-card.twig" with {
   reference_card__overline: date__formatted,

diff --git a/templates/node/node--post--condensed.html.twig b/templates/node/node--post--condensed.html.twig
@@ -2,6 +2,7 @@
 
 {% set heading = content.field_teaser_title.0 ? content.field_teaser_title : label %}
 {% set reference_card__image = 'false' %}
+{% set url = content.field_external_source[0]['#url']|render ? content.field_external_source[0]['#url']|render : url %}
 
 {% set date__formatted %}
   {% include "@atoms/date-time/yds-date-time.twig" with {

diff --git a/templates/node/node--post--list-item.html.twig b/templates/node/node--post--list-item.html.twig
@@ -8,6 +8,7 @@
 {% endset %}
 
 {% set heading = content.field_teaser_title.0 ? content.field_teaser_title : label %}
+{% set url = content.field_external_source[0]['#url']|render ? content.field_external_source[0]['#url']|render : url %}
 
 {% embed "@molecules/cards/reference-card/yds-reference-card.twig" with {
   reference_card__overline: date__formatted,

diff --git a/templates/node/node--profile--card.html.twig b/templates/node/node--profile--card.html.twig
@@ -1,6 +1,7 @@
 {{ attach_library('atomic/reference-card') }}
 
 {% set heading = content.field_teaser_title.0 ? content.field_teaser_title : label %}
+{% set url = content.field_external_source[0]['#url']|render ? content.field_external_source[0]['#url']|render : url %}
 
 {% embed "@molecules/cards/reference-card/yds-reference-card.twig" with {
   reference_card__heading: heading,

diff --git a/templates/node/node--profile--condensed.html.twig b/templates/node/node--profile--condensed.html.twig
@@ -2,6 +2,7 @@
 
 {% set heading = content.field_teaser_title.0 ? content.field_teaser_title : label %}
 {% set reference_card__image = 'false' %}
+{% set url = content.field_external_source[0]['#url']|render ? content.field_external_source[0]['#url']|render : url %}
 
 {% set profile_subheading %}
   {{ content.field_position.0['#context']['value'] }}

diff --git a/templates/node/node--profile--directory.html.twig b/templates/node/node--profile--directory.html.twig
@@ -2,15 +2,18 @@
 
 {% set heading = content.field_teaser_title.0 ? content.field_teaser_title : label %}
 {% set reference_card__image = 'false' %}
+{% set url = content.field_external_source[0]['#url']|render ? content.field_external_source[0]['#url']|render : url %}
 
 {% embed "@molecules/cards/directory-listing-card/yds-directory-listing-card.twig" with {
     directory_listing_card__heading: heading,
     directory_listing_card__url: url,
     directory_listing_card__overline: content.field_department,
     directory_listing_card__subheading: content.field_position,
     directory_listing_card__snippet: content.field_subtitle,
-    directory_listing_card__email: content.field_email,
-    directory_listing_card__phone: content.field_telephone
+    directory_listing_card__email: content.field_email[0]['#context'].value|trim|lower,
+    directory_listing_card__phone: content.field_telephone,
+    directory_listing_card_link__content: directory_listing_card_link__content,
+    directory_listing_card_link__url: 'mailto:' ~ content.field_email[0]['#context'].value|trim|lower,
 } %}
 
   {% block directory_listing_card__image %}

diff --git a/templates/node/node--profile--list-item.html.twig b/templates/node/node--profile--list-item.html.twig
@@ -1,6 +1,7 @@
 {{ attach_library('atomic/reference-card') }}
 
 {% set heading = content.field_teaser_title.0 ? content.field_teaser_title : label %}
+{% set url = content.field_external_source[0]['#url']|render ? content.field_external_source[0]['#url']|render : url %}
 
 {% embed "@molecules/cards/reference-card/yds-reference-card.twig" with {
   reference_card__heading: heading,