From 0eff8645015dd09c2b41b502261987f632cac4e2 Mon Sep 17 00:00:00 2001 From: Nick Georgiou Date: Tue, 18 Oct 2022 17:25:37 +1000 Subject: [PATCH 1/9] [CIVIC-946] Added Campaign component for Drupal theme. (#814) --- .../contrib/civictheme/civictheme.theme | 1 + .../00-base/_variables.components.scss | 2 + .../03-organisms/campaign/campaign.scss | 14 +-- .../03-organisms/campaign/campaign.twig | 2 +- ....paragraph.civictheme_campaign.default.yml | 91 ++++++++++++++++++ ....paragraph.civictheme_campaign.default.yml | 92 +++++++++++++++++++ ...e_component_block.field_c_b_components.yml | 5 + ...e.civictheme_page.field_c_n_components.yml | 9 +- ....civictheme_campaign.field_c_p_content.yml | 20 ++++ ...aph.civictheme_campaign.field_c_p_date.yml | 20 ++++ ...ph.civictheme_campaign.field_c_p_image.yml | 28 ++++++ ...heme_campaign.field_c_p_image_position.yml | 22 +++++ ....civictheme_campaign.field_c_p_summary.yml | 18 ++++ ...ph.civictheme_campaign.field_c_p_theme.yml | 22 +++++ ...ph.civictheme_campaign.field_c_p_title.yml | 18 ++++ ...ph.civictheme_campaign.field_c_p_topic.yml | 28 ++++++ ...me_campaign.field_c_p_vertical_spacing.yml | 20 ++++ ...hs.paragraphs_type.civictheme_campaign.yml | 9 ++ .../contrib/civictheme/includes/campaign.inc | 37 ++++++++ .../paragraph--civictheme-campaign.html.twig | 7 ++ ...ragraph.civictheme_campaign.fields.feature | 57 ++++++++++++ ...paragraph.civictheme_campaign.view.feature | 79 ++++++++++++++++ 22 files changed, 591 insertions(+), 10 deletions(-) create mode 100644 docroot/themes/contrib/civictheme/config/install/core.entity_form_display.paragraph.civictheme_campaign.default.yml create mode 100644 docroot/themes/contrib/civictheme/config/install/core.entity_view_display.paragraph.civictheme_campaign.default.yml create mode 100644 docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_content.yml create mode 100644 docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_date.yml create mode 100644 docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_image.yml create mode 100644 docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_image_position.yml create mode 100644 docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_summary.yml create mode 100644 docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_theme.yml create mode 100644 docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_title.yml create mode 100644 docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_topic.yml create mode 100644 docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_vertical_spacing.yml create mode 100644 docroot/themes/contrib/civictheme/config/install/paragraphs.paragraphs_type.civictheme_campaign.yml create mode 100644 docroot/themes/contrib/civictheme/includes/campaign.inc create mode 100644 docroot/themes/contrib/civictheme/templates/paragraphs/paragraph--civictheme-campaign.html.twig create mode 100644 tests/behat/features/paragraph.civictheme_campaign.fields.feature create mode 100644 tests/behat/features/paragraph.civictheme_campaign.view.feature diff --git a/docroot/themes/contrib/civictheme/civictheme.theme b/docroot/themes/contrib/civictheme/civictheme.theme index 4af9000ba..393fc0ad3 100644 --- a/docroot/themes/contrib/civictheme/civictheme.theme +++ b/docroot/themes/contrib/civictheme/civictheme.theme @@ -18,6 +18,7 @@ require_once 'includes/banner.inc'; require_once 'includes/block_content.inc'; require_once 'includes/breadcrumb.inc'; require_once 'includes/callout.inc'; +require_once 'includes/campaign.inc'; require_once 'includes/event_card.inc'; require_once 'includes/manual_list.inc'; require_once 'includes/navigation_card.inc'; diff --git a/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/_variables.components.scss b/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/_variables.components.scss index 3618d0495..d0e67da21 100644 --- a/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/_variables.components.scss +++ b/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/_variables.components.scss @@ -560,8 +560,10 @@ $ct-campaign-image-height-mobile: ct-particle(30) !default; $ct-campaign-image-width-desktop: auto !default; $ct-campaign-image-width-mobile: auto !default; $ct-campaign-light-background-color: ct-color-light('background-light') !default; +$ct-campaign-light-content-color: ct-color-light('body') !default; $ct-campaign-light-summary-color: ct-color-light('body') !default; $ct-campaign-dark-background-color: ct-color-dark('background-dark') !default; +$ct-campaign-dark-content-color: ct-color-light('body') !default; $ct-campaign-dark-summary-color: ct-color-dark('body') !default; // diff --git a/docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/campaign/campaign.scss b/docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/campaign/campaign.scss index f8968f00a..18ff9a668 100644 --- a/docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/campaign/campaign.scss +++ b/docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/campaign/campaign.scss @@ -9,12 +9,6 @@ position: relative; width: 100%; - display: flex; - flex-direction: column; - - &:focus-within { - @include ct-outline(); - } &--image-position-right { > .container > .row { @@ -93,7 +87,13 @@ } #{$root}__summary { - @include ct-component-property($root, $theme, summary, color); + @include ct-component-property($root, $theme, summary, color); + } + + #{$root}__content-top, + #{$root}__content-middle, + #{$root}__content-bottom { + @include ct-component-property($root, $theme, content, color); } } } diff --git a/docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/campaign/campaign.twig b/docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/campaign/campaign.twig index cbc880985..ae008dec4 100644 --- a/docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/campaign/campaign.twig +++ b/docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/campaign/campaign.twig @@ -46,7 +46,7 @@
{% block content_top %} {% if content_top is not empty %} -
+
{{ content_top }}
{% endif %} diff --git a/docroot/themes/contrib/civictheme/config/install/core.entity_form_display.paragraph.civictheme_campaign.default.yml b/docroot/themes/contrib/civictheme/config/install/core.entity_form_display.paragraph.civictheme_campaign.default.yml new file mode 100644 index 000000000..b7e0cc419 --- /dev/null +++ b/docroot/themes/contrib/civictheme/config/install/core.entity_form_display.paragraph.civictheme_campaign.default.yml @@ -0,0 +1,91 @@ +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.civictheme_campaign.field_c_p_content + - field.field.paragraph.civictheme_campaign.field_c_p_date + - field.field.paragraph.civictheme_campaign.field_c_p_image + - field.field.paragraph.civictheme_campaign.field_c_p_image_position + - field.field.paragraph.civictheme_campaign.field_c_p_summary + - field.field.paragraph.civictheme_campaign.field_c_p_theme + - field.field.paragraph.civictheme_campaign.field_c_p_title + - field.field.paragraph.civictheme_campaign.field_c_p_topic + - field.field.paragraph.civictheme_campaign.field_c_p_vertical_spacing + - paragraphs.paragraphs_type.civictheme_campaign + module: + - datetime + - media_library + - text +id: paragraph.civictheme_campaign.default +targetEntityType: paragraph +bundle: civictheme_campaign +mode: default +content: + field_c_p_content: + type: text_textarea + weight: 4 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_c_p_date: + type: datetime_default + weight: 5 + region: content + settings: { } + third_party_settings: { } + field_c_p_image: + type: media_library_widget + weight: 2 + region: content + settings: + media_types: { } + third_party_settings: { } + field_c_p_image_position: + type: options_select + weight: 1 + region: content + settings: { } + third_party_settings: { } + field_c_p_summary: + type: string_textarea + weight: 3 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_c_p_theme: + type: options_select + weight: 8 + region: content + settings: { } + third_party_settings: { } + field_c_p_title: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + field_c_p_topic: + type: entity_reference_autocomplete + weight: 6 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + field_c_p_vertical_spacing: + type: options_select + weight: 7 + region: content + settings: { } + third_party_settings: { } +hidden: + created: true + status: true diff --git a/docroot/themes/contrib/civictheme/config/install/core.entity_view_display.paragraph.civictheme_campaign.default.yml b/docroot/themes/contrib/civictheme/config/install/core.entity_view_display.paragraph.civictheme_campaign.default.yml new file mode 100644 index 000000000..ad19a5958 --- /dev/null +++ b/docroot/themes/contrib/civictheme/config/install/core.entity_view_display.paragraph.civictheme_campaign.default.yml @@ -0,0 +1,92 @@ +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.civictheme_campaign.field_c_p_content + - field.field.paragraph.civictheme_campaign.field_c_p_date + - field.field.paragraph.civictheme_campaign.field_c_p_image + - field.field.paragraph.civictheme_campaign.field_c_p_image_position + - field.field.paragraph.civictheme_campaign.field_c_p_summary + - field.field.paragraph.civictheme_campaign.field_c_p_theme + - field.field.paragraph.civictheme_campaign.field_c_p_title + - field.field.paragraph.civictheme_campaign.field_c_p_topic + - field.field.paragraph.civictheme_campaign.field_c_p_vertical_spacing + - paragraphs.paragraphs_type.civictheme_campaign + module: + - datetime + - options + - text +id: paragraph.civictheme_campaign.default +targetEntityType: paragraph +bundle: civictheme_campaign +mode: default +content: + field_c_p_content: + type: text_default + label: above + settings: { } + third_party_settings: { } + weight: 4 + region: content + field_c_p_date: + type: datetime_default + label: above + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 2 + region: content + field_c_p_image: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 5 + region: content + field_c_p_image_position: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 7 + region: content + field_c_p_summary: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 3 + region: content + field_c_p_theme: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 8 + region: content + field_c_p_title: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 1 + region: content + field_c_p_topic: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 0 + region: content + field_c_p_vertical_spacing: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 6 + region: content +hidden: { } diff --git a/docroot/themes/contrib/civictheme/config/install/field.field.block_content.civictheme_component_block.field_c_b_components.yml b/docroot/themes/contrib/civictheme/config/install/field.field.block_content.civictheme_component_block.field_c_b_components.yml index 681c56cb3..230544089 100644 --- a/docroot/themes/contrib/civictheme/config/install/field.field.block_content.civictheme_component_block.field_c_b_components.yml +++ b/docroot/themes/contrib/civictheme/config/install/field.field.block_content.civictheme_component_block.field_c_b_components.yml @@ -8,6 +8,7 @@ dependencies: - paragraphs.paragraphs_type.civictheme_attachment - paragraphs.paragraphs_type.civictheme_automated_list - paragraphs.paragraphs_type.civictheme_callout + - paragraphs.paragraphs_type.civictheme_campaign - paragraphs.paragraphs_type.civictheme_content - paragraphs.paragraphs_type.civictheme_iframe - paragraphs.paragraphs_type.civictheme_manual_list @@ -43,6 +44,7 @@ settings: civictheme_quick_links: civictheme_quick_links civictheme_map: civictheme_map civictheme_promo: civictheme_promo + civictheme_campaign: civictheme_campaign civictheme_iframe: civictheme_iframe civictheme_automated_list: civictheme_automated_list civictheme_webform: civictheme_webform @@ -63,6 +65,9 @@ settings: civictheme_callout: weight: -21 enabled: true + civictheme_campaign: + weight: 36 + enabled: true civictheme_content: weight: -17 enabled: true diff --git a/docroot/themes/contrib/civictheme/config/install/field.field.node.civictheme_page.field_c_n_components.yml b/docroot/themes/contrib/civictheme/config/install/field.field.node.civictheme_page.field_c_n_components.yml index 0ebc4745e..d3318dd39 100644 --- a/docroot/themes/contrib/civictheme/config/install/field.field.node.civictheme_page.field_c_n_components.yml +++ b/docroot/themes/contrib/civictheme/config/install/field.field.node.civictheme_page.field_c_n_components.yml @@ -8,6 +8,7 @@ dependencies: - paragraphs.paragraphs_type.civictheme_attachment - paragraphs.paragraphs_type.civictheme_automated_list - paragraphs.paragraphs_type.civictheme_callout + - paragraphs.paragraphs_type.civictheme_campaign - paragraphs.paragraphs_type.civictheme_content - paragraphs.paragraphs_type.civictheme_iframe - paragraphs.paragraphs_type.civictheme_manual_list @@ -46,6 +47,7 @@ settings: civictheme_promo: civictheme_promo civictheme_slider: civictheme_slider civictheme_webform: civictheme_webform + civictheme_campaign: civictheme_campaign negate: 0 target_bundles_drag_drop: civictheme_accordion: @@ -63,8 +65,8 @@ settings: civictheme_callout: weight: -57 enabled: true - civictheme_manual_list: - weight: -55 + civictheme_campaign: + weight: 36 enabled: true civictheme_content: weight: -61 @@ -78,6 +80,9 @@ settings: civictheme_iframe: weight: -56 enabled: true + civictheme_manual_list: + weight: -55 + enabled: true civictheme_map: weight: -54 enabled: true diff --git a/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_content.yml b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_content.yml new file mode 100644 index 000000000..8b08061b5 --- /dev/null +++ b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_content.yml @@ -0,0 +1,20 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_c_p_content + - paragraphs.paragraphs_type.civictheme_campaign + module: + - text +id: paragraph.civictheme_campaign.field_c_p_content +field_name: field_c_p_content +entity_type: paragraph +bundle: civictheme_campaign +label: Content +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: text_long diff --git a/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_date.yml b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_date.yml new file mode 100644 index 000000000..e289162ba --- /dev/null +++ b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_date.yml @@ -0,0 +1,20 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_c_p_date + - paragraphs.paragraphs_type.civictheme_campaign + module: + - datetime +id: paragraph.civictheme_campaign.field_c_p_date +field_name: field_c_p_date +entity_type: paragraph +bundle: civictheme_campaign +label: Date +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: datetime diff --git a/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_image.yml b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_image.yml new file mode 100644 index 000000000..01fdca758 --- /dev/null +++ b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_image.yml @@ -0,0 +1,28 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_c_p_image + - media.type.civictheme_image + - paragraphs.paragraphs_type.civictheme_campaign +id: paragraph.civictheme_campaign.field_c_p_image +field_name: field_c_p_image +entity_type: paragraph +bundle: civictheme_campaign +label: Image +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:media' + handler_settings: + target_bundles: + civictheme_image: civictheme_image + sort: + field: _none + direction: ASC + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_image_position.yml b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_image_position.yml new file mode 100644 index 000000000..9dbe3c3e8 --- /dev/null +++ b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_image_position.yml @@ -0,0 +1,22 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_c_p_image_position + - paragraphs.paragraphs_type.civictheme_campaign + module: + - options +id: paragraph.civictheme_campaign.field_c_p_image_position +field_name: field_c_p_image_position +entity_type: paragraph +bundle: civictheme_campaign +label: 'Image position' +description: '' +required: true +translatable: true +default_value: + - + value: right +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_summary.yml b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_summary.yml new file mode 100644 index 000000000..5654f28bc --- /dev/null +++ b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_summary.yml @@ -0,0 +1,18 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_c_p_summary + - paragraphs.paragraphs_type.civictheme_campaign +id: paragraph.civictheme_campaign.field_c_p_summary +field_name: field_c_p_summary +entity_type: paragraph +bundle: civictheme_campaign +label: Summary +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: string_long diff --git a/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_theme.yml b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_theme.yml new file mode 100644 index 000000000..c1185873f --- /dev/null +++ b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_theme.yml @@ -0,0 +1,22 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_c_p_theme + - paragraphs.paragraphs_type.civictheme_campaign + module: + - options +id: paragraph.civictheme_campaign.field_c_p_theme +field_name: field_c_p_theme +entity_type: paragraph +bundle: civictheme_campaign +label: Theme +description: '' +required: true +translatable: true +default_value: + - + value: light +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_title.yml b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_title.yml new file mode 100644 index 000000000..78a4bd0e6 --- /dev/null +++ b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_title.yml @@ -0,0 +1,18 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_c_p_title + - paragraphs.paragraphs_type.civictheme_campaign +id: paragraph.civictheme_campaign.field_c_p_title +field_name: field_c_p_title +entity_type: paragraph +bundle: civictheme_campaign +label: Title +description: '' +required: true +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_topic.yml b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_topic.yml new file mode 100644 index 000000000..a65c9d542 --- /dev/null +++ b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_topic.yml @@ -0,0 +1,28 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_c_p_topic + - paragraphs.paragraphs_type.civictheme_campaign + - taxonomy.vocabulary.civictheme_topics +id: paragraph.civictheme_campaign.field_c_p_topic +field_name: field_c_p_topic +entity_type: paragraph +bundle: civictheme_campaign +label: Topic +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:taxonomy_term' + handler_settings: + target_bundles: + civictheme_topics: civictheme_topics + sort: + field: name + direction: asc + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_vertical_spacing.yml b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_vertical_spacing.yml new file mode 100644 index 000000000..b02993cbb --- /dev/null +++ b/docroot/themes/contrib/civictheme/config/install/field.field.paragraph.civictheme_campaign.field_c_p_vertical_spacing.yml @@ -0,0 +1,20 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_c_p_vertical_spacing + - paragraphs.paragraphs_type.civictheme_campaign + module: + - options +id: paragraph.civictheme_campaign.field_c_p_vertical_spacing +field_name: field_c_p_vertical_spacing +entity_type: paragraph +bundle: civictheme_campaign +label: 'Vertical spacing' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/docroot/themes/contrib/civictheme/config/install/paragraphs.paragraphs_type.civictheme_campaign.yml b/docroot/themes/contrib/civictheme/config/install/paragraphs.paragraphs_type.civictheme_campaign.yml new file mode 100644 index 000000000..ee82b6a78 --- /dev/null +++ b/docroot/themes/contrib/civictheme/config/install/paragraphs.paragraphs_type.civictheme_campaign.yml @@ -0,0 +1,9 @@ +langcode: en +status: true +dependencies: { } +id: civictheme_campaign +label: Campaign +icon_uuid: null +icon_default: null +description: '' +behavior_plugins: { } diff --git a/docroot/themes/contrib/civictheme/includes/campaign.inc b/docroot/themes/contrib/civictheme/includes/campaign.inc new file mode 100644 index 000000000..386cb3efb --- /dev/null +++ b/docroot/themes/contrib/civictheme/includes/campaign.inc @@ -0,0 +1,37 @@ +get('value')->getDateTime()); + } + + // Vertical spacing. + $variables['vertical_spacing'] = civictheme_get_field_value($paragraph, 'field_c_p_vertical_spacing'); +} diff --git a/docroot/themes/contrib/civictheme/templates/paragraphs/paragraph--civictheme-campaign.html.twig b/docroot/themes/contrib/civictheme/templates/paragraphs/paragraph--civictheme-campaign.html.twig new file mode 100644 index 000000000..e875ef14d --- /dev/null +++ b/docroot/themes/contrib/civictheme/templates/paragraphs/paragraph--civictheme-campaign.html.twig @@ -0,0 +1,7 @@ +{# +/** + * @file + * CivicTheme theme implementation to display a Campaign Paragraph. + */ +#} +{% include '@organisms/campaign/campaign.twig' %} diff --git a/tests/behat/features/paragraph.civictheme_campaign.fields.feature b/tests/behat/features/paragraph.civictheme_campaign.fields.feature new file mode 100644 index 000000000..e25c337fd --- /dev/null +++ b/tests/behat/features/paragraph.civictheme_campaign.fields.feature @@ -0,0 +1,57 @@ +@civictheme @paragraph @civictheme_campaign +Feature: Tests the Campaign paragraph + + Ensure that the Campaign paragraph exists and has the expected fields. + + @api + Scenario: Paragraph type appears in the paragraph types page + Given I am logged in as a user with the "Administrator" role + When I go to "admin/structure/paragraphs_type" + Then I should see the text "Campaign" in the "civictheme_campaign" row + + @api + Scenario: Campaign paragraph exists with fields. + Given I am logged in as a user with the "Administrator" role + When I go to "admin/structure/paragraphs_type/civictheme_campaign/fields" + And I should see the text "field_c_p_image" in the "Image" row + And I should see the text "field_c_p_image_position" in the "Image position" row + And I should see the text "field_c_p_title" in the "Title" row + And I should see the text "field_c_p_summary" in the "Summary" row + And I should see the text "field_c_p_content" in the "Content" row + And I should see the text "field_c_p_date" in the "Date" row + And I should see the text "field_c_p_topic" in the "Topic" row + And I should see the text "field_c_p_theme" in the "Theme" row + And I should see the text "field_c_p_vertical_spacing" in the "Vertical spacing" row + + @api + Scenario: Page content type field_c_n_components fields settings. + Given I am logged in as a user with the "Administrator" role + When I go to "admin/structure/types/manage/civictheme_page/fields/node.civictheme_page.field_c_n_components" + And the "Label" field should contain "Components" + Then the option "Default" from select "Reference method" is selected + Then the "Include the selected below" checkbox should be checked + And the "Campaign" checkbox should be checked + + @api @javascript + Scenario: Show relevant fields depending on the 'Content type' selected + Given I am logged in as a user with the "Site Administrator" role + When I visit "node/add/civictheme_page" + And I fill in "Title" with "[TEST] Page fields" + And I click on ".field-group-tabs-wrapper .horizontal-tab-button-2 a" element + And I click on "div.field--name-field-c-n-components .paragraphs-add-wrapper .dropbutton-toggle button" element + And I wait 1 second + And I click on "div.field--name-field-c-n-components .add-more-button-civictheme-campaign.dropbutton-action" element + And I wait for AJAX to finish + And I see field "field_c_n_components[0][subform][field_c_p_theme]" + And should see an "select[name='field_c_n_components[0][subform][field_c_p_theme]'].required" element + And should see an "input[name='field_c_n_components[0][subform][field_c_p_title][0][value]'].required" element + And should see an "input[name='field_c_n_components[0][subform][field_c_p_title][0][value]'].required" element + And should see an "textarea[name='field_c_n_components[0][subform][field_c_p_content][0][value]']" element + And should see an "textarea[name='field_c_n_components[0][subform][field_c_p_summary][0][value]']" element + And should see an "select[name='field_c_n_components[0][subform][field_c_p_vertical_spacing]']" element + And I should see an "div.js-form-item-field-c-n-components-0-subform-field-c-p-image-position" element + And I should see an "div.js-form-item-field-c-n-components-0-subform-field-c-p-image-position select.required" element + And should see an "input[name='field_c_n_components[0][subform][field_c_p_date][0][value][date]']" element + And I should see an "#field_c_p_image-media-library-wrapper-field_c_n_components-0-subform" element + And should see an "input[name='field_c_n_components[0][subform][field_c_p_topic][0][target_id]']" element + And the option "Light" from select "Theme" is selected diff --git a/tests/behat/features/paragraph.civictheme_campaign.view.feature b/tests/behat/features/paragraph.civictheme_campaign.view.feature new file mode 100644 index 000000000..c9b9cb23a --- /dev/null +++ b/tests/behat/features/paragraph.civictheme_campaign.view.feature @@ -0,0 +1,79 @@ +@civictheme @paragraph @civictheme_campaign +Feature: View of Page content with Campaign component + + Ensure that Page content can be viewed correctly with Campaign component. + + Background: + Given managed file: + | filename | uri | path | + | test_image.jpg | public://civictheme_test/test_image.jpg | test_image.jpg | + + And "civictheme_image" media: + | name | field_c_m_image | + | [TEST] CivicTheme Image | test_image.jpg | + + And "civictheme_topics" terms: + | name | + | [TEST] Topic 1 | + + And "civictheme_page" content: + | title | status | + | [TEST] Page Campaign test | 1 | + | [TEST] Page Campaign test 1 | 1 | + + @api @javascript + Scenario: CivicTheme page content type page can be viewed by anonymous with Campaign light with vertical spacing and right image + Given I am an anonymous user + And "field_c_n_components" in "civictheme_page" "node" with "title" of "[TEST] Page Campaign test" has "civictheme_campaign" paragraph: + | field_c_p_title | [TEST] Campaign title | + | field_c_p_theme | light | + | field_c_p_summary | Summary text | + | field_c_p_vertical_spacing | both | + | field_c_p_date | 2021-04-29 | + | field_c_p_topic | [TEST] Topic 1 | + | field_c_p_image | [TEST] CivicTheme Image | + | field_c_p_image_position | right | + + When I visit "civictheme_page" "[TEST] Page Campaign test" + And I scroll to an element with id "main-content" + And I should see an "div.ct-campaign" element + And I should see an "div.ct-campaign.ct-theme-light" element + And I should not see an ".ct-campaign.ct-theme-dark" element + And I should see an "div.ct-campaign.ct-vertical-spacing-inset--both" element + And I should see an "div.ct-campaign.ct-campaign--image-position-right" element + And I should see an "div.ct-campaign__content" element + And I should see an "div.ct-campaign__tags" element + And I should see an ".ct-campaign__date" element + And I should see the text "[TEST] Campaign title" + And I should see an "div.ct-campaign__title" element + And I should see an "div.ct-campaign__summary" element + And I should see an "div.ct-campaign__image-wrapper" element + And I should see the text "29 Apr 2021" + + @api @javascript + Scenario: CivicTheme page content type page can be viewed by anonymous with Campaign dark with no vertical spacing and left image + Given I am an anonymous user + And "field_c_n_components" in "civictheme_page" "node" with "title" of "[TEST] Page Campaign test 1" has "civictheme_campaign" paragraph: + | field_c_p_title | [TEST] Campaign title | + | field_c_p_theme | dark | + | field_c_p_summary | Summary text | + | field_c_p_vertical_spacing | 0 | + | field_c_p_date | 2022-06-30 | + | field_c_p_topic | [TEST] Topic 1 | + | field_c_p_image | [TEST] CivicTheme Image | + | field_c_p_image_position | left | + + When I visit "civictheme_page" "[TEST] Page Campaign test 1" + And I scroll to an element with id "main-content" + And I should see an "div.ct-campaign" element + And I should not see an "div.ct-campaign.ct-theme-light" element + And I should see an "div.ct-campaign.ct-theme-dark" element + And I should not see an "div.ct-campaign.ct-vertical-spacing-inset--both" element + And I should see an "div.ct-campaign.ct-campaign--image-position-left" element + And I should see an "div.ct-campaign__content" element + And I should see an "div.ct-campaign__tags" element + And I should see an ".ct-campaign__date" element + And I should see the text "[TEST] Campaign title" + And I should see an "div.ct-campaign__title" element + And I should see an "div.ct-campaign__summary" element + And I should see the text "30 Jun 2022" From 0c0e470f703b1b3a31bb13221fc2527bb9730926 Mon Sep 17 00:00:00 2001 From: Joshua Fernandes <83997348+joshua-salsadigital@users.noreply.github.com> Date: Wed, 19 Oct 2022 03:09:13 +0530 Subject: [PATCH 2/9] [CIVIC-1119] Added unit test for color classes. (#815) --- .../Unit/CivicthemeColorUtilityUnitTest.php | 105 ++++++++++++++++++ .../src/Unit/CivicthemeUtilityUnitTest.php | 47 ++++++++ 2 files changed, 152 insertions(+) create mode 100644 docroot/themes/contrib/civictheme/tests/src/Unit/CivicthemeColorUtilityUnitTest.php diff --git a/docroot/themes/contrib/civictheme/tests/src/Unit/CivicthemeColorUtilityUnitTest.php b/docroot/themes/contrib/civictheme/tests/src/Unit/CivicthemeColorUtilityUnitTest.php new file mode 100644 index 000000000..3add60c7b --- /dev/null +++ b/docroot/themes/contrib/civictheme/tests/src/Unit/CivicthemeColorUtilityUnitTest.php @@ -0,0 +1,105 @@ +assertEquals($expected, $actual); + } + + /** + * Data provider for testNormalizeHex(). + */ + public function dataProviderNormalizeHex() { + return [ + ['#00698f', FALSE, '00698f'], + ['#000', FALSE, '000000'], + ['fff', TRUE, 'ffffff'], + ['00698f', TRUE, '00698f'], + ['61daff', FALSE, '61daff'], + ]; + } + + /** + * Test for mix(). + * + * @dataProvider dataProviderMix + * @SuppressWarnings(PHPMD.StaticAccess) + */ + public function testMix($color, $mixer, $range, $expected) { + $actual = CivicthemeColorUtility::mix($color, $mixer, $range); + $this->assertEquals($expected, $actual); + } + + /** + * Data provider for testMix(). + */ + public function dataProviderMix() { + return [ + ['#00698f', '#000', '10', '#005e80'], + ['#00698f', '#000', '', '#00698f'], + ['#e6e9eb', '#fff', '80', '#fafafb'], + ]; + } + + /** + * Test for hexToRgb(). + * + * @dataProvider dataProviderHexToRgb + * @SuppressWarnings(PHPMD.StaticAccess) + */ + public function testHexToRgb($hex, $expected) { + $actual = CivicthemeColorUtility::hexToRgb($hex); + $this->assertEquals($expected, $actual); + } + + /** + * Data provider for testHexToRgb(). + */ + public function dataProviderHexToRgb() { + return [ + ['#00698f', [0, 105, 143]], + ['e6e9eb', [230, 233, 235]], + ]; + } + + /** + * Test for intToHex(). + * + * @dataProvider dataProviderIntToHex + * @SuppressWarnings(PHPMD.StaticAccess) + */ + public function testIntToHex($value, $expected) { + $actual = CivicthemeColorUtility::intToHex($value); + $this->assertEquals($expected, $actual); + } + + /** + * Data provider for testIntToHex(). + */ + public function dataProviderIntToHex() { + return [ + [124, '7c'], + [250, 'fa'], + [0, 00], + ]; + } + +} diff --git a/docroot/themes/contrib/civictheme/tests/src/Unit/CivicthemeUtilityUnitTest.php b/docroot/themes/contrib/civictheme/tests/src/Unit/CivicthemeUtilityUnitTest.php index 8e0f77240..1badfc876 100644 --- a/docroot/themes/contrib/civictheme/tests/src/Unit/CivicthemeUtilityUnitTest.php +++ b/docroot/themes/contrib/civictheme/tests/src/Unit/CivicthemeUtilityUnitTest.php @@ -129,4 +129,51 @@ public function dataProviderArrayToMultiline() { ]; } + /** + * Test for arrayMergeKeysValues(). + * + * @dataProvider dataProviderArrayMergeKeysValues + * @SuppressWarnings(PHPMD.StaticAccess) + */ + public function testArrayMergeKeysValues(array $array, $separator, $expected) { + $actual = CivicthemeUtility::arrayMergeKeysValues($array, $separator); + $this->assertEquals($expected, $actual); + } + + /** + * Data provider for testArrayMergeKeysValues(). + */ + public function dataProviderArrayMergeKeysValues() { + return [ + [[], ' ', []], + [['a', 'b'], ' ', ['0 a', '1 b']], + [[1, 2, 3], ' ', ['0 1', '1 2', '2 3']], + [['a', 2, 'd'], ' ', ['0 a', '1 2', '2 d']], + ]; + } + + /** + * Test for toLabel(). + * + * @dataProvider dataProviderToLabel + * @SuppressWarnings(PHPMD.StaticAccess) + */ + public function testToLabel($string, $expected) { + $actual = CivicthemeUtility::toLabel($string); + $this->assertEquals($expected, $actual); + } + + /** + * Data provider for testToLabel(). + */ + public function dataProviderToLabel() { + return [ + ['', ''], + ['hello', 'Hello'], + ['hello_world', 'Hello world'], + ['Hello earth', 'Hello earth'], + ['Hello-world', 'Hello-world'], + ]; + } + } From 5bb9375273ca7b4c49b28c10d68efb1fccf64362 Mon Sep 17 00:00:00 2001 From: Joshua Fernandes <83997348+joshua-salsadigital@users.noreply.github.com> Date: Mon, 24 Oct 2022 13:12:29 +0530 Subject: [PATCH 3/9] [CIVIC-1122] Fixed automated list pages 500 error. (#821) --- docroot/themes/contrib/civictheme/includes/views.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docroot/themes/contrib/civictheme/includes/views.inc b/docroot/themes/contrib/civictheme/includes/views.inc index 7fda10cc8..8b88faf77 100644 --- a/docroot/themes/contrib/civictheme/includes/views.inc +++ b/docroot/themes/contrib/civictheme/includes/views.inc @@ -311,7 +311,7 @@ function _civictheme_automated_list_preprocess_view($paragraph, ViewExecutable & $settings = [ 'theme' => civictheme_get_field_theme_value($paragraph), - 'content' => civictheme_get_field_value($paragraph, 'field_c_p_content'), + 'content' => civictheme_get_field_value($paragraph, 'field_c_p_content', TRUE), 'card_theme' => civictheme_get_field_value($paragraph, 'field_c_p_list_item_theme'), 'rows_header' => isset($view->header['result']) ? $view->header['result']->render() : NULL, 'link_above' => $link_above_data, From 38454f26baaa1e5abc7413a88f0f819c600ac4a4 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Mon, 24 Oct 2022 18:42:52 +1100 Subject: [PATCH 4/9] Update dependency drush/drush to v11.3.1 (#820) Co-authored-by: RenovateBot Self Hosted --- composer.lock | 95 ++++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/composer.lock b/composer.lock index 8f6d6830b..46d35fa43 100644 --- a/composer.lock +++ b/composer.lock @@ -680,16 +680,16 @@ }, { "name": "consolidation/annotated-command", - "version": "4.5.6", + "version": "4.5.7", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "3968070538761628546270935f0733a0cc408e1f" + "reference": "3785525bfc40d8230452f4c07db8a7bf0530d8f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/3968070538761628546270935f0733a0cc408e1f", - "reference": "3968070538761628546270935f0733a0cc408e1f", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/3785525bfc40d8230452f4c07db8a7bf0530d8f3", + "reference": "3785525bfc40d8230452f4c07db8a7bf0530d8f3", "shasum": "" }, "require": { @@ -730,27 +730,27 @@ "description": "Initialize Symfony Console commands from annotated command class methods.", "support": { "issues": "https://github.com/consolidation/annotated-command/issues", - "source": "https://github.com/consolidation/annotated-command/tree/4.5.6" + "source": "https://github.com/consolidation/annotated-command/tree/4.5.7" }, - "time": "2022-06-22T20:17:12+00:00" + "time": "2022-10-20T11:00:10+00:00" }, { "name": "consolidation/config", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "dae810c162f0e799ea3f35cc2f40b0797b6e4d26" + "reference": "597f8d7fbeef801736250ec10c3e190569b1b0ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/dae810c162f0e799ea3f35cc2f40b0797b6e4d26", - "reference": "dae810c162f0e799ea3f35cc2f40b0797b6e4d26", + "url": "https://api.github.com/repos/consolidation/config/zipball/597f8d7fbeef801736250ec10c3e190569b1b0ae", + "reference": "597f8d7fbeef801736250ec10c3e190569b1b0ae", "shasum": "" }, "require": { "dflydev/dot-access-data": "^1.1.0 || ^2 || ^3", - "grasmash/expander": "^2.0.1", + "grasmash/expander": "^2.0.1 || ^3", "php": ">=7.1.3", "symfony/event-dispatcher": "^4 || ^5 || ^6" }, @@ -790,9 +790,9 @@ "description": "Provide configuration services for a commandline tool.", "support": { "issues": "https://github.com/consolidation/config/issues", - "source": "https://github.com/consolidation/config/tree/2.1.1" + "source": "https://github.com/consolidation/config/tree/2.1.2" }, - "time": "2022-06-22T19:59:34+00:00" + "time": "2022-10-06T17:48:03+00:00" }, { "name": "consolidation/filter-via-dot-access-data", @@ -898,16 +898,16 @@ }, { "name": "consolidation/output-formatters", - "version": "4.2.2", + "version": "4.2.3", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "d57992bf81ead908ee21cd94b46ed65afa2e785b" + "reference": "cbb50cc86775f14972003f797b61e232788bee1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d57992bf81ead908ee21cd94b46ed65afa2e785b", - "reference": "d57992bf81ead908ee21cd94b46ed65afa2e785b", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/cbb50cc86775f14972003f797b61e232788bee1f", + "reference": "cbb50cc86775f14972003f797b61e232788bee1f", "shasum": "" }, "require": { @@ -951,9 +951,9 @@ "description": "Format text by applying transformations provided by plug-in formatters.", "support": { "issues": "https://github.com/consolidation/output-formatters/issues", - "source": "https://github.com/consolidation/output-formatters/tree/4.2.2" + "source": "https://github.com/consolidation/output-formatters/tree/4.2.3" }, - "time": "2022-02-13T15:28:30+00:00" + "time": "2022-10-17T04:01:40+00:00" }, { "name": "consolidation/robo", @@ -1111,22 +1111,24 @@ }, { "name": "consolidation/site-alias", - "version": "3.1.5", + "version": "3.1.7", "source": { "type": "git", "url": "https://github.com/consolidation/site-alias.git", - "reference": "ef2eb7d37e59b3d837b4556d4d8070cb345b378c" + "reference": "3b6519592c7e8557423f935806cd73adf69ed6c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-alias/zipball/ef2eb7d37e59b3d837b4556d4d8070cb345b378c", - "reference": "ef2eb7d37e59b3d837b4556d4d8070cb345b378c", + "url": "https://api.github.com/repos/consolidation/site-alias/zipball/3b6519592c7e8557423f935806cd73adf69ed6c7", + "reference": "3b6519592c7e8557423f935806cd73adf69ed6c7", "shasum": "" }, "require": { "consolidation/config": "^1.2.1 || ^2", "php": ">=5.5.0", - "symfony/finder": "~2.3 || ^3 || ^4.4 || ^5 || ^6" + "symfony/filesystem": "^4.4 || ^5.4 || ^6", + "symfony/finder": "~2.3 || ^3 || ^4.4 || ^5 || ^6", + "webmozart/path-util": "^2.3" }, "require-dev": { "php-coveralls/php-coveralls": "^2.4.2", @@ -1163,33 +1165,33 @@ "description": "Manage alias records for local and remote sites.", "support": { "issues": "https://github.com/consolidation/site-alias/issues", - "source": "https://github.com/consolidation/site-alias/tree/3.1.5" + "source": "https://github.com/consolidation/site-alias/tree/3.1.7" }, - "time": "2022-02-23T23:59:18+00:00" + "time": "2022-10-15T01:21:09+00:00" }, { "name": "consolidation/site-process", - "version": "4.2.0", + "version": "4.2.1", "source": { "type": "git", "url": "https://github.com/consolidation/site-process.git", - "reference": "9ef08d471573d6a56405b06ef6830dd70c883072" + "reference": "ee3bf69001694b2117cc2f96c2ef70d8d45f1234" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-process/zipball/9ef08d471573d6a56405b06ef6830dd70c883072", - "reference": "9ef08d471573d6a56405b06ef6830dd70c883072", + "url": "https://api.github.com/repos/consolidation/site-process/zipball/ee3bf69001694b2117cc2f96c2ef70d8d45f1234", + "reference": "ee3bf69001694b2117cc2f96c2ef70d8d45f1234", "shasum": "" }, "require": { - "consolidation/config": "^1.2.1|^2", - "consolidation/site-alias": "^3", + "consolidation/config": "^1.2.1 || ^2", + "consolidation/site-alias": "^3 || ^4", "php": ">=7.1.3", - "symfony/console": "^2.8.52|^3|^4.4|^5", - "symfony/process": "^4.3.4|^5" + "symfony/console": "^2.8.52 || ^3 || ^4.4 || ^5", + "symfony/process": "^4.3.4 || ^5" }, "require-dev": { - "phpunit/phpunit": "^7.5.20|^8.5.14", + "phpunit/phpunit": "^7.5.20 || ^8.5.14", "squizlabs/php_codesniffer": "^3", "yoast/phpunit-polyfills": "^0.2.0" }, @@ -1221,9 +1223,9 @@ "description": "A thin wrapper around the Symfony Process Component that allows applications to use the Site Alias library to specify the target for a remote call.", "support": { "issues": "https://github.com/consolidation/site-process/issues", - "source": "https://github.com/consolidation/site-process/tree/4.2.0" + "source": "https://github.com/consolidation/site-process/tree/4.2.1" }, - "time": "2022-02-19T04:09:55+00:00" + "time": "2022-10-18T13:19:35+00:00" }, { "name": "cweagans/composer-patches", @@ -9633,16 +9635,16 @@ }, { "name": "drush/drush", - "version": "11.2.1", + "version": "11.3.1", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "95123e003c96f4c57299fa277ef60457041cae1a" + "reference": "77056760e59564a2edcc6c12eb483adc3cc302bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/95123e003c96f4c57299fa277ef60457041cae1a", - "reference": "95123e003c96f4c57299fa277ef60457041cae1a", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/77056760e59564a2edcc6c12eb483adc3cc302bb", + "reference": "77056760e59564a2edcc6c12eb483adc3cc302bb", "shasum": "" }, "require": { @@ -9652,7 +9654,7 @@ "consolidation/config": "^2", "consolidation/filter-via-dot-access-data": "^2", "consolidation/robo": "^3.0.9 || ^4.0.1", - "consolidation/site-alias": "^3.1.3", + "consolidation/site-alias": "^3.1.6 || ^4", "consolidation/site-process": "^4.1.3 || ^5", "enlightn/security-checker": "^1", "ext-dom": "*", @@ -9661,12 +9663,12 @@ "php": ">=7.4", "psy/psysh": "~0.11", "symfony/event-dispatcher": "^4.0 || ^5.0 || ^6.0", + "symfony/filesystem": "^4.4 || ^5.4", "symfony/finder": "^4.0 || ^5 || ^6", "symfony/polyfill-php80": "^1.23", "symfony/var-dumper": "^4.0 || ^5.0 || ^6.0", "symfony/yaml": "^4.0 || ^5.0 || ^6.0", - "webflo/drupal-finder": "^1.2", - "webmozart/path-util": "^2.1.0" + "webflo/drupal-finder": "^1.2" }, "conflict": { "drupal/core": "< 9.2", @@ -9764,10 +9766,9 @@ "homepage": "http://www.drush.org", "support": { "forum": "http://drupal.stackexchange.com/questions/tagged/drush", - "irc": "irc://irc.freenode.org/drush", "issues": "https://github.com/drush-ops/drush/issues", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/drush-ops/drush/tree/11.2.1" + "source": "https://github.com/drush-ops/drush/tree/11.3.1" }, "funding": [ { @@ -9775,7 +9776,7 @@ "type": "github" } ], - "time": "2022-09-23T17:35:58+00:00" + "time": "2022-10-23T00:29:10+00:00" }, { "name": "egulias/email-validator", From 1ebc448f05d0daf20ef99446e4d5134aeb07b73c Mon Sep 17 00:00:00 2001 From: Nick Georgiou Date: Mon, 24 Oct 2022 17:43:17 +1000 Subject: [PATCH 5/9] [CIVIC] Fix list typo in Drupal template. (#816) * Fix list typo in Drupal template. * Update list.twig --- .../civictheme_library/components/03-organisms/list/list.twig | 2 +- .../paragraphs/paragraph--civictheme-manual-list.html.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/list/list.twig b/docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/list/list.twig index e31882f4a..7510b3e22 100644 --- a/docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/list/list.twig +++ b/docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/list/list.twig @@ -85,7 +85,7 @@ {% endif %} {% endblock %} - {% block List %} + {% block list %} {% block filters %} {% if filters -%} diff --git a/docroot/themes/contrib/civictheme/templates/paragraphs/paragraph--civictheme-manual-list.html.twig b/docroot/themes/contrib/civictheme/templates/paragraphs/paragraph--civictheme-manual-list.html.twig index b5754d5ba..b26078635 100644 --- a/docroot/themes/contrib/civictheme/templates/paragraphs/paragraph--civictheme-manual-list.html.twig +++ b/docroot/themes/contrib/civictheme/templates/paragraphs/paragraph--civictheme-manual-list.html.twig @@ -8,7 +8,7 @@ {% block rows %} {% if rows -%} -
+
{% include '@base/item-grid/item-grid.twig' with { title: title, column_count: column_count, From a2511d78a41ef2ad00972ac88f010127d9f89727 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Mon, 24 Oct 2022 18:43:46 +1100 Subject: [PATCH 6/9] Update All Contrib (#818) Co-authored-by: RenovateBot Self Hosted --- composer.lock | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 46d35fa43..e63456131 100644 --- a/composer.lock +++ b/composer.lock @@ -5298,6 +5298,10 @@ "GPL-2.0-or-later" ], "authors": [ + { + "name": "eleonel", + "homepage": "https://www.drupal.org/user/440810" + }, { "name": "kyberman", "homepage": "https://www.drupal.org/user/402924" @@ -5740,6 +5744,10 @@ "name": "Alexander Ross (bleen)", "homepage": "https://www.drupal.org/u/bleen", "role": "Maintainer" + }, + { + "name": "Rajeshreeputra", + "homepage": "https://www.drupal.org/user/3418561" } ], "description": "Focal Point allows content creators to mark the most important part of an image for easier cropping.", @@ -6936,22 +6944,22 @@ "name": "Dave Reid", "homepage": "https://www.drupal.org/user/53892" }, - { - "name": "JohnAlbin", - "homepage": "https://www.drupal.org/user/32095" - }, - { - "name": "RenatoG", - "homepage": "https://www.drupal.org/user/3326031" - }, { "name": "joelpittet", "homepage": "https://www.drupal.org/user/160302" }, + { + "name": "JohnAlbin", + "homepage": "https://www.drupal.org/user/32095" + }, { "name": "kim.pepper", "homepage": "https://www.drupal.org/user/370574" }, + { + "name": "RenatoG", + "homepage": "https://www.drupal.org/user/3326031" + }, { "name": "rrrob", "homepage": "https://www.drupal.org/user/273533" From 867912b2832115109a5bd07944f6b66313c395ac Mon Sep 17 00:00:00 2001 From: Joshua Fernandes <83997348+joshua-salsadigital@users.noreply.github.com> Date: Mon, 24 Oct 2022 13:14:16 +0530 Subject: [PATCH 7/9] Fixed missing plain text plugin error logs. (#822) --- .../node/0ba446a2-c1ce-4c8e-a20d-0d9ae5949aca.yml | 6 +++--- .../node/1accbc91-68c8-4a86-a973-b7120ce05c9c.yml | 6 +++--- .../node/2cb01445-7f3f-4aca-9451-6d26a6032100.yml | 8 ++++---- .../node/4d273ca8-0889-4e43-8edd-73fcb4ed8340.yml | 4 ++-- .../node/5750f380-5fb2-484a-8f78-9e1fa1749c32.yml | 8 ++++---- .../node/583e8b18-8156-415c-a80e-4dbf564d5f99.yml | 10 +++++----- .../node/5a7cc060-cdf5-4097-8dce-15a0c7270f98.yml | 6 +++--- .../node/60ac1244-9ada-43d3-a534-4e54086cc29e.yml | 8 ++++---- .../node/78160c95-cb6d-4321-9aba-2118aff8fc59.yml | 8 ++++---- .../node/91452662-e67a-4c74-aabc-bf37d25d43d8.yml | 6 +++--- .../node/a0539fd0-ef51-47c9-a47b-e08199052f1e.yml | 6 +++--- .../node/afb3e47d-409f-47c9-b5cc-0bbb00531e19.yml | 4 ++-- 12 files changed, 40 insertions(+), 40 deletions(-) diff --git a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/0ba446a2-c1ce-4c8e-a20d-0d9ae5949aca.yml b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/0ba446a2-c1ce-4c8e-a20d-0d9ae5949aca.yml index bf332c3d7..c471519b1 100644 --- a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/0ba446a2-c1ce-4c8e-a20d-0d9ae5949aca.yml +++ b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/0ba446a2-c1ce-4c8e-a20d-0d9ae5949aca.yml @@ -88,7 +88,7 @@ default: Causa conventio defui erat lobortis proprius ut. Accumsan antehabeo eros eum immitto incassum magna nibh quae. Neo occuro typicus veniam. Defui ea gemino quia tincidunt verto. Ea eros eu euismod nutus refero usitas. At dolus et gilvus humo iustum occuro refero secundum vel. Aliquam blandit dolor metuo veniam. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -153,7 +153,7 @@ default: Illum immitto importunus lenis loquor pneum quibus si vero volutpat. Accumsan eum in ratis valetudo. Abluo quadrum suscipit. Importunus nostrud quia tation. Antehabeo cui dolore refoveo velit. Hendrerit humo macto magna saepius. Dolus ea metuo nisl quadrum quia. Appellatio ea interdico persto saluto valde venio. Amet consequat jumentum. Appellatio bene commodo ex quis turpis vulputate. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -208,7 +208,7 @@ default: Autem gemino hos lucidus nostrud populus singularis ullamcorper. Haero patria paulatim quia. Cui et lobortis patria praemitto praesent ratis sino suscipit. Conventio olim quia singularis sudo. Ex pertineo ratis typicus validus vel. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark diff --git a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/1accbc91-68c8-4a86-a973-b7120ce05c9c.yml b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/1accbc91-68c8-4a86-a973-b7120ce05c9c.yml index b95bb6e7c..221f3095c 100644 --- a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/1accbc91-68c8-4a86-a973-b7120ce05c9c.yml +++ b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/1accbc91-68c8-4a86-a973-b7120ce05c9c.yml @@ -88,7 +88,7 @@ default: Bene erat oppeto quis utinam velit venio. At nibh refoveo vereor. Diam pecus saluto. Accumsan bene consectetuer enim gravis illum ratis refero turpis. Diam immitto incassum magna patria sit. Autem caecus facilisis pala refero turpis vicis voco vulpes. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -153,7 +153,7 @@ default: Defui eros iriure iustum. Adipiscing at capto diam letalis natu suscipere utrum venio. Abbas abico ad at minim quia quibus. Amet bene brevitas caecus gilvus sagaciter utinam. Consectetuer ea iusto vulputate. Facilisi nibh ratis wisi. Gilvus plaga singularis te turpis. Abdo causa ideo jumentum modo usitas vero vulpes. Abluo aliquam at commodo esca humo probo tincidunt. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -208,7 +208,7 @@ default: Acsi exerci iaceo illum jus quibus typicus utrum valde. Acsi commoveo facilisi ideo inhibeo natu sit uxor venio. Damnum iaceo incassum loquor natu refero si tincidunt turpis valetudo. Antehabeo commoveo consequat imputo jugis obruo pagus proprius refero voco. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark diff --git a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/2cb01445-7f3f-4aca-9451-6d26a6032100.yml b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/2cb01445-7f3f-4aca-9451-6d26a6032100.yml index 124f881e5..5c328d898 100644 --- a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/2cb01445-7f3f-4aca-9451-6d26a6032100.yml +++ b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/2cb01445-7f3f-4aca-9451-6d26a6032100.yml @@ -88,7 +88,7 @@ default: Consequat gilvus mauris oppeto sed suscipere utrum. Huic immitto molior nunc quibus si tego turpis. Elit esca euismod huic iusto nostrud si sudo verto zelus. Aliquip facilisi immitto jus oppeto. Letalis modo nulla praemitto proprius. Genitus importunus quis turpis. Aliquam enim zelus. Augue huic magna pagus sagaciter vicis virtus. Abico adipiscing causa iustum meus os validus volutpat wisi zelus. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -153,7 +153,7 @@ default: Genitus odio pagus saepius. Cogo gilvus mauris modo olim. Exputo pneum turpis. Defui eum hos humo melior obruo tation voco zelus. Ullamcorper utrum valde vicis. Dignissim haero ibidem os pala te tego voco. Comis decet diam et laoreet sino utrum. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -208,7 +208,7 @@ default: Causa inhibeo iriure nibh sagaciter usitas. Gravis illum neque nobis quis suscipere vindico. Blandit commoveo consectetuer euismod eum haero laoreet sit sudo. Antehabeo cogo lucidus validus. Brevitas iriure nunc. Adipiscing at dolor fere humo interdico quis ratis vero wisi. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -263,7 +263,7 @@ default: Distineo genitus lenis letalis nunc pneum quia ulciscor. Duis immitto pala quae. Incassum paulatim sed. Loquor lucidus nulla quadrum. At obruo si tamen. Caecus camur cui iustum melior natu secundum tego. Abico exerci importunus iusto jus nunc patria utinam vicis vulpes. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light diff --git a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/4d273ca8-0889-4e43-8edd-73fcb4ed8340.yml b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/4d273ca8-0889-4e43-8edd-73fcb4ed8340.yml index ee3d6741c..2af532111 100644 --- a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/4d273ca8-0889-4e43-8edd-73fcb4ed8340.yml +++ b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/4d273ca8-0889-4e43-8edd-73fcb4ed8340.yml @@ -88,7 +88,7 @@ default: Antehabeo augue elit esse inhibeo paulatim refero refoveo wisi. Causa ex populus quidne roto verto. Consequat euismod probo roto vel virtus vulputate zelus. Ad illum immitto olim. Augue exerci pertineo probo proprius voco. At diam dignissim letalis nulla obruo odio quidem utinam. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -153,7 +153,7 @@ default: Dolus facilisi mauris nulla tamen tego veniam. Distineo duis exerci gemino iriure te tego utinam. Defui huic importunus mauris scisco. Accumsan cogo feugiat humo interdico lucidus nunc scisco wisi zelus. Enim facilisis illum quadrum. Defui erat gilvus imputo in interdico nimis premo si. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark diff --git a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/5750f380-5fb2-484a-8f78-9e1fa1749c32.yml b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/5750f380-5fb2-484a-8f78-9e1fa1749c32.yml index d2b64b031..d2e7ea4eb 100644 --- a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/5750f380-5fb2-484a-8f78-9e1fa1749c32.yml +++ b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/5750f380-5fb2-484a-8f78-9e1fa1749c32.yml @@ -88,7 +88,7 @@ default: Ea interdico sino usitas veniam. At commoveo cui dolor iustum modo tego usitas utrum. Dignissim inhibeo mauris obruo ratis. Enim iusto jumentum occuro os vel. Consectetuer decet zelus. Eros incassum tincidunt. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -153,7 +153,7 @@ default: Pecus saluto valetudo. Aliquam augue capto damnum incassum nulla quia quidem. Blandit camur minim molior nostrud nulla quae suscipit tincidunt ulciscor. Abdo aliquip distineo eligo genitus ille pecus singularis sit verto. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -208,7 +208,7 @@ default: Ex nunc plaga quia. Abbas capto eu hendrerit inhibeo quidem typicus vereor voco. Iriure loquor modo pertineo premo qui sed venio. Abico brevitas elit lobortis quae quia ratis usitas volutpat. Appellatio commodo consectetuer nobis premo vulpes wisi zelus. Antehabeo augue facilisi populus praemitto quibus quis utinam vulputate. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -263,7 +263,7 @@ default: Abbas brevitas commodo eligo lucidus molior mos quidne ulciscor. Paulatim ulciscor velit volutpat. Jumentum laoreet ludus scisco secundum sino tamen turpis voco. Antehabeo aptent commoveo exerci hos pagus torqueo veniam vulpes. Brevitas defui feugiat hendrerit jugis macto patria quia saluto. Causa elit facilisi lenis persto rusticus sagaciter scisco tum ymo. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light diff --git a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/583e8b18-8156-415c-a80e-4dbf564d5f99.yml b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/583e8b18-8156-415c-a80e-4dbf564d5f99.yml index 9a7344fce..db922f82c 100644 --- a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/583e8b18-8156-415c-a80e-4dbf564d5f99.yml +++ b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/583e8b18-8156-415c-a80e-4dbf564d5f99.yml @@ -88,7 +88,7 @@ default: Dolor euismod facilisis hos magna. Abbas comis laoreet pagus qui sit tamen uxor velit. Abigo bene consectetuer cui haero ille laoreet meus nutus pagus. Immitto paulatim refoveo. Abico luptatum si volutpat. Abigo caecus conventio eum nibh sagaciter. Decet duis jus pneum. Brevitas commoveo distineo dolus incassum iustum minim mos ulciscor volutpat. Diam illum nimis similis utrum. Ea gravis natu paratus vero. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -143,7 +143,7 @@ default: Augue brevitas capto lenis occuro probo torqueo vulpes. Enim neque nisl nulla uxor. Abdo augue eligo iaceo iusto oppeto plaga vulpes wisi. Acsi elit erat exputo inhibeo ludus luptatum paulatim venio. Caecus cogo comis huic secundum si. Cui jugis jus lenis paratus quia ratis. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -198,7 +198,7 @@ default: Aptent erat esse eum ideo importunus proprius saepius. Abbas diam dolus humo suscipere tum verto virtus. Ille laoreet os quidem valetudo virtus volutpat. Abdo cogo ex gemino iaceo ideo premo suscipere valetudo volutpat. Defui diam ideo jus qui quibus saepius sagaciter torqueo. Ex roto scisco. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -263,7 +263,7 @@ default: Decet exputo gemino gilvus ille iustum proprius si sino ymo. Abigo accumsan jumentum neque nulla nunc olim os ullamcorper vicis. Amet feugiat gemino humo mos uxor. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -318,7 +318,7 @@ default: Commodo duis oppeto. Abico appellatio fere ideo singularis vulputate. Consectetuer dolor euismod gemino modo nutus qui quis vindico. Causa hos metuo refoveo te. Amet imputo luctus macto proprius qui ratis torqueo valde. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark diff --git a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/5a7cc060-cdf5-4097-8dce-15a0c7270f98.yml b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/5a7cc060-cdf5-4097-8dce-15a0c7270f98.yml index 5cc1ff62d..a3ebc6eae 100644 --- a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/5a7cc060-cdf5-4097-8dce-15a0c7270f98.yml +++ b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/5a7cc060-cdf5-4097-8dce-15a0c7270f98.yml @@ -88,7 +88,7 @@ default: Cogo facilisis lucidus molior nutus oppeto premo. Aliquip magna natu praesent te. Caecus cogo consectetuer dolus ideo ille interdico si ulciscor virtus. Et exputo gemino natu occuro quibus. At autem eros immitto tego wisi. Aliquip exputo pagus pertineo sagaciter. Consequat incassum luctus vicis. Capto fere magna te. Augue consectetuer loquor paulatim pertineo quidne saepius secundum ulciscor. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -143,7 +143,7 @@ default: Aliquip diam facilisi jus mos pala rusticus sino sit. Abico exputo imputo jus luctus meus pagus similis sit velit. Consequat decet exerci iaceo oppeto pagus pecus singularis veniam vero. Aptent distineo facilisis immitto luptatum nibh nimis refoveo suscipere vulputate. Sed sudo tego venio zelus. Comis hendrerit patria vindico ymo. Autem distineo laoreet loquor nostrud. Accumsan ad duis praesent valetudo ymo. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -208,7 +208,7 @@ default: Iaceo illum meus singularis venio. Erat facilisis luctus secundum suscipit validus vel volutpat. Appellatio dolor dolus huic ille iriure lenis nutus olim tamen. Abluo commoveo distineo gravis lenis luctus luptatum olim quibus suscipere. Erat facilisis vel verto. Consectetuer suscipit typicus. Abigo ad amet eros ille mos praemitto tincidunt utrum. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark diff --git a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/60ac1244-9ada-43d3-a534-4e54086cc29e.yml b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/60ac1244-9ada-43d3-a534-4e54086cc29e.yml index 6023dab86..5fcda921f 100644 --- a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/60ac1244-9ada-43d3-a534-4e54086cc29e.yml +++ b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/60ac1244-9ada-43d3-a534-4e54086cc29e.yml @@ -88,7 +88,7 @@ default: Ludus praesent ut. Camur conventio refoveo virtus. Causa ea esca imputo sudo suscipere virtus vulputate. Cui esse haero lucidus mauris roto saluto sit typicus. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -143,7 +143,7 @@ default: Distineo enim exerci gilvus luctus melior quia quidne sed. Iaceo immitto laoreet quis. Aliquam cogo comis genitus huic ullamcorper ut vicis. Eum magna modo neque persto vereor vicis ymo. Abluo amet esca oppeto secundum virtus vulpes ymo. Accumsan duis haero jumentum pagus vulputate. Aliquam iustum loquor melior premo vel velit. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -208,7 +208,7 @@ default: Ideo in mos pagus plaga quae rusticus vicis. Decet ille metuo si. Abluo aptent euismod quidne. Adipiscing duis ex exputo haero huic iusto sino verto. Consequat natu pala quadrum suscipit tum veniam virtus. Et eu huic occuro pala vereor verto. Abico commodo ea facilisi feugiat melior pala quis saluto vindico. Abico ad ex exerci ideo iustum metuo nimis nostrud probo. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -263,7 +263,7 @@ default: Capto consequat euismod humo ideo turpis utinam. Ad blandit mauris odio refoveo sudo te. Mos quis similis utrum. Conventio haero huic metuo meus nimis sagaciter similis validus ymo. Autem diam os paratus quidne uxor venio vereor. Acsi hendrerit melior modo ratis sit. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark diff --git a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/78160c95-cb6d-4321-9aba-2118aff8fc59.yml b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/78160c95-cb6d-4321-9aba-2118aff8fc59.yml index 36685bfb0..7f6fa7ce0 100644 --- a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/78160c95-cb6d-4321-9aba-2118aff8fc59.yml +++ b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/78160c95-cb6d-4321-9aba-2118aff8fc59.yml @@ -88,7 +88,7 @@ default: Genitus gilvus letalis ludus te usitas. Antehabeo cogo commodo ille luptatum metuo pneum vicis. Abbas imputo lenis meus quadrum. Aliquam macto probo similis utrum validus. Eum natu pertineo praesent quadrum quia tamen tation vulpes. Comis interdico pecus quibus. Esca quae si valetudo ymo. Camur exerci gravis pecus saluto tum. Abluo appellatio commodo esca iusto refero singularis validus virtus. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -153,7 +153,7 @@ default: Comis ea et quae rusticus utrum. Imputo neo nostrud ratis saluto suscipit ullamcorper. Abico aliquip commoveo saluto. Dolus refoveo utrum. Commoveo lucidus melior pneum quidne. Camur erat nisl probo sagaciter. Aliquam feugiat praemitto. Adipiscing iriure jus lenis nibh qui utinam. Dignissim ille letalis nimis nutus. Dignissim hos in jus torqueo turpis virtus. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -208,7 +208,7 @@ default: Adipiscing antehabeo jus. Amet augue luctus mauris nisl quidem refero secundum tamen veniam. Causa dolore enim neo pala paulatim probo refoveo sino vereor. Dignissim dolore ea minim patria quibus refoveo sed valetudo vicis. Blandit distineo dolus eu immitto laoreet nimis patria pecus quibus. Autem consectetuer damnum ea inhibeo iriure ludus obruo. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -263,7 +263,7 @@ default: Augue autem comis conventio fere rusticus sudo ut vero. Accumsan consequat eligo humo in pagus pecus vel. Commoveo diam laoreet nisl pagus saepius tincidunt vulpes. Amet camur eros haero letalis lobortis neque proprius te. Autem ea macto quidne ratis utrum vulputate. Commoveo cui humo inhibeo meus nostrud obruo proprius sudo venio. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark diff --git a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/91452662-e67a-4c74-aabc-bf37d25d43d8.yml b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/91452662-e67a-4c74-aabc-bf37d25d43d8.yml index 31d2d0202..0a07d88cc 100644 --- a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/91452662-e67a-4c74-aabc-bf37d25d43d8.yml +++ b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/91452662-e67a-4c74-aabc-bf37d25d43d8.yml @@ -88,7 +88,7 @@ default: Adipiscing camur gilvus occuro pecus qui quibus te. At hendrerit suscipere ullamcorper. Abluo bene pecus turpis vicis. Brevitas consequat laoreet luptatum olim turpis ut verto. Abbas commoveo magna ullamcorper valde vero. Loquor quidne refoveo tation zelus. Aliquam distineo feugiat iaceo melior turpis vereor voco ymo. Ad cogo erat eu. Camur cogo conventio et exerci iustum luctus ludus nutus praesent. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark @@ -153,7 +153,7 @@ default: Autem caecus importunus suscipere vereor. Ibidem immitto paratus plaga sed sit ulciscor. Nibh quia quis tation. Abigo huic metuo molior similis vero vicis. Abdo aptent distineo neo quis refero si validus. Abbas iustum modo paulatim tamen. Cogo genitus magna nutus quadrum. Antehabeo aptent elit in praesent turpis utrum uxor. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -208,7 +208,7 @@ default: Damnum ea laoreet nunc usitas voco. Amet esse populus sudo. Tation typicus uxor venio. Acsi dignissim interdico iusto meus paratus persto tum. Pagus qui suscipere. Fere humo iaceo jus magna paulatim secundum tation. Esca jumentum mauris quidne torqueo. Blandit esse humo vereor vicis. Aliquip at bene odio populus praemitto ratis tation te vel. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light diff --git a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/a0539fd0-ef51-47c9-a47b-e08199052f1e.yml b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/a0539fd0-ef51-47c9-a47b-e08199052f1e.yml index 499b8b6de..9d1957b25 100644 --- a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/a0539fd0-ef51-47c9-a47b-e08199052f1e.yml +++ b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/a0539fd0-ef51-47c9-a47b-e08199052f1e.yml @@ -88,7 +88,7 @@ default: Immitto jumentum macto melior premo scisco venio wisi. Diam ea loquor magna nutus. Acsi dolor erat esca ludus neque nostrud probo quidne. Aliquip bene neo occuro oppeto refoveo singularis velit vulputate. Abigo ad enim esca persto vel. Enim eum ex inhibeo lenis neo neque os tincidunt. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -153,7 +153,7 @@ default: Abdo mauris obruo os probo quia vero. Aliquip enim praesent usitas valde. Immitto modo turpis. Accumsan dolor exputo facilisis imputo lucidus quidem zelus. Antehabeo dolus laoreet nunc nutus paulatim pertineo quae quidne quis. Abdo huic iriure jugis lobortis rusticus tation. Augue exerci feugiat imputo incassum nimis os quadrum quidem secundum. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -208,7 +208,7 @@ default: Abico aliquam causa facilisis genitus huic mos plaga refoveo uxor. Dolor exputo metuo sino vero zelus. Abico abigo erat iriure olim paulatim. Adipiscing aliquip diam ea facilisis nunc nutus vulpes. Iriure jus metuo minim nimis obruo. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: dark diff --git a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/afb3e47d-409f-47c9-b5cc-0bbb00531e19.yml b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/afb3e47d-409f-47c9-b5cc-0bbb00531e19.yml index 511e37199..280091deb 100644 --- a/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/afb3e47d-409f-47c9-b5cc-0bbb00531e19.yml +++ b/docroot/modules/custom/civictheme_content/modules/civictheme_content_default/content/node/afb3e47d-409f-47c9-b5cc-0bbb00531e19.yml @@ -88,7 +88,7 @@ default: Abico antehabeo bene duis lobortis nibh pagus praesent valde. Camur diam pertineo tamen te. Decet in minim nostrud quidne voco ymo. Aptent euismod huic luctus odio paulatim populus praemitto sino. Ex meus praemitto praesent premo. Bene quia veniam. Causa facilisis ille jus nutus pecus plaga vulputate. Fere hendrerit molior neque praesent. Gilvus macto saluto. Esse nostrud sit tamen tum vindico voco. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light @@ -153,7 +153,7 @@ default: Abbas autem bene cui damnum gravis jumentum neo wisi. Brevitas ea iustum jumentum refero valetudo. Autem brevitas facilisis incassum iusto letalis molior valde. Dolore lucidus magna. Accumsan appellatio at autem luptatum tation zelus. - format: plain_text + format: civictheme_plain_text field_c_p_theme: - value: light From 5407ff80ca94a1491ec40b0090a3a3a787d06861 Mon Sep 17 00:00:00 2001 From: Nick Georgiou Date: Mon, 24 Oct 2022 17:44:37 +1000 Subject: [PATCH 8/9] [CIVIC] Fix next steps variable, added missing default rules. (#817) * Update _variables.components.scss * Variable cleanup. --- .../00-base/_variables.components.scss | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/_variables.components.scss b/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/_variables.components.scss index d0e67da21..3eaa2abb0 100644 --- a/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/_variables.components.scss +++ b/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/_variables.components.scss @@ -120,7 +120,7 @@ $ct-button-light-secondary-border-color: ct-color-light('interaction-background' $ct-button-light-secondary-color: $ct-button-light-secondary-border-color !default; $ct-button-light-secondary-hover-background-color: $ct-button-light-secondary-background-color !default; $ct-button-light-secondary-hover-border-color: ct-color-light('interaction-hover-background') !default; -$ct-button-light-secondary-hover-color: $ct-button-light-secondary-hover-border-color; +$ct-button-light-secondary-hover-color: $ct-button-light-secondary-hover-border-color !default; $ct-button-light-secondary-visited-background-color: $ct-button-light-secondary-background-color !default; $ct-button-light-secondary-visited-border-color: $ct-button-light-secondary-border-color !default; $ct-button-light-secondary-visited-color: $ct-button-light-secondary-color !default; @@ -136,7 +136,7 @@ $ct-button-dark-secondary-border-color: ct-color-dark('interaction-background') $ct-button-dark-secondary-color: $ct-button-dark-secondary-border-color !default; $ct-button-dark-secondary-hover-background-color: $ct-button-dark-secondary-background-color !default; $ct-button-dark-secondary-hover-border-color: ct-color-dark('interaction-hover-background') !default; -$ct-button-dark-secondary-hover-color: $ct-button-dark-secondary-hover-border-color; +$ct-button-dark-secondary-hover-color: $ct-button-dark-secondary-hover-border-color !default; $ct-button-dark-secondary-visited-background-color: $ct-button-dark-secondary-background-color !default; $ct-button-dark-secondary-visited-border-color: $ct-button-dark-secondary-border-color !default; $ct-button-dark-secondary-visited-color: $ct-button-dark-secondary-color !default; @@ -154,7 +154,7 @@ $ct-button-light-tertiary-border-color: $ct-button-light-tertiary-background-col $ct-button-light-tertiary-color: ct-color-light('interaction-background') !default; $ct-button-light-tertiary-hover-background-color: $ct-button-light-tertiary-background-color !default; $ct-button-light-tertiary-hover-border-color: $ct-button-light-tertiary-border-color !default; -$ct-button-light-tertiary-hover-color: ct-color-light('interaction-hover-background'); +$ct-button-light-tertiary-hover-color: ct-color-light('interaction-hover-background') !default; $ct-button-light-tertiary-visited-background-color: $ct-button-light-tertiary-background-color !default; $ct-button-light-tertiary-visited-border-color: $ct-button-light-tertiary-border-color !default; $ct-button-light-tertiary-visited-color: $ct-button-light-tertiary-color !default; @@ -170,7 +170,7 @@ $ct-button-dark-tertiary-border-color: $ct-button-dark-tertiary-background-color $ct-button-dark-tertiary-color: ct-color-dark('interaction-background') !default; $ct-button-dark-tertiary-hover-background-color: $ct-button-dark-tertiary-background-color !default; $ct-button-dark-tertiary-hover-border-color: $ct-button-dark-tertiary-border-color !default; -$ct-button-dark-tertiary-hover-color: ct-color-dark('interaction-hover-background'); +$ct-button-dark-tertiary-hover-color: ct-color-dark('interaction-hover-background') !default; $ct-button-dark-tertiary-visited-background-color: $ct-button-dark-tertiary-background-color !default; $ct-button-dark-tertiary-visited-border-color: $ct-button-dark-tertiary-border-color !default; $ct-button-dark-tertiary-visited-color: $ct-button-dark-tertiary-color !default; @@ -364,7 +364,7 @@ $ct-content-link-dark-visited-hover-border-color: ct-color-dark('interaction-foc // // Link. // -$ct-link-icon-external: url('#{$ct-assets-directory}icons/Arrows/Upper Right Arrow.svg'); +$ct-link-icon-external: url('#{$ct-assets-directory}icons/Arrows/Upper Right Arrow.svg') !default; $ct-link-light-color: ct-color-light('interaction-background') !default; $ct-link-light-hover-color: ct-color-light('interaction-hover-background') !default; $ct-link-light-visited-color: $ct-link-light-color !default; @@ -524,7 +524,7 @@ $ct-basic-content-dark-wrapper-background-color: ct-color-dark('background') !de // Callout. // $ct-callout-border-radius: $ct-border-radius !default; -$ct-callout-stripe-width: ct-particle(0.75); +$ct-callout-stripe-width: ct-particle(0.75) !default; $ct-callout-light-background-color: ct-color-light('background') !default; $ct-callout-light-heading-color: ct-color-light('heading') !default; $ct-callout-light-summary-color: ct-color-light('body') !default; @@ -673,10 +673,10 @@ $ct-service-card-dark-heading-color: ct-color-dark('heading') !default; // Cards/Subject card. // $ct-subject-card-border-radius: $ct-border-radius !default; -$ct-subject-card-image-height-desktop: ct-particle(28); -$ct-subject-card-image-height-mobile: ct-particle(20); -$ct-subject-card-image-width-desktop: auto; -$ct-subject-card-image-width-mobile: auto; +$ct-subject-card-image-height-desktop: ct-particle(28) !default; +$ct-subject-card-image-height-mobile: ct-particle(20) !default; +$ct-subject-card-image-width-desktop: auto !default; +$ct-subject-card-image-width-mobile: auto !default; $ct-subject-card-light-active-color: ct-color-light('body') !default; $ct-subject-card-light-color: ct-color-light('interaction-background') !default; $ct-subject-card-light-hover-color: ct-color-light('interaction-hover-background') !default; @@ -737,7 +737,7 @@ $ct-group-filter-dark-selected-filters-title-color: ct-color-dark('background') // // Logo. // -$ct-logo-breakpoint: 'm'; +$ct-logo-breakpoint: 'm' !default; $ct-logo-image-width-min-mobile: ct-particle(25) !default; $ct-logo-image-width-max-mobile: ct-particle(30) !default; $ct-logo-image-width-min-desktop: ct-particle(25) !default; @@ -759,7 +759,7 @@ $ct-map-dark-wrapper-background-color: ct-color-dark('background') !default; // Next steps. // $ct-next-steps-border-radius: $ct-border-radius !default; -$ct-next-steps-stripe-width: rem(6px); +$ct-next-steps-stripe-width: ct-particle(0.75) !default; $ct-next-steps-light-active-color: ct-color-light('body') !default; $ct-next-steps-light-background-color: ct-color-light('background-light') !default; $ct-next-steps-light-border-color: ct-color-light('border-light') !default; @@ -819,14 +819,14 @@ $ct-table-of-contents-dark-title-color: ct-color-dark('heading') !default; // Tabs. // $ct-tabs-link-border-radius: $ct-border-radius * 2 !default; -$ct-tabs-light-links-stripe-border-color: ct-color-light('border-light'); +$ct-tabs-light-links-stripe-border-color: ct-color-light('border-light') !default; $ct-tabs-light-links-background-color: ct-color-light('background') !default; $ct-tabs-light-links-border-color: ct-color-light('border-light') !default; $ct-tabs-light-links-active-background-color: ct-color-light('background-light') !default; $ct-tabs-light-links-active-border-color: ct-color-light('border-light') !default; $ct-tabs-light-panel-background-color: ct-color-light('background') !default; $ct-tabs-light-panel-border-color: ct-color-light('border') !default; -$ct-tabs-dark-links-stripe-border-color: ct-color-dark('border-light'); +$ct-tabs-dark-links-stripe-border-color: ct-color-dark('border-light') !default; $ct-tabs-dark-links-background-color: ct-color-dark('background') !default; $ct-tabs-dark-links-border-color: ct-color-dark('border-light') !default; $ct-tabs-dark-links-active-background-color: ct-color-dark('background-light') !default; @@ -866,7 +866,7 @@ $ct-tooltip-dark-icon-color: ct-color-dark('interaction-background') !default; $ct-accordion-button-border-radius: $ct-border-radius !default; $ct-accordion-header-border-radius: $ct-border-radius !default; $ct-accordion-item-border-radius: $ct-border-radius !default; -$ct-accordion-stripe-width: ct-particle(0.75); +$ct-accordion-stripe-width: ct-particle(0.75) !default; $ct-accordion-space-horizontal: ct-spacing(7) !default; $ct-accordion-light-background-color: ct-color-light('background-light') !default; $ct-accordion-light-border-color: ct-color-light('border-light') !default; From e8b0c8b763f55f167ab1770f39d068dbe9366c63 Mon Sep 17 00:00:00 2001 From: Joshua Fernandes <83997348+joshua-salsadigital@users.noreply.github.com> Date: Mon, 24 Oct 2022 13:14:59 +0530 Subject: [PATCH 9/9] [CIVIC-1017] Fixed mixed level symbols issue. (#823) --- .../components/00-base/typography/_index.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/typography/_index.scss b/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/typography/_index.scss index 58d2d1320..d59560724 100644 --- a/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/typography/_index.scss +++ b/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/typography/_index.scss @@ -51,3 +51,15 @@ blockquote { border-radius: $ct-basic-content-blockquote-border-radius; } } + +ol { + list-style-type: decimal; + + ol { + list-style-type: lower-alpha; + + ol { + list-style-type: lower-roman; + } + } +}