Merge branch 'YALB-sept-release-fixes' into YALB-email-copy-change-to…

…-button

README.md

@@ -41,4 +41,3 @@ _Notes:_
 - `confim` Imports the current config files to your database.
 - `local:theme-link` Run this script once to establish `npm link`s to all of the frontend-related repositories.
 - `local:cl-dev` Enables a frontend developer to work across all of the repositories (`yalesites-project`, `atomic`, and `component-library-twig`) in an environment configured to support both Storybook development, and have the changes reflected in the Drupal instance. Note: This also wires up the Tokens repo, but if you want to watch for changes there, you'll have to run the `npm run develop` script inside the Tokens directory.
-.

web/profiles/custom/yalesites_profile/config/sync/field.field.menu_link_content.main.field_menu_top_level_link_cta.yml

@@ -10,7 +10,7 @@ field_name: field_menu_top_level_link_cta
 entity_type: menu_link_content
 bundle: main
 label: 'Mega Menu Top Level Link Text'
-description: 'Mega Menu level one links display this link text alongside the Menu link title. If empty, defaults to "Explore all".'
+description: 'Mega Menu level one links display this link text alongside the Menu link title. If empty, defaults to "Explore [Menu Item Title]".'
 required: false
 translatable: false
 default_value: {  }

web/profiles/custom/yalesites_profile/config/sync/taxonomy.vocabulary.affiliation.yml

@@ -29,5 +29,5 @@ third_party_settings:
         external: ''
 name: Affiliation
 vid: affiliation
-description: ''
+description: 'A vocabulary used to classify a profile based on their affiliation with Yale, such as "Staff", "Faculty", "Student", etc." for affiliation description.'
 weight: 0

web/profiles/custom/yalesites_profile/modules/custom/ys_core/css/footer-settings-form.css

@@ -13,6 +13,15 @@
   background-color: #6f6f6f !important;
 }
 
+.ys-core-footer-settings-form .form-element {
+  width: 100%;
+}
+
+.ys-core-footer-settings-form .preview-icon {
+  width: 190px;
+  height: 137px;
+}
+
 .ys-core-footer-settings-form .claro-details.form-disabled {
   pointer-events: none;
   user-select: none;

web/profiles/custom/yalesites_profile/modules/custom/ys_core/src/Form/FooterSettingsForm.php

@@ -67,8 +67,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form['footer_variation'] = [
       '#type' => 'radios',
       '#options' => [
-        'basic' => $this->t('Basic') . '<img src="/profiles/custom/yalesites_profile/modules/custom/ys_core/images/preview-icons/footer-basic.svg" alt="Basic footer icon showing a small Yale logo, and gray placeholders for copyright and social media icons.">',
-        'mega' => $this->t('Mega') . '<img src="/profiles/custom/yalesites_profile/modules/custom/ys_core/images/preview-icons/footer-mega.svg" alt="Mega footer icon with gray placeholders for more information than the basic footer.">',
+        'basic' => $this->t('Basic') . '<img src="/profiles/custom/yalesites_profile/modules/custom/ys_core/images/preview-icons/footer-basic.svg" class="preview-icon" alt="Basic footer icon showing a small Yale logo, and gray placeholders for copyright and social media icons.">',
+        'mega' => $this->t('Mega') . '<img src="/profiles/custom/yalesites_profile/modules/custom/ys_core/images/preview-icons/footer-mega-2.svg" class="preview-icon" alt="Mega footer icon with gray placeholders for more information than the basic footer.">',
       ],
       '#title' => $this->t('Footer variation'),
       '#default_value' => ($footerConfig->get('footer_variation')) ? $footerConfig->get('footer_variation') : 'basic',

web/profiles/custom/yalesites_profile/modules/custom/ys_core/ys_core.module

@@ -188,7 +188,7 @@ function ys_core_preprocess_menu(&$variables) {
       $clonedMenuItem['list__item__is_heading'] = TRUE;
 
       // Get the CTA text from menu item extras field.
-      $clonedMenuItem['heading_cta'] = $clonedMenuItem['entity']->get('field_menu_top_level_link_cta')->value ?: t('Explore all');
+      $clonedMenuItem['heading_cta'] = $clonedMenuItem['entity']->get('field_menu_top_level_link_cta')->value ?: t('Explore @title', ['@title' => $clonedMenuItem['title']]);
 
       // Add cloned item to the beginning of the menu.
       array_unshift($menuItem['below'], $clonedMenuItem);

web/profiles/custom/yalesites_profile/modules/custom/ys_starterkit/ys_starterkit.install

@@ -5,6 +5,9 @@
  * Install, update and uninstall functions for the module.
  */
 
+use Drupal\migrate\MigrateExecutable;
+use Drupal\migrate\MigrateMessage;
+
 /**
  * Implements hook_uninstall().
  */
@@ -24,3 +27,15 @@ function ys_starterkit_uninstall() {
 
   }
 }
+
+/**
+ * Implements hook_update().
+ */
+function ys_starterkit_update_9001() {
+  // Adds starter taxonomy terms.
+  if (!\Drupal::service('config.installer')->isSyncing()) {
+    $migration = \Drupal::service('plugin.manager.migration')->createInstance('ys_terms');
+    $executable = new MigrateExecutable($migration, new MigrateMessage());
+    $executable->import();
+  }
+}

web/profiles/custom/yalesites_profile/modules/custom/ys_toolbar/css/ys_toolbar.theme.css

@@ -21,6 +21,10 @@ behind the a.toolbar-icon element. */
     z-index: -1;
 }
 
+/* Push down the body when secondary menu is present */
+.gin--horizontal-toolbar.toolbar-horizontal.toolbar-fixed {
+  padding-top: calc(var(--gin-toolbar-secondary-height) + var(--gin-toolbar-y-offset)) !important;
+}
 
 /* Update toolbar icons */
 

web/profiles/custom/yalesites_profile/modules/custom/ys_views_basic/src/ViewsBasicManager.php

@@ -199,6 +199,20 @@ public function getView($type, $params) {
     // Set operator: "+" is "OR" and "," is "AND".
     $operator = $paramsDecoded['operator'] ?? '+';
 
+    // Fix for older setting terms for nodes not saved with the new storage.
+    if (isset($termsIncludeArray[0]) && is_array($termsIncludeArray[0])) {
+      foreach ($termsIncludeArray as $terms) {
+        $termsIncludeArrayFixed[] = $terms['target_id'];
+      }
+      $termsIncludeArray = $termsIncludeArrayFixed;
+    }
+    if (isset($termsExcludeArray[0]) && is_array($termsExcludeArray[0])) {
+      foreach ($termsExcludeArray as $terms) {
+        $termsExcludeArrayFixed[] = $terms['target_id'];
+      }
+      $termsExcludeArray = $termsExcludeArrayFixed;
+    }
+    // End fix.
     $termsInclude = (count($termsIncludeArray) != 0) ? implode($operator, $termsIncludeArray) : 'all';
     $termsExclude = (count($termsExcludeArray) != 0) ? implode($operator, $termsExcludeArray) : NULL;
 

web/themes/custom/ys_admin_theme/scss/gin-custom.scss

@@ -439,4 +439,9 @@
   background-color: var(--darkest-gray);
 }
 
+/* MaxLength */
+.gin--dark-mode .error strong {
+  color: var(--wool);
+}
+
 /* stylelint-enable */