From 0d3d408f3d45dbabd93ffef1e3549b4373b6db14 Mon Sep 17 00:00:00 2001 From: Marc Berger <107938318+codechefmarc@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:16:27 -0400 Subject: [PATCH] SHS-5783 / SHS-5784: New Well Color for Collections (#1602) * SHS-5783 / SHS-5784: New Well Color for Collections. --- ...isplay.paragraph.hs_collection.default.yml | 48 +++++++--- ...y.paragraph.hs_priv_collection.default.yml | 46 ++++++++-- ...isplay.paragraph.hs_collection.default.yml | 4 + ...y.paragraph.hs_priv_collection.default.yml | 4 + ...paragraph.hs_collection.field_bg_color.yml | 21 +++++ ...aph.hs_collection.field_bg_color_width.yml | 23 +++++ ...ph.hs_collection.field_paragraph_style.yml | 2 +- ...raph.hs_priv_collection.field_bg_color.yml | 21 +++++ ...s_priv_collection.field_bg_color_width.yml | 23 +++++ ..._priv_collection.field_paragraph_style.yml | 2 +- ...field.storage.paragraph.field_bg_color.yml | 30 +++++++ ...storage.paragraph.field_bg_color_width.yml | 27 ++++++ .../hs_paragraph_types.install | 88 ++++++++++++++++++- .../hs_paragraph_types.module | 35 ++++++-- .../src/scss/objects/_layouts.row.scss | 8 ++ .../_variables.colorful-pairings.scss | 7 ++ .../_variables.traditional-pairings.scss | 6 ++ 17 files changed, 365 insertions(+), 30 deletions(-) create mode 100644 config/default/field.field.paragraph.hs_collection.field_bg_color.yml create mode 100644 config/default/field.field.paragraph.hs_collection.field_bg_color_width.yml create mode 100644 config/default/field.field.paragraph.hs_priv_collection.field_bg_color.yml create mode 100644 config/default/field.field.paragraph.hs_priv_collection.field_bg_color_width.yml create mode 100644 config/default/field.storage.paragraph.field_bg_color.yml create mode 100644 config/default/field.storage.paragraph.field_bg_color_width.yml diff --git a/config/default/core.entity_form_display.paragraph.hs_collection.default.yml b/config/default/core.entity_form_display.paragraph.hs_collection.default.yml index 957a66e49..4fab83913 100644 --- a/config/default/core.entity_form_display.paragraph.hs_collection.default.yml +++ b/config/default/core.entity_form_display.paragraph.hs_collection.default.yml @@ -3,6 +3,8 @@ langcode: en status: true dependencies: config: + - field.field.paragraph.hs_collection.field_bg_color + - field.field.paragraph.hs_collection.field_bg_color_width - field.field.paragraph.hs_collection.field_hs_collection_items - field.field.paragraph.hs_collection.field_hs_collection_per_row - field.field.paragraph.hs_collection.field_hs_collection_uh @@ -19,9 +21,40 @@ targetEntityType: paragraph bundle: hs_collection mode: default content: + field_bg_color: + type: options_select + weight: 3 + region: content + settings: { } + third_party_settings: { } + field_bg_color_width: + type: options_select + weight: 4 + region: content + settings: { } + third_party_settings: + conditional_fields: + 6d910fc3-1e3b-4f69-86c7-679fa8dd308b: + entity_type: paragraph + bundle: hs_collection + dependee: field_bg_color + settings: + state: visible + reset: false + condition: value + grouping: AND + values_set: 5 + value: '' + values: _none + value_form: + - + value: default + effect: show + effect_options: { } + selector: '' field_hs_collection_items: type: paragraphs_browser - weight: 6 + weight: 7 region: content settings: title: Component @@ -51,13 +84,13 @@ content: third_party_settings: { } field_hs_collection_uh: type: boolean_checkbox - weight: 5 + weight: 6 region: content settings: display_label: true third_party_settings: conditional_fields: - d755369a-3372-40fb-896b-2cfddbdaff67: + ae032945-b707-4d7d-97db-8e7d4075a8a2: entity_type: paragraph bundle: hs_collection dependee: field_raised_cards @@ -74,15 +107,9 @@ content: effect: show effect_options: { } selector: '' - field_paragraph_style: - type: options_select - weight: 3 - region: content - settings: { } - third_party_settings: { } field_raised_cards: type: boolean_checkbox - weight: 4 + weight: 5 region: content settings: display_label: true @@ -104,4 +131,5 @@ content: third_party_settings: { } hidden: created: true + field_paragraph_style: true status: true diff --git a/config/default/core.entity_form_display.paragraph.hs_priv_collection.default.yml b/config/default/core.entity_form_display.paragraph.hs_priv_collection.default.yml index 38c4c08fa..4b6078681 100644 --- a/config/default/core.entity_form_display.paragraph.hs_priv_collection.default.yml +++ b/config/default/core.entity_form_display.paragraph.hs_priv_collection.default.yml @@ -3,6 +3,8 @@ langcode: en status: true dependencies: config: + - field.field.paragraph.hs_priv_collection.field_bg_color + - field.field.paragraph.hs_priv_collection.field_bg_color_width - field.field.paragraph.hs_priv_collection.field_hs_collection_items - field.field.paragraph.hs_priv_collection.field_hs_collection_per_row - field.field.paragraph.hs_priv_collection.field_hs_collection_uh @@ -16,9 +18,40 @@ targetEntityType: paragraph bundle: hs_priv_collection mode: default content: + field_bg_color: + type: options_select + weight: 1 + region: content + settings: { } + third_party_settings: { } + field_bg_color_width: + type: options_select + weight: 2 + region: content + settings: { } + third_party_settings: + conditional_fields: + 6d910fc3-1e3b-4f69-86c7-679fa8dd308b: + entity_type: paragraph + bundle: hs_collection + dependee: field_bg_color + settings: + state: visible + reset: false + condition: value + grouping: AND + values_set: 5 + value: '' + values: _none + value_form: + - + value: default + effect: show + effect_options: { } + selector: '' field_hs_collection_items: type: paragraphs - weight: 4 + weight: 5 region: content settings: title: Paragraph @@ -43,7 +76,7 @@ content: third_party_settings: { } field_hs_collection_uh: type: boolean_checkbox - weight: 3 + weight: 4 region: content settings: display_label: true @@ -66,19 +99,14 @@ content: effect: show effect_options: { } selector: '' - field_paragraph_style: - type: options_select - weight: 1 - region: content - settings: { } - third_party_settings: { } field_raised_cards: type: boolean_checkbox - weight: 2 + weight: 3 region: content settings: display_label: true third_party_settings: { } hidden: created: true + field_paragraph_style: true status: true diff --git a/config/default/core.entity_view_display.paragraph.hs_collection.default.yml b/config/default/core.entity_view_display.paragraph.hs_collection.default.yml index bebcfb3fe..8ec480b2b 100644 --- a/config/default/core.entity_view_display.paragraph.hs_collection.default.yml +++ b/config/default/core.entity_view_display.paragraph.hs_collection.default.yml @@ -3,6 +3,8 @@ langcode: en status: true dependencies: config: + - field.field.paragraph.hs_collection.field_bg_color + - field.field.paragraph.hs_collection.field_bg_color_width - field.field.paragraph.hs_collection.field_hs_collection_items - field.field.paragraph.hs_collection.field_hs_collection_per_row - field.field.paragraph.hs_collection.field_hs_collection_uh @@ -45,6 +47,8 @@ content: weight: 0 region: content hidden: + field_bg_color: true + field_bg_color_width: true field_hs_collection_per_row: true field_hs_collection_uh: true field_paragraph_style: true diff --git a/config/default/core.entity_view_display.paragraph.hs_priv_collection.default.yml b/config/default/core.entity_view_display.paragraph.hs_priv_collection.default.yml index d834cc299..891d7254c 100644 --- a/config/default/core.entity_view_display.paragraph.hs_priv_collection.default.yml +++ b/config/default/core.entity_view_display.paragraph.hs_priv_collection.default.yml @@ -3,6 +3,8 @@ langcode: en status: true dependencies: config: + - field.field.paragraph.hs_priv_collection.field_bg_color + - field.field.paragraph.hs_priv_collection.field_bg_color_width - field.field.paragraph.hs_priv_collection.field_hs_collection_items - field.field.paragraph.hs_priv_collection.field_hs_collection_per_row - field.field.paragraph.hs_priv_collection.field_hs_collection_uh @@ -26,6 +28,8 @@ content: weight: 0 region: content hidden: + field_bg_color: true + field_bg_color_width: true field_hs_collection_per_row: true field_hs_collection_uh: true field_paragraph_style: true diff --git a/config/default/field.field.paragraph.hs_collection.field_bg_color.yml b/config/default/field.field.paragraph.hs_collection.field_bg_color.yml new file mode 100644 index 000000000..2e22fb6f4 --- /dev/null +++ b/config/default/field.field.paragraph.hs_collection.field_bg_color.yml @@ -0,0 +1,21 @@ +uuid: 2a241d22-0159-4439-aa6f-434d0341c046 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_bg_color + - paragraphs.paragraphs_type.hs_collection + module: + - options +id: paragraph.hs_collection.field_bg_color +field_name: field_bg_color +entity_type: paragraph +bundle: hs_collection +label: 'Background Color' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/config/default/field.field.paragraph.hs_collection.field_bg_color_width.yml b/config/default/field.field.paragraph.hs_collection.field_bg_color_width.yml new file mode 100644 index 000000000..ec396d7ef --- /dev/null +++ b/config/default/field.field.paragraph.hs_collection.field_bg_color_width.yml @@ -0,0 +1,23 @@ +uuid: effb83c1-a510-4d17-9b89-31f6a0d11851 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_bg_color_width + - paragraphs.paragraphs_type.hs_collection + module: + - options +id: paragraph.hs_collection.field_bg_color_width +field_name: field_bg_color_width +entity_type: paragraph +bundle: hs_collection +label: 'Background Color Width' +description: 'Applies when the page is full width. If the page includes a sidebar, this option will have no effect.' +required: true +translatable: false +default_value: + - + value: limited_width +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/config/default/field.field.paragraph.hs_collection.field_paragraph_style.yml b/config/default/field.field.paragraph.hs_collection.field_paragraph_style.yml index 4eef45a16..2d49f46d4 100644 --- a/config/default/field.field.paragraph.hs_collection.field_paragraph_style.yml +++ b/config/default/field.field.paragraph.hs_collection.field_paragraph_style.yml @@ -11,7 +11,7 @@ id: paragraph.hs_collection.field_paragraph_style field_name: field_paragraph_style entity_type: paragraph bundle: hs_collection -label: 'Background Color' +label: 'Background Color (old)' description: '' required: false translatable: true diff --git a/config/default/field.field.paragraph.hs_priv_collection.field_bg_color.yml b/config/default/field.field.paragraph.hs_priv_collection.field_bg_color.yml new file mode 100644 index 000000000..1a34ff149 --- /dev/null +++ b/config/default/field.field.paragraph.hs_priv_collection.field_bg_color.yml @@ -0,0 +1,21 @@ +uuid: 89c1b85c-1ef0-43ef-a2ab-eeceb15134f0 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_bg_color + - paragraphs.paragraphs_type.hs_priv_collection + module: + - options +id: paragraph.hs_priv_collection.field_bg_color +field_name: field_bg_color +entity_type: paragraph +bundle: hs_priv_collection +label: 'Background Color' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/config/default/field.field.paragraph.hs_priv_collection.field_bg_color_width.yml b/config/default/field.field.paragraph.hs_priv_collection.field_bg_color_width.yml new file mode 100644 index 000000000..ebcbb7117 --- /dev/null +++ b/config/default/field.field.paragraph.hs_priv_collection.field_bg_color_width.yml @@ -0,0 +1,23 @@ +uuid: bab9dad4-f614-4614-93f2-eb4759eec937 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_bg_color_width + - paragraphs.paragraphs_type.hs_priv_collection + module: + - options +id: paragraph.hs_priv_collection.field_bg_color_width +field_name: field_bg_color_width +entity_type: paragraph +bundle: hs_priv_collection +label: 'Background Color Width' +description: '' +required: true +translatable: false +default_value: + - + value: limited_width +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/config/default/field.field.paragraph.hs_priv_collection.field_paragraph_style.yml b/config/default/field.field.paragraph.hs_priv_collection.field_paragraph_style.yml index 7ab5f0c1b..c91ecac77 100644 --- a/config/default/field.field.paragraph.hs_priv_collection.field_paragraph_style.yml +++ b/config/default/field.field.paragraph.hs_priv_collection.field_paragraph_style.yml @@ -11,7 +11,7 @@ id: paragraph.hs_priv_collection.field_paragraph_style field_name: field_paragraph_style entity_type: paragraph bundle: hs_priv_collection -label: Style +label: 'Style (old)' description: '' required: false translatable: true diff --git a/config/default/field.storage.paragraph.field_bg_color.yml b/config/default/field.storage.paragraph.field_bg_color.yml new file mode 100644 index 000000000..ee3c9dafc --- /dev/null +++ b/config/default/field.storage.paragraph.field_bg_color.yml @@ -0,0 +1,30 @@ +uuid: cc813eb4-7606-4f27-a606-5b0b66e8392d +langcode: en +status: true +dependencies: + module: + - options + - paragraphs +id: paragraph.field_bg_color +field_name: field_bg_color +entity_type: paragraph +type: list_string +settings: + allowed_values: + - + value: default + label: Default + - + value: gray + label: Gray + - + value: light + label: Light + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/default/field.storage.paragraph.field_bg_color_width.yml b/config/default/field.storage.paragraph.field_bg_color_width.yml new file mode 100644 index 000000000..db9aed708 --- /dev/null +++ b/config/default/field.storage.paragraph.field_bg_color_width.yml @@ -0,0 +1,27 @@ +uuid: 991866bb-70d0-40fd-9853-e86b75a29218 +langcode: en +status: true +dependencies: + module: + - options + - paragraphs +id: paragraph.field_bg_color_width +field_name: field_bg_color_width +entity_type: paragraph +type: list_string +settings: + allowed_values: + - + value: limited_width + label: 'Limited Width' + - + value: full_width + label: 'Full Width' + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install index 542b57c58..f53c1316c 100644 --- a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install +++ b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install @@ -5,8 +5,8 @@ * Update functions for hs_paragraph_types module. */ -use Drupal\Core\Site\Settings; use Drupal\Core\Config\FileStorage; +use Drupal\Core\Site\Settings; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; use Drupal\filter\Entity\FilterFormat; @@ -246,3 +246,89 @@ function hs_paragraph_types_update_10006() { } } } + +/** + * Set new config for collection color wells. + */ +function hs_paragraph_types_update_10007() { + $config_directory = new FileStorage(Settings::get('config_sync_directory')); + + /** @var \Drupal\Core\Entity\EntityStorageInterface $field_config_storage */ + $field_config = \Drupal::service('entity_type.manager')->getStorage('field_config'); + + /** @var \Drupal\Core\Entity\EntityStorageInterface $field_storage */ + $field_storage_config = \Drupal::service('entity_type.manager')->getStorage('field_storage_config'); + + $storage_to_create = [ + 'field.storage.paragraph.field_bg_color', + 'field.storage.paragraph.field_bg_color_width', + ]; + + // Create the field storage. + foreach ($storage_to_create as $storage) { + $storage_config = $config_directory->read($storage); + if (!FieldStorageConfig::loadByName($storage_config['entity_type'], $storage_config['field_name'])) { + $field_storage_config->createFromStorageRecord($storage_config)->save(); + } + } + + $field_instances = [ + 'field.field.paragraph.hs_collection.field_bg_color', + 'field.field.paragraph.hs_collection.field_bg_color_width', + 'field.field.paragraph.hs_priv_collection.field_bg_color', + 'field.field.paragraph.hs_priv_collection.field_bg_color_width', + ]; + + // Create the field instance. + foreach ($field_instances as $instance) { + $instance_config = $config_directory->read($instance); + if (!FieldConfig::loadByName($instance_config['entity_type'], $instance_config['bundle'], $instance_config['field_name'])) { + $field_config->createFromStorageRecord($instance_config)->save(); + } + } +} + +/** + * Migrate data from old to new well fields in regular and private collections. + */ +function hs_paragraph_types_update_10008(&$sandbox) { + $paragraph_storage = \Drupal::entityTypeManager()->getStorage('paragraph'); + if (empty($sandbox['ids'])) { + // Get list of collection paragraphs. + $sandbox['ids'] = $paragraph_storage->getQuery() + ->accessCheck(FALSE) + ->condition('type', ['hs_collection', 'hs_priv_collection'], 'IN') + ->execute(); + $sandbox['total'] = count($sandbox['ids']); + } + + $paragraph_ids = array_splice($sandbox['ids'], 0, 50); + + // Set new field default for existing hs_collection paragraphs. + foreach ($paragraph_storage->loadMultiple($paragraph_ids) as $paragraph) { + /** @var \Drupal\paragraphs\Entity\Paragraph $paragraph */ + if ( + !$paragraph->hasField('field_paragraph_style') || + !$paragraph->hasField('field_bg_color') || + !$paragraph->hasField('field_bg_color_width') + ) { + continue; + } + + // Only set new field if old field had data. + $field_paragraph_style = $paragraph->get('field_paragraph_style')->value; + if ($field_paragraph_style) { + $paragraph->set('field_bg_color', 'default'); + } + + $bg_color_width = 'limited_width'; + if ($field_paragraph_style == 'well-full-width') { + $bg_color_width = 'full_width'; + } + + $paragraph->set('field_bg_color_width', $bg_color_width); + $paragraph->save(); + } + + $sandbox['#finished'] = count($sandbox['ids']) ? 1 - count($sandbox['ids']) / $sandbox['total'] : 1; +} diff --git a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.module b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.module index bd229565e..aee7217a2 100644 --- a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.module +++ b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.module @@ -7,19 +7,38 @@ use Drupal\Core\Form\FormStateInterface; use \Drupal\Core\Render\Element; +use Drupal\Component\Utility\Html; /** * Implements hook_preprocess_HOOK(). */ function hs_paragraph_types_preprocess_paragraph(&$variables) { - if (in_array($variables['paragraph']->bundle(), ['hs_collection', 'hs_priv_collection'])) { - /** @var \Drupal\paragraphs\ParagraphInterface $paragraph */ - $paragraph = $variables['paragraph']; - $row_style = $paragraph->get('field_paragraph_style')->getString(); - if (!empty($row_style)) { - $variables['attributes']['class'][] = 'hs-paragraph-style hs-paragraph-style--' . $row_style; - } - $variables['#attached']['library'][] = 'hs_paragraph_types/hs_collection'; + /** @var \Drupal\paragraphs\ParagraphInterface $paragraph */ + $paragraph = $variables['paragraph']; + $bundle = $paragraph->bundle(); + + // Exit early if it's not a relevant bundle. + if (!in_array($bundle, ['hs_collection', 'hs_priv_collection'])) { + return; + } + + $variables['#attached']['library'][] = 'hs_paragraph_types/hs_collection'; + $variables['attributes']['class'][] = 'hs-paragraph-style'; + + if (!$paragraph->hasField('field_bg_color') || !$paragraph->hasField('field_bg_color_width')) { + return; + } + + // Replace underscores with hyphens in the bg_color value. + $bg_color = Html::cleanCssIdentifier($paragraph->get('field_bg_color')->getString()); + + // Append "-well" to the bg_color. + $bg_width = $paragraph->get('field_bg_color_width')->getString(); + if (!empty($bg_color)) { + $bg_width_class = $bg_width == 'full_width' ? 'well-full-width' : 'well'; + $bg_color .= '-well'; + $variables['attributes']['class'][] = 'hs-paragraph-style--' . $bg_width_class; + $variables['attributes']['class'][] = 'hs-paragraph-style--' . $bg_color; } } diff --git a/docroot/themes/humsci/humsci_basic/src/scss/objects/_layouts.row.scss b/docroot/themes/humsci/humsci_basic/src/scss/objects/_layouts.row.scss index acbd479e3..a6cb9046a 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/objects/_layouts.row.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/objects/_layouts.row.scss @@ -58,6 +58,14 @@ @include hb-page-width; } } + + &--gray-well { + background-color: var(--palette--gray-well); + } + + &--light-well { + background-color: var(--palette--light-well); + } } // Decanter uses flexbox for row components. For modern browsers, let's use CSS Grid. diff --git a/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.colorful-pairings.scss b/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.colorful-pairings.scss index 7b4af6de9..f3500dd5b 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.colorful-pairings.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.colorful-pairings.scss @@ -19,6 +19,7 @@ $hc-colorful-pairings: ( 'tertiary-reversed': #00d5f5, 'tertiary-darken-20': darken(#007c8f, 20%), 'spotlight': #e4f4ee, + 'light-well': #e6f5f1, ), 'mountain': ( 'primary': #64305f, @@ -35,6 +36,7 @@ $hc-colorful-pairings: ( 'tertiary-reversed': #74fbc7, 'tertiary-darken-20': darken(#148762, 20%), 'spotlight': #e4f5ff, + 'light-well': #e2f0f8, ), 'cardinal': ( 'primary': #600e0e, @@ -51,6 +53,7 @@ $hc-colorful-pairings: ( 'tertiary-reversed': #cecfd1, 'tertiary-darken-20': darken(#b1040e, 20%), 'spotlight': #e9e6e2, + 'light-well': #f7e5e5, ), 'lake': ( 'primary': #005160, @@ -67,6 +70,7 @@ $hc-colorful-pairings: ( 'tertiary-reversed': #fdfcf2, 'tertiary-darken-20': darken(#485045, 20%), 'spotlight': #e1eadd, + 'light-well': #eaeae4, ), 'canyon': ( 'primary': #005160, @@ -83,6 +87,7 @@ $hc-colorful-pairings: ( 'tertiary-reversed': #ebebeb, 'tertiary-darken-20': darken(#006073, 20%), 'spotlight': #dfedef, + 'light-well': #fef4f4, ), 'cliff': ( 'primary': #8c1515, @@ -99,6 +104,7 @@ $hc-colorful-pairings: ( 'tertiary-reversed': #cecfd1, 'tertiary-darken-20': darken(#620e0e, 20%), 'spotlight': #dfedef, + 'light-well': #edfcff, ), ); $hc-colorful-globals: ( @@ -109,4 +115,5 @@ $hc-colorful-globals: ( 'white': #ffffff, 'black': #000000, 'cardinal': #8c1515, + 'gray-well': #e9e7e7, ); diff --git a/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.traditional-pairings.scss b/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.traditional-pairings.scss index 94934721e..f9d4a1645 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.traditional-pairings.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/settings/_variables.traditional-pairings.scss @@ -19,6 +19,7 @@ $ht-traditional-pairings: ( 'tertiary-reversed': #dbdcde, 'tertiary-darken-20': darken(#b1040e, 20%), 'spotlight': #dde0e0, + 'light-well': #f7eeee, ), 'bluejay': ( 'primary': #600e0e, @@ -35,6 +36,7 @@ $ht-traditional-pairings: ( 'tertiary-reversed': #daebed, 'tertiary-darken-20': darken(#b1040e, 20%), 'spotlight': #e9f5f6, + 'light-well': #bfdbdf, ), 'warbler': ( 'primary': #003b45, @@ -51,6 +53,7 @@ $ht-traditional-pairings: ( 'tertiary-reversed': #dcd9d3, 'tertiary-darken-20': #41473e, 'spotlight': #e1eadd, + 'light-well': #e1eadd, ), 'firefinch': ( 'primary': #a64c47, @@ -67,6 +70,7 @@ $ht-traditional-pairings: ( 'tertiary-reversed': #f4f4f4, 'tertiary-darken-20': darken(#8c1515, 20%), 'spotlight': #e0e0d1, + 'light-well': #ecece4, ), 'vireo': ( 'primary': #2b2e13, @@ -83,6 +87,7 @@ $ht-traditional-pairings: ( 'tertiary-reversed': #dbdcde, 'tertiary-darken-20': darken(#666252, 20%), 'spotlight': #e1dfd5, + 'light-well': #f0f2dd, ), ); @@ -95,4 +100,5 @@ $ht-traditional-globals: ( 'white': #ffffff, 'black': #000000, 'cardinal': #8c1515, + 'gray-well': #edece8, );