diff --git a/config/default/core.entity_form_display.paragraph.hs_hero_image.default.yml b/config/default/core.entity_form_display.paragraph.hs_hero_image.default.yml index 68a4c7540d..42413c0597 100644 --- a/config/default/core.entity_form_display.paragraph.hs_hero_image.default.yml +++ b/config/default/core.entity_form_display.paragraph.hs_hero_image.default.yml @@ -6,12 +6,10 @@ dependencies: - field.field.paragraph.hs_hero_image.field_hs_hero_body - field.field.paragraph.hs_hero_image.field_hs_hero_image - field.field.paragraph.hs_hero_image.field_hs_hero_link - - field.field.paragraph.hs_hero_image.field_hs_hero_overlay_color - field.field.paragraph.hs_hero_image.field_hs_hero_title - paragraphs.paragraphs_type.hs_hero_image module: - allowed_formats - - color_field - linkit - maxlength - media_library @@ -54,13 +52,6 @@ content: linkit_profile: default linkit_auto_link_text: false third_party_settings: { } - field_hs_hero_overlay_color: - type: color_field_widget_box - weight: 5 - region: content - settings: - default_colors: '#00505C,#53284F,#175E54,#4D4F53,#5E3032' - third_party_settings: { } field_hs_hero_title: type: string_textfield weight: 2 diff --git a/config/default/core.entity_view_display.paragraph.hs_hero_image.default.yml b/config/default/core.entity_view_display.paragraph.hs_hero_image.default.yml index 5584a5f6e0..1b57fd7f6b 100644 --- a/config/default/core.entity_view_display.paragraph.hs_hero_image.default.yml +++ b/config/default/core.entity_view_display.paragraph.hs_hero_image.default.yml @@ -6,7 +6,6 @@ dependencies: - field.field.paragraph.hs_hero_image.field_hs_hero_body - field.field.paragraph.hs_hero_image.field_hs_hero_image - field.field.paragraph.hs_hero_image.field_hs_hero_link - - field.field.paragraph.hs_hero_image.field_hs_hero_overlay_color - field.field.paragraph.hs_hero_image.field_hs_hero_title - paragraphs.paragraphs_type.hs_hero_image module: @@ -41,6 +40,5 @@ content: hidden: field_hs_hero_body: true field_hs_hero_link: true - field_hs_hero_overlay_color: true field_hs_hero_title: true search_api_excerpt: true diff --git a/config/default/core.entity_view_display.paragraph.hs_hero_image.hero_with_overlay.yml b/config/default/core.entity_view_display.paragraph.hs_hero_image.hero_with_overlay.yml index 333e77da16..feb0739cae 100644 --- a/config/default/core.entity_view_display.paragraph.hs_hero_image.hero_with_overlay.yml +++ b/config/default/core.entity_view_display.paragraph.hs_hero_image.hero_with_overlay.yml @@ -7,7 +7,6 @@ dependencies: - field.field.paragraph.hs_hero_image.field_hs_hero_body - field.field.paragraph.hs_hero_image.field_hs_hero_image - field.field.paragraph.hs_hero_image.field_hs_hero_link - - field.field.paragraph.hs_hero_image.field_hs_hero_overlay_color - field.field.paragraph.hs_hero_image.field_hs_hero_title - paragraphs.paragraphs_type.hs_hero_image module: @@ -32,14 +31,7 @@ third_party_settings: settings: pattern: field_templates: default - variant: _field - variant_field: field_hs_hero_overlay_color - variant_field_values: - default: 00505c - purple: 53284f - paloalto: '175e54' - coolgrey: 4d4f53 - brown: '5e3032' + variant_field: field_hs_hero_body regions: image: - field_hs_hero_image @@ -123,5 +115,4 @@ content: weight: 1 region: overlay_text hidden: - field_hs_hero_overlay_color: true search_api_excerpt: true diff --git a/config/default/core.entity_view_display.paragraph.hs_hero_image.slideshow_slide.yml b/config/default/core.entity_view_display.paragraph.hs_hero_image.slideshow_slide.yml index 89e6344e3d..4aeb15ac31 100644 --- a/config/default/core.entity_view_display.paragraph.hs_hero_image.slideshow_slide.yml +++ b/config/default/core.entity_view_display.paragraph.hs_hero_image.slideshow_slide.yml @@ -7,7 +7,6 @@ dependencies: - field.field.paragraph.hs_hero_image.field_hs_hero_body - field.field.paragraph.hs_hero_image.field_hs_hero_image - field.field.paragraph.hs_hero_image.field_hs_hero_link - - field.field.paragraph.hs_hero_image.field_hs_hero_overlay_color - field.field.paragraph.hs_hero_image.field_hs_hero_title - paragraphs.paragraphs_type.hs_hero_image module: @@ -47,6 +46,5 @@ content: hidden: field_hs_hero_body: true field_hs_hero_link: true - field_hs_hero_overlay_color: true field_hs_hero_title: true search_api_excerpt: true diff --git a/config/default/field.field.paragraph.hs_hero_image.field_hs_hero_overlay_color.yml b/config/default/field.field.paragraph.hs_hero_image.field_hs_hero_overlay_color.yml deleted file mode 100644 index 239286aba3..0000000000 --- a/config/default/field.field.paragraph.hs_hero_image.field_hs_hero_overlay_color.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: a7643518-bc3d-4c85-add9-e99a0adfdf91 -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_hs_hero_overlay_color - - paragraphs.paragraphs_type.hs_hero_image - module: - - color_field -id: paragraph.hs_hero_image.field_hs_hero_overlay_color -field_name: field_hs_hero_overlay_color -entity_type: paragraph -bundle: hs_hero_image -label: 'Overlay Color' -description: '' -required: true -translatable: false -default_value: - - - color: '#00505C' - opacity: null -default_value_callback: '' -settings: - opacity: 0 -field_type: color_field_type diff --git a/config/default/field.storage.paragraph.field_hs_hero_overlay_color.yml b/config/default/field.storage.paragraph.field_hs_hero_overlay_color.yml deleted file mode 100644 index 0189c68ea7..0000000000 --- a/config/default/field.storage.paragraph.field_hs_hero_overlay_color.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: b1393f01-63e8-4bc6-9dae-6ab572b39387 -langcode: en -status: true -dependencies: - module: - - color_field - - field_permissions - - paragraphs -third_party_settings: - field_permissions: - permission_type: custom -id: paragraph.field_hs_hero_overlay_color -field_name: field_hs_hero_overlay_color -entity_type: paragraph -type: color_field_type -settings: - format: hexhex -module: color_field -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/default/user.role.anonymous.yml b/config/default/user.role.anonymous.yml index 373bce90e7..b5cc10c224 100644 --- a/config/default/user.role.anonymous.yml +++ b/config/default/user.role.anonymous.yml @@ -18,13 +18,11 @@ permissions: - 'access content' - 'download media' - 'view field_hs_accordion_views' - - 'view field_hs_hero_overlay_color' - 'view field_hs_text_area_bg_color' - 'view field_media_embeddable_code' - 'view field_paragraph_style' - 'view humsci entity' - 'view media' - 'view own field_hs_accordion_views' - - 'view own field_hs_hero_overlay_color' - 'view own field_media_embeddable_code' - 'view the administration theme' diff --git a/config/default/user.role.authenticated.yml b/config/default/user.role.authenticated.yml index 05481dc40d..92ceeff2ae 100644 --- a/config/default/user.role.authenticated.yml +++ b/config/default/user.role.authenticated.yml @@ -30,13 +30,11 @@ permissions: - 'use text format basic_html_without_media' - 'use text format webform_default' - 'view field_hs_accordion_views' - - 'view field_hs_hero_overlay_color' - 'view field_hs_text_area_bg_color' - 'view field_media_embeddable_code' - 'view field_paragraph_style' - 'view humsci entity' - 'view media' - 'view own field_hs_accordion_views' - - 'view own field_hs_hero_overlay_color' - 'view own field_media_embeddable_code' - 'view the administration theme' diff --git a/docroot/modules/humsci/hs_layouts/patterns/hero-text-overlay/hero-text-overlay.html.twig b/docroot/modules/humsci/hs_layouts/patterns/hero-text-overlay/hero-text-overlay.html.twig index 99a9a4e881..3f60d3b5a5 100644 --- a/docroot/modules/humsci/hs_layouts/patterns/hero-text-overlay/hero-text-overlay.html.twig +++ b/docroot/modules/humsci/hs_layouts/patterns/hero-text-overlay/hero-text-overlay.html.twig @@ -1,10 +1,5 @@ {%- set attributes = attributes.addClass('hb-hero-overlay') -%} -{% if variant %} - {% set variant_class = "hb-hero-overlay--color-#{variant}" %} - {% set attributes = attributes.addClass(variant_class) %} -{% endif %} - {% set text_content = overlay_text %} {% if overlay_text['field_hs_hero_title'] is defined and overlay_text['field_hs_hero_title'][0] is defined %} {% set text_content %} diff --git a/docroot/modules/humsci/hs_layouts/patterns/hero-text-overlay/hero-text-overlay.ui_patterns.yml b/docroot/modules/humsci/hs_layouts/patterns/hero-text-overlay/hero-text-overlay.ui_patterns.yml index accd8fb43e..e0aa924891 100644 --- a/docroot/modules/humsci/hs_layouts/patterns/hero-text-overlay/hero-text-overlay.ui_patterns.yml +++ b/docroot/modules/humsci/hs_layouts/patterns/hero-text-overlay/hero-text-overlay.ui_patterns.yml @@ -1,22 +1,6 @@ hero_text_overlay: label: "Hero Text Overlay" description: "" - variants: - default: - label: Lagunita - description: Lagunita Gradient - purple: - label: Purple - description: Purple Gradient - paloalto: - label: Palo Alto - description: Palo Alto Gradient - coolgrey: - label: Cool Grey - description: Cool Grey Gradient - brown: - label: Brown - description: Brown Gradient fields: image: label: "Image" 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 8d31d58a28..8908811a2b 100644 --- a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install +++ b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install @@ -217,3 +217,11 @@ function hs_paragraph_types_update_10004(&$sandbox) { } $sandbox['#finished'] = count($sandbox['ids']) ? 1 - count($sandbox['ids']) / $sandbox['total'] : 1; } + +/** + * Removes legacy fields from paragraphs. + */ +function hs_paragraph_types_update_10005() { + // SHS-5661 - remove legacy Banner image(s) with text box Overlay Color field. + FieldConfig::loadByName('paragraph', 'hs_hero_image', 'field_hs_hero_overlay_color')->delete(); +} diff --git a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/content/node/3a0fcda7-c346-40e3-af09-f16ad1a3467c.yml b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/content/node/3a0fcda7-c346-40e3-af09-f16ad1a3467c.yml index b62cd2c9d5..b0edeaff76 100644 --- a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/content/node/3a0fcda7-c346-40e3-af09-f16ad1a3467c.yml +++ b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/content/node/3a0fcda7-c346-40e3-af09-f16ad1a3467c.yml @@ -1258,10 +1258,6 @@ default: target_uuid: 287db095-35b1-4050-8d26-5d8332eeb6a6 title: 'Link to The Homepage' options: { } - field_hs_hero_overlay_color: - - - color: 00505c - opacity: !!float 0 field_hs_hero_title: - value: 'Hero (Layered) - Slider title text' @@ -1293,10 +1289,6 @@ default: field_hs_hero_image: - entity: 941470f3-b916-4e5f-b53d-e2386277d01c - field_hs_hero_overlay_color: - - - color: 00505c - opacity: !!float 0 field_hs_hero_title: - value: 'Hero (Layered) - Slider title text 2' @@ -1333,10 +1325,6 @@ default: target_uuid: 287db095-35b1-4050-8d26-5d8332eeb6a6 title: 'Learn more' options: { } - field_hs_hero_overlay_color: - - - color: 00505c - opacity: !!float 0 field_hs_hero_title: - value: 'Hero (Overlay) component section'