Merge pull request #214 from yalesites-org/develop

Release

atomic.info.yml

@@ -7,6 +7,7 @@ core_version_requirement: ^9 || ^10
 libraries:
   - atomic/global
   - atomic/layout-builder
+  - atomic/fontawesome
 
 ckeditor5-stylesheets:
   - css/ckeditor5.css

css/admin-theme.css

@@ -1,4 +1,3 @@
-
 :root {
   --gin-font: Mallory, sans-serif;
   --gin-font-size-h1: 1.75rem;
@@ -73,18 +72,17 @@
 }
 
 @media only screen and (min-width: 2200px) {
-  .yds-two-column .layout-builder-block.contextual-region .contextual  {
+  .yds-two-column .layout-builder-block.contextual-region .contextual {
     left: -1vw;
   }
 }
 
 @media only screen and (min-width: 2500px) {
-  .yds-two-column .layout-builder-block.contextual-region .contextual  {
+  .yds-two-column .layout-builder-block.contextual-region .contextual {
     left: -1vw;
   }
 }
 
-
 /* add min-height so that smaller (in height) components are more easily
 // able to be interacted with - e.g. `divider`
 */
@@ -117,7 +115,7 @@
 /*
 // Autocomplete styles (linkit)
 */
-.ui-autocomplete .ui-menu-item-wrapper:focus, 
+.ui-autocomplete .ui-menu-item-wrapper:focus,
 .ui-autocomplete .ui-menu-item-wrapper:hover {
   background-color: var(--gin-color-primary);
   color: var(--gin-bg-layer3);
@@ -165,6 +163,55 @@
 
 /* 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] *) {
+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);
 }
+
+/*
+ * GinLB has a spinning text that we do not want in our system, so we disabled
+ * the animation of the throbber wrapper.
+ *
+ * By attempting to hide this, the delete and edit links were appearing above
+ * the message being displayed to the user.  This ensures that the z-index is
+ * respected such that the message will show and the buttons will not be shown
+ * during the throbber.
+ *
+ * We then do the same for the ui-dialog version since it also was clipping the
+ * text with link icons.
+ */
+.ui-dialog .ajax-progress,
+.ui-dialog .ajax-progress-throbber {
+  background-color: var(--gin-bg-layer) !important;
+
+  /* For some reason the throbber container had a border-radius? */
+  border-radius: unset !important;
+  display: block;
+
+  /*
+   * Setting a height of 100 in this case will cover the image.  So we set a
+   * lower height that will still cover the links
+   */
+  height: var(--spacing-component-gutter);
+  z-index: 10;
+}
+
+#drupal-off-canvas-wrapper .ajax-progress,
+#drupal-off-canvas-wrapper .ajax-progress-throbber {
+  animation: none;
+  background-color: var(--gin-bg-layer) !important;
+
+  /* For some reason the throbber container had a border-radius? */
+  border-radius: unset;
+  display: block;
+  height: 100%;
+  z-index: 10;
+}
+
+.ajax-progress-throbber::before {
+  right: 0;
+}

css/layout-builder.css

@@ -278,3 +278,4 @@ div[data-drupal-selector="edit-block-form"] {
 #block-yalesitesfooterblock {
   margin-top: auto;
 }
+

templates/block/layout-builder/block--inline-block--grand-hero.html.twig

@@ -2,12 +2,10 @@
 
 {% block content %}
 
-  {{ attach_library('atomic/fontawesome') }}
-
   {% embed "@molecules/banner/grand-hero/yds-grand-hero.twig" with {
     grand_hero__heading: content.field_heading,
     grand_hero__heading__level: content.field_heading_level.0['#markup'],
-    grand_hero__snippet: content.field_text,
+    grand_hero__snippet: content.field_text.0,
     grand_hero__link__content: content.field_link.0['#title'],
     grand_hero__link__url: content.field_link.0['#url_title'],
     grand_hero__content__background: content.field_style_color.0['#markup'],

templates/field/field--block-content--text.html.twig

@@ -0,0 +1,3 @@
+{% for item in items %}
+  {{ item.content }}
+{% endfor %}

templates/navigation/menu--extras--main.html.twig

@@ -1,6 +1,5 @@
 {# Note: After enabling menu_item_extras module, this file was renamed from menu--main.html.twig #}
 {{ attach_library('atomic/primary-nav') }}
-{{ attach_library('atomic/fontawesome')}}
 
 {% include "@organisms/menu/primary-nav/yds-primary-nav.twig"  with {
   menu__variation: getHeaderSetting('header_variation'),

templates/node/node--event--card.html.twig

@@ -6,7 +6,7 @@
   } %}
 {% endset %}
 
-{% if content.field_event_type %}
+{% if content.field_event_type.0 %}
   {% set reference_card__overline -%}
     {% include "@molecules/cards/reference-card/event/_yds-event-format.twig" with {
       format: content.field_event_type,

templates/paragraphs/_gallery-item.twig

@@ -5,7 +5,11 @@
       media_grid__variation: 'interactive',
     } %}
       {% block media_grid_item__media %}
-        {{ drupal_entity('media', item.entity.field_media.0.entity.mid.value, 'card_secondary_3_2') }}
+        {% if (item.entity.field_media.0.entity.mid != NULL) %}
+          {{ drupal_entity('media', item.entity.field_media.0.entity.mid.value, 'card_secondary_3_2') }}
+        {% else %}
+          {% include "@atoms/images/image/_image.twig" %}
+        {% endif %}
       {% endblock %}
     {% endembed %}
   {% endfor %}