Merge pull request #271 from yalesites-org/develop

Release
yalesites-org · Oct 2, 2024 · cbddbd3 · cbddbd3
2 parents 03d792c + bd58a4a
commit cbddbd3
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 62 deletions.
diff --git a/atomic.libraries.yml b/atomic.libraries.yml
@@ -1,96 +1,71 @@
 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: {}
       css/localist.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: {}
 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:
     theme:
       css/layout-builder.css: {}
-
 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:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/typography/text/yds-text.js:
-      {}
-
+    node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/typography/text/yds-text.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:
-      {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/content-spotlight-portrait/content-spotlights.js: {}
 event-localist:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/meta/event-meta/event-meta-localist.js:
-      {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/meta/event-meta/event-meta-localist.js: {}
 chosen-select:
   js:
-    node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/forms/select/yds-select.js:
-      {}
+    node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/forms/select/yds-select.js: {}
   dependencies:
     - core/once
     - libraries/chosen
+calendar:
+  js:
+    node_modules/@yalesites-org/component-library-twig/dist/js/03-organisms/calendar/yds-calendar.js: {}
+  dependencies:
+    - core/drupal.ajax
diff --git a/css/layout-builder.css b/css/layout-builder.css
@@ -13,7 +13,6 @@ site header and site footer, respectively.
 ****************
 */
 
-
 /* This `layout-banner override, overrides the .main-content > *:first-child
 statement in web/themes/contrib/atomic/_yale-packages/component-library-twig/components/04-page-layouts/page-layouts.scss
 
@@ -59,6 +58,7 @@ 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 .image-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 .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 {
@@ -88,7 +88,6 @@ display: flex;
   margin-bottom: 0;
 }
 
-
 /* Fix for breadcrumb spacing on profile nodes */
 .ys-content-type-profile .main-content .breadcrumbs__wrapper {
   margin-bottom: var(--size-spacing-7);
@@ -105,6 +104,11 @@ display: flex;
   margin: 0;
 }
 
+/* Remove bottom margin from the image-banner so that it can be flush with other items */
+.layout--banner .image-banner {
+  margin-bottom: 0;
+}
+
 /* Wingsuit layout builder styles */
 
 .block-categories .layout-builder-browser-block-item img {

diff --git a/package-lock.json b/package-lock.json
diff --git a/templates/block/layout-builder/block--inline-block--image-banner.html.twig b/templates/block/layout-builder/block--inline-block--image-banner.html.twig
@@ -1,21 +1,25 @@
 {% extends "@atomic/block/layout-builder/_layout-builder-block-template.twig" %}
 
 {% set image_banner__video = paragraph.field_media.entity.field_media_video_file.entity.uri.value is not empty %}
+{% set image_banner__image_size = content.field_style_variation.0['#markup']|default('tall') %}
 
 {% block content %}
+
   {% embed "@molecules/banner/image/yds-image-banner.twig" with {
-    image_banner__video: image_banner__video,
-    image_banner__content_background: image_banner__content_background
+    image_banner__content__background: content.field_style_color.0['#markup'],
+    image_banner__overlay_variation: 'full',
+    image_banner__size: content.field_style_variation.0['#markup'],
+    image_banner__width: 'site',
   } %}
-  {% block image_banner__video %}
-      {% if image_banner__video %}
+    {% block image_banner__video %}
+      {% if paragraph.field_media.entity.field_media_video_file.entity.uri.value is not empty %}
         {% set image_banner__video = true %}
         {{ content.field_media }}
       {% endif %}
     {% endblock %}
 
     {% block image_banner__image %}
-      {% if not image_banner__video %}
+      {% if paragraph.field_media.entity.field_media_video_file.entity.uri.value is empty %}
         {{ content.field_media }}
       {% endif %}
     {% endblock %}