diff --git a/CHANGELOG.md b/CHANGELOG.md index ea89c09bab..601ce33c9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ +## [0.373.0] - September 12, 2023 + +### Changed + - DP-28608: Replace superset data in views with data from bigquery + - DP-29020: Convert org page paragraph "What would you like to do" to use service page component "Flexible link group". + - DP-29416: Replace Twitter logo with new 'X' logo and add Threads logo + - DP-29553: Remove service details pages from visual regression testing in backstop. + - DP-29559: Role permissions changed to allow all authors and editors access to new analytics tab without tester role. Cleanup of tester role permissions. + +### Fixed + - DP-29493: Fix default domain URLs from service detail migration + - DP-29536: Fixed Tugboat builds. + - DP-29600: Fixed suggested page item link covering the whole page. + - DP-29649: Correct spelling issue in address error. + +### Added + - Avoid redirect to install.php when DB is down + + + ## [0.372.0] - September 5, 2023 ### Changed diff --git a/changelogs/DP-28608.yml b/changelogs/DP-28608.yml deleted file mode 100644 index 4956b2393f..0000000000 --- a/changelogs/DP-28608.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Changed: - - description: Replace superset data in views with data from bigquery - issue: DP-28608 diff --git a/changelogs/DP-29020.yml b/changelogs/DP-29020.yml deleted file mode 100644 index 9ff84d0a87..0000000000 --- a/changelogs/DP-29020.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Changed: - - description: Convert org page paragraph "What would you like to do" to use service page component "Flexible link group". - issue: DP-29020 diff --git a/changelogs/DP-29416.yml b/changelogs/DP-29416.yml deleted file mode 100644 index e649f03a18..0000000000 --- a/changelogs/DP-29416.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Changed: - - description: Replace Twitter logo with new 'X' logo and add Threads logo - issue: DP-29416 diff --git a/changelogs/DP-29493.yml b/changelogs/DP-29493.yml deleted file mode 100644 index be127d5736..0000000000 --- a/changelogs/DP-29493.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Fixed: - - description: Fix default domain URLs from service detail migration - issue: DP-29493 diff --git a/changelogs/DP-29536.yml b/changelogs/DP-29536.yml deleted file mode 100644 index 671212c4e1..0000000000 --- a/changelogs/DP-29536.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Fixed: - - description: Fixed Tugboat builds. - issue: DP-29536 diff --git a/changelogs/DP-29542.yml b/changelogs/DP-29542.yml deleted file mode 100644 index 93da16f1d7..0000000000 --- a/changelogs/DP-29542.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Added: - - description: Avoid redirect to install.php when DB is down - issue: diff --git a/changelogs/DP-29553.yml b/changelogs/DP-29553.yml deleted file mode 100644 index 8f887c87af..0000000000 --- a/changelogs/DP-29553.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Changed: - - description: Remove service details pages from visual regression testing in backstop. - issue: DP-29553 diff --git a/changelogs/DP-29559.yml b/changelogs/DP-29559.yml deleted file mode 100644 index e974a28186..0000000000 --- a/changelogs/DP-29559.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Changed: - - description: Role permissions changed to allow all authors and editors access to new analytics tab without tester role. Cleanup of tester role permissions. - issue: DP-29559 diff --git a/changelogs/DP-29600.yml b/changelogs/DP-29600.yml deleted file mode 100644 index 8b6bce59da..0000000000 --- a/changelogs/DP-29600.yml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Write your changelog entry here. Every pull request must have a changelog yml file. -# -# Change types: -# ############################################################################# -# You can use one of the following types: -# - Added: For new features. -# - Changed: For changes to existing functionality. -# - Deprecated: For soon-to-be removed features. -# - Removed: For removed features. -# - Fixed: For any bug fixes. -# - Security: In case of vulnerabilities. -# -# Format -# ############################################################################# -# The format is crucial. Please follow the examples below. For reference, the requirements are: -# - All 3 parts are required and you must include "Type", "description" and "issue". -# - "Type" must be left aligned and followed by a colon. -# - "description" must be indented with 2 spaces followed by a colon -# - "issue" must be indented with 4 spaces followed by a colon. -# - "issue" is for the Jira ticket number only e.g. DP-1234 -# - No extra spaces, indents, or blank lines are allowed. -# -# Example: -# ############################################################################# -# Fixed: -# - description: Fixes scrolling on edit pages in Safari. -# issue: DP-13314 -# -# You may add more than 1 description & issue for each type using the following format: -# Changed: -# - description: Automating the release branch. -# issue: DP-10166 -# - description: Second change item that needs a description. -# issue: DP-19875 -# - description: Third change item that needs a description along with an issue. -# issue: DP-19843 -# -Fixed: - - description: Fixed suggested page item link covering the whole page. - issue: DP-29600 diff --git a/conf/drupal/config/field.field.paragraph.org_section_long_form.field_section_long_form_content.yml b/conf/drupal/config/field.field.paragraph.org_section_long_form.field_section_long_form_content.yml index cd72bdb98b..58333a249f 100644 --- a/conf/drupal/config/field.field.paragraph.org_section_long_form.field_section_long_form_content.yml +++ b/conf/drupal/config/field.field.paragraph.org_section_long_form.field_section_long_form_content.yml @@ -11,7 +11,6 @@ dependencies: - paragraphs.paragraphs_type.featured_item_mosaic - paragraphs.paragraphs_type.featured_message - paragraphs.paragraphs_type.featured_topics - - paragraphs.paragraphs_type.flexible_link_group - paragraphs.paragraphs_type.iframe - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.info_details_card_group @@ -29,6 +28,7 @@ dependencies: - paragraphs.paragraphs_type.stat - paragraphs.paragraphs_type.tableau_embed - paragraphs.paragraphs_type.video + - paragraphs.paragraphs_type.what_would_you_like_to_do module: - entity_reference_revisions id: paragraph.org_section_long_form.field_section_long_form_content @@ -67,8 +67,8 @@ settings: stat: stat tableau_embed: tableau_embed video: video + what_would_you_like_to_do: what_would_you_like_to_do collection_search: collection_search - flexible_link_group: flexible_link_group negate: 0 target_bundles_drag_drop: 1up_stacked_band: @@ -125,9 +125,6 @@ settings: advisory_section: weight: 39 enabled: false - alert: - weight: 151 - enabled: false board_member: weight: 40 enabled: false @@ -164,9 +161,6 @@ settings: contact_info: weight: 48 enabled: false - contact_placeholder: - weight: 164 - enabled: false content_card_group: weight: 49 enabled: false @@ -221,9 +215,6 @@ settings: file_download_single: weight: 63 enabled: false - flexible_link_group: - weight: 183 - enabled: true footnotes: weight: 64 enabled: false @@ -272,6 +263,9 @@ settings: key_message_section: weight: 76 enabled: false + link_group: + weight: 77 + enabled: false link_group_accordion: weight: 90 enabled: false @@ -419,12 +413,6 @@ settings: section_with_heading: weight: 117 enabled: false - service_rich_text: - weight: 249 - enabled: false - service_section: - weight: 250 - enabled: false sitewide_alert_message: weight: 242 enabled: false @@ -452,9 +440,6 @@ settings: tableau_embed: weight: 20 enabled: true - time_callout: - weight: 260 - enabled: false video: weight: 21 enabled: true @@ -466,5 +451,5 @@ settings: enabled: false what_would_you_like_to_do: weight: 22 - enabled: false + enabled: true field_type: entity_reference_revisions diff --git a/docroot/modules/custom/mass_fields/mass_fields.module b/docroot/modules/custom/mass_fields/mass_fields.module index 8af8ea8951..0eb33eeedf 100644 --- a/docroot/modules/custom/mass_fields/mass_fields.module +++ b/docroot/modules/custom/mass_fields/mass_fields.module @@ -896,89 +896,87 @@ function _mass_fields_conditions_for_paragraphs(&$element, FormStateInterface $f $widget_state = WidgetBase::getWidgetState($element['#field_parents'], $paragraph_entity_reference_field_name, $form_state); /** @var \Drupal\paragraphs\Entity\Paragraph $paragraph */ $paragraph_instance = $widget_state['paragraphs'][$element['#delta']]['entity']; - if ($paragraph_instance) { - $paragraph_type = $paragraph_instance->bundle(); - // Determine which paragraph type is being embedded. - switch ($paragraph_type) { - case 'collection_search': - $dependee_field_name = 'field_search_type'; - $selector = sprintf('select[name="%s[%d][subform][%s][%d][subform][%s]"]', - $element['#field_parents'][0], - $element['#field_parents'][1], + $paragraph_type = $paragraph_instance->bundle(); + // Determine which paragraph type is being embedded. + switch ($paragraph_type) { + case 'collection_search': + $dependee_field_name = 'field_search_type'; + $selector = sprintf('select[name="%s[%d][subform][%s][%d][subform][%s]"]', + $element['#field_parents'][0], + $element['#field_parents'][1], + $paragraph_entity_reference_field_name, + $element['#delta'], + $dependee_field_name); + + if ($paragraph_entity_reference_field_name == 'field_sections') { + $selector = sprintf('select[name="%s[%d][subform][%s]"]', $paragraph_entity_reference_field_name, $element['#delta'], $dependee_field_name); + } - if ($paragraph_entity_reference_field_name == 'field_sections') { - $selector = sprintf('select[name="%s[%d][subform][%s]"]', - $paragraph_entity_reference_field_name, - $element['#delta'], - $dependee_field_name); - } + // Dependent fields. + $element['subform']['field_collection']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'collection'], + ], + 'required' => [ + $selector => ['value' => 'collection'], + ], + ]; - // Dependent fields. - $element['subform']['field_collection']['#states'] = [ - 'visible' => [ - $selector => ['value' => 'collection'], - ], - 'required' => [ - $selector => ['value' => 'collection'], - ], - ]; - - // Dependent fields. - $element['subform']['field_search_site_url']['#states'] = [ - 'visible' => [ - $selector => ['value' => 'external'], - ], - 'required' => [ - $selector => ['value' => 'external'], - ], - ]; - - // Dependent fields. - $element['subform']['field_search_query_param_name']['#states'] = [ - 'visible' => [ - $selector => ['value' => 'external'], - ], - 'required' => [ - $selector => ['value' => 'external'], - ], - ]; - break; - - case 'key_message_section': - $dependee_field_name = 'field_background_type'; - $selector = sprintf('input[name="%s[%d][subform][%s]"]', $paragraph_entity_reference_field_name, $element['#delta'], $dependee_field_name); - - // Dependent fields. - $element['subform']['field_image']['#states'] = [ - 'visible' => [ - $selector => ['value' => 'image'], - ], - 'required' => [ - $selector => ['value' => 'image'], - ], - ]; - - $element['subform']['field_section_background_color']['#states'] = [ - 'visible' => [ - $selector => ['value' => 'color'], - ], - 'required' => [ - $selector => ['value' => 'color'], - ], - ]; - - $element['subform']['field_section_text_overlay_color']['#states'] = [ - 'visible' => [ - $selector => ['value' => 'image'], - ], - - ]; - break; + // Dependent fields. + $element['subform']['field_search_site_url']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'external'], + ], + 'required' => [ + $selector => ['value' => 'external'], + ], + ]; + + // Dependent fields. + $element['subform']['field_search_query_param_name']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'external'], + ], + 'required' => [ + $selector => ['value' => 'external'], + ], + ]; + break; + + case 'key_message_section': + $dependee_field_name = 'field_background_type'; + $selector = sprintf('input[name="%s[%d][subform][%s]"]', $paragraph_entity_reference_field_name, $element['#delta'], $dependee_field_name); + + // Dependent fields. + $element['subform']['field_image']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'image'], + ], + 'required' => [ + $selector => ['value' => 'image'], + ], + ]; + + $element['subform']['field_section_background_color']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'color'], + ], + 'required' => [ + $selector => ['value' => 'color'], + ], + ]; + + $element['subform']['field_section_text_overlay_color']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'image'], + ], + + ]; + break; - } } } } diff --git a/docroot/modules/custom/mass_map/src/MapLocationFetcher.php b/docroot/modules/custom/mass_map/src/MapLocationFetcher.php index 52827b8cce..cd307227af 100644 --- a/docroot/modules/custom/mass_map/src/MapLocationFetcher.php +++ b/docroot/modules/custom/mass_map/src/MapLocationFetcher.php @@ -42,7 +42,7 @@ public function getLocations(array $nids) { 'name' => 'filter-by-location', 'type' => 'text', 'placeholder' => 'City, town, or ZIP code', - 'errorMsg' => 'Please select an address in the suggesions. Hit ENTER or start typing to show suggesions.' + 'errorMsg' => 'Please select an address in the suggestions. Hit ENTER or start typing to show suggestions.' ], ], 'tags' => [ diff --git a/docroot/modules/custom/mass_migrate/src/Plugin/migrate/source/UpdateReferences.php b/docroot/modules/custom/mass_migrate/src/Plugin/migrate/source/UpdateReferences.php index 7e6673ee47..e4a8c2c45c 100644 --- a/docroot/modules/custom/mass_migrate/src/Plugin/migrate/source/UpdateReferences.php +++ b/docroot/modules/custom/mass_migrate/src/Plugin/migrate/source/UpdateReferences.php @@ -129,7 +129,8 @@ public function prepareRow(Row $row) { } break; case EntityReferenceItem::class: - if ($item->get('target_id')->getString() == $ref['reference_value_old']) { + if ($item->get('target_id') + ->getString() == $ref['reference_value_old']) { $values[$field_name][$delta]['target_id'] = $ref['reference_value_new']; $changed = TRUE; } diff --git a/docroot/themes/custom/mass_theme/mass_theme.libraries.yml b/docroot/themes/custom/mass_theme/mass_theme.libraries.yml index d057325f90..4e9b318ef0 100644 --- a/docroot/themes/custom/mass_theme/mass_theme.libraries.yml +++ b/docroot/themes/custom/mass_theme/mass_theme.libraries.yml @@ -21,7 +21,7 @@ global-styling: overrides/css/contained.css: {} overrides/css/campaign_landing.css: {} overrides/css/flexible-link-group.css: {} - overrides/css/sections.css: {} + overrides/css/service-section.css: {} overrides/css/news-page.css: {} overrides/css/language-bar.css: {} js: diff --git a/docroot/themes/custom/mass_theme/overrides/css/sections.css b/docroot/themes/custom/mass_theme/overrides/css/service-section.css similarity index 63% rename from docroot/themes/custom/mass_theme/overrides/css/sections.css rename to docroot/themes/custom/mass_theme/overrides/css/service-section.css index b52db0d1a8..75fcaa868a 100644 --- a/docroot/themes/custom/mass_theme/overrides/css/sections.css +++ b/docroot/themes/custom/mass_theme/overrides/css/service-section.css @@ -2,13 +2,11 @@ overflow: hidden; } -.org-section--enhanced, .service-section--enhanced { background-image: -o-linear-gradient(top, white 50px, #F2F2F2 51px); background: linear-gradient(180deg, white 50px, #F2F2F2 51px); } -.org-section--enhanced > section > header, .service-section--enhanced > section > header { margin-right: auto; margin-left: auto; @@ -21,23 +19,18 @@ font-size: 2rem; } -.org-section .ma__callout-links-three-up h3, .service-section .ma__callout-links-three-up h3 { margin-bottom: 0; } -.org-section .ma__callout-links-three-up p, .service-section .ma__callout-links-three-up p { margin-top: 0.5rem; } -.org-section .ma__callout-links-three-up__container, .service-section .ma__callout-links-three-up__container { margin-top: 2rem; } -.org-section--hidden-title > section > header, -.org-section--hidden-title > section > .ma__stacked-row__container, .service-section--hidden-title > section > header, .service-section--hidden-title > section > .ma__stacked-row__container { position: absolute; @@ -50,38 +43,32 @@ border: 0; } -.org-section--enhanced.org-section--hidden-title, .service-section--enhanced.service-section--hidden-title { background: #F2F2F2; padding-top: 40px; } -.org-section .ma__collapsible-content__body .ma__collapsible-content__body-item, -.service-section .ma__collapsible-content__body .ma__collapsible-content__body-item { +.service-section +.ma__collapsible-content__body +.ma__collapsible-content__body-item { margin: 0.5rem 0; display: block; } -.org-section--enhanced + .org-section--simple .ma__stacked-row__section .ma__stacked-row__container:before, .service-section--enhanced + .service-section--simple .ma__stacked-row__section .ma__stacked-row__container:before { border-color: transparent; } -.org-section .ma__stacked-row__container:before, .service-section .ma__stacked-row__container:before { border-color: transparent !important; } -.org-section--enhanced + .org-section--enhanced.org-section--hidden-title, .service-section--enhanced + .service-section--enhanced.service-section--hidden-title { margin-top: 0 !important; padding-top: 0 !important; } -.org-section.org-section--enhanced .ma__stacked-row__section .main-content { - padding-bottom: 30px; -} .service-section .ma__stacked-row__section .main-content { margin-bottom: 30px; -} +} \ No newline at end of file diff --git a/docroot/themes/custom/mass_theme/templates/views/views-view--locations.html.twig b/docroot/themes/custom/mass_theme/templates/views/views-view--locations.html.twig index 5281dbb8ed..3a11a6c400 100644 --- a/docroot/themes/custom/mass_theme/templates/views/views-view--locations.html.twig +++ b/docroot/themes/custom/mass_theme/templates/views/views-view--locations.html.twig @@ -81,7 +81,7 @@