From 39295cf2b68b6b382277799d0fbb0998c9c0bc08 Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Mon, 22 Apr 2024 18:10:44 -0700 Subject: [PATCH 01/25] feat(YSP-458): Styling for moderation form and moderation sidebar --- css/admin-theme.css | 46 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/css/admin-theme.css b/css/admin-theme.css index 5bf0da91d..2d0ef2645 100644 --- a/css/admin-theme.css +++ b/css/admin-theme.css @@ -134,6 +134,7 @@ html.gin--dark-mode form.layout-builder-configure-block.glb-form { #drupal-off-canvas-wrapper { color: var(--gin-color-text) !important; background-color: var(--gin-bg-layer) !important; + font-family: var(--gin-font); } #drupal-off-canvas-wrapper .ui-dialog-titlebar { @@ -141,7 +142,48 @@ html.gin--dark-mode form.layout-builder-configure-block.glb-form { color: var(--gin-color-text) !important; } -/* +#drupal-off-canvas-wrapper .button--primary { + background-color: var(--color-blue-yale) !important; +} + +#drupal-off-canvas-wrapper .button--primary:hover, +#drupal-off-canvas-wrapper .button--primary:focus, +#drupal-off-canvas-wrapper .button--primary:active { + color: var(--off-canvas-primary-button-text-color) !important; + background-color: var(--color-blue-royal) !important; +} + +#drupal-off-canvas-wrapper .button--danger:hover { + background-color: var(--gin-color-danger) !important; +} + +#drupal-off-canvas-wrapper a:not(.button) { + color: var(--menu-link-color) !important; +} + +/* +Moderation sidebar +*/ + +.moderation-sidebar-container .moderation-sidebar-revision-item { + border-bottom: 1px solid var(--color-text) !important; + margin: 1.5rem 0 !important; +} + +.moderation-sidebar-container .moderation-sidebar-revision-item:last-child { + border-bottom: 0 !important; +} + +.entity-moderation-form { + padding: 1rem; + margin: 1rem auto; +} + +.entity-moderation-form input[type="submit"] { + margin-bottom: 0; +} + +/* // Image crop vertical tabs override */ @@ -168,7 +210,7 @@ html.gin--dark-mode form.layout-builder-configure-block.glb-form { color: var(--gin-color-text) !important; } -/* In light mode, gin is displaying a mustard background with a black +/* In light mode, gin is displaying a mustard background with a black foreground. This causes contrast issues. */ #drupal-off-canvas-wrapper .ui-dialog-content From c055ce8b481dc9454b82b683296c26ea1463a880 Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Mon, 22 Apr 2024 18:25:37 -0700 Subject: [PATCH 02/25] feat(YSP-458): Add dark mode styling for moderation sidebar --- css/admin-theme.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/css/admin-theme.css b/css/admin-theme.css index 2d0ef2645..dec7d5584 100644 --- a/css/admin-theme.css +++ b/css/admin-theme.css @@ -161,6 +161,10 @@ html.gin--dark-mode form.layout-builder-configure-block.glb-form { color: var(--menu-link-color) !important; } +.gin--dark-mode #drupal-off-canvas-wrapper a:not(.button) { + color: var(--color-blue-light) !important; +} + /* Moderation sidebar */ @@ -183,6 +187,10 @@ Moderation sidebar margin-bottom: 0; } +.moderation-sidebar-container .moderation-sidebar-revision-log { + border: 1px solid var(--color-text) !important; +} + /* // Image crop vertical tabs override */ From 8055bc60f0743ebe2a00c2ca1d35552793db4850 Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Tue, 23 Apr 2024 15:10:55 -0700 Subject: [PATCH 03/25] fix(YSP-458): Fix last child of revisions messages, should have no border --- css/admin-theme.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/admin-theme.css b/css/admin-theme.css index dec7d5584..a735a4712 100644 --- a/css/admin-theme.css +++ b/css/admin-theme.css @@ -174,7 +174,7 @@ Moderation sidebar margin: 1.5rem 0 !important; } -.moderation-sidebar-container .moderation-sidebar-revision-item:last-child { +.moderation-sidebar-container .moderation-sidebar-revision-item:last-of-type { border-bottom: 0 !important; } From 37569a568e68273f9c58dec38fbdd0d7fd1e93fc Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Thu, 2 May 2024 14:59:32 -0700 Subject: [PATCH 04/25] fix(YSP-458): Change background color of button for contrast accessibility --- css/admin-theme.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/css/admin-theme.css b/css/admin-theme.css index a735a4712..e55da3898 100644 --- a/css/admin-theme.css +++ b/css/admin-theme.css @@ -132,6 +132,8 @@ html.gin--dark-mode form.layout-builder-configure-block.glb-form { // Offcanvas toolbar styles */ #drupal-off-canvas-wrapper { + --off-canvas-button-background-color: #555; + color: var(--gin-color-text) !important; background-color: var(--gin-bg-layer) !important; font-family: var(--gin-font); From b94536ef9ced605fc906568ec683c0a2a81f8e02 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Wed, 8 May 2024 14:02:40 -0500 Subject: [PATCH 05/25] feat(YSP-490): wire tile-item and tiles components --- .../block--inline-block--tiles.html.twig | 15 +++++++++++++++ .../field--block-content--field-tiles.html.twig | 3 +++ templates/paragraphs/paragraph--tile.html.twig | 14 ++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 templates/block/layout-builder/block--inline-block--tiles.html.twig create mode 100644 templates/field/field--block-content--field-tiles.html.twig create mode 100644 templates/paragraphs/paragraph--tile.html.twig diff --git a/templates/block/layout-builder/block--inline-block--tiles.html.twig b/templates/block/layout-builder/block--inline-block--tiles.html.twig new file mode 100644 index 000000000..5a0129cab --- /dev/null +++ b/templates/block/layout-builder/block--inline-block--tiles.html.twig @@ -0,0 +1,15 @@ +{% extends "@atomic/block/layout-builder/_layout-builder-block-template.twig" %} + +{% block content %} + {{ attach_library('atomic/tiles') }} + + {% embed "@organisms/tiles/yds-tiles.twig" with { + tiles__alignment: content.field_style_alignment.0['#markup'], + tiles__grid_count: content.field_style_width.0['#markup'], + tiles__vertical_alignment: content.field_style_position.0['#markup'], + }%} + {% block tiles__items %} + {{ content.field_tiles }} + {% endblock %} + {% endembed %} +{% endblock %} diff --git a/templates/field/field--block-content--field-tiles.html.twig b/templates/field/field--block-content--field-tiles.html.twig new file mode 100644 index 000000000..18e9f3ea6 --- /dev/null +++ b/templates/field/field--block-content--field-tiles.html.twig @@ -0,0 +1,3 @@ +{% for item in items %} + {{ item.content }} +{% endfor %} diff --git a/templates/paragraphs/paragraph--tile.html.twig b/templates/paragraphs/paragraph--tile.html.twig new file mode 100644 index 000000000..81785f562 --- /dev/null +++ b/templates/paragraphs/paragraph--tile.html.twig @@ -0,0 +1,14 @@ +{# Get values from parent to pass here #} +{% set parent = paragraph._referringItem.parent.parent.entity %} + +{% include "@molecules/tile-item/yds-tile-item.twig" with { + tile__item__heading: content.field_heading.0['#text'], + tile__item__content: content.field_text.0, + tile__item__content_link: content.field_link.0['#url_title'], + tile__item__alignment: parent.fields.field_style_alignment.0.value, + tile__item__vertical_alignment: parent.fields.field_style_position.0.value, + tile__item__presentation_style: content.field_heading.0['#text'] ? 'heading' : 'text-only', + tile__item__theme: content.field_style_color.0['#markup'], + tile__item__bg_image: paragraph.fields.field_media, + } +%} From 5e94847902e6e28041f597b5c3dde16c9e133e23 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Wed, 8 May 2024 14:03:03 -0500 Subject: [PATCH 06/25] feat(YSP-490): wire tile-item js --- atomic.libraries.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/atomic.libraries.yml b/atomic.libraries.yml index 76f2cc647..6b1ec8bc7 100644 --- a/atomic.libraries.yml +++ b/atomic.libraries.yml @@ -88,3 +88,7 @@ spotlights: js: node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/content-spotlight-portrait/content-spotlights.js: {} +tiles: + js: + node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/tile-item/yds-tile-item.js: + {} From 8437b8bb84d35426cc48956e292aa65338eb3120 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Wed, 8 May 2024 14:42:53 -0500 Subject: [PATCH 07/25] feat(YSP-490): wire tile-item bg image --- templates/field/field--paragraph--tile.html.twig | 3 +++ templates/paragraphs/paragraph--tile.html.twig | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 templates/field/field--paragraph--tile.html.twig diff --git a/templates/field/field--paragraph--tile.html.twig b/templates/field/field--paragraph--tile.html.twig new file mode 100644 index 000000000..748c8ee8d --- /dev/null +++ b/templates/field/field--paragraph--tile.html.twig @@ -0,0 +1,3 @@ +{% for item in items %} + {{item.content}} +{% endfor %} diff --git a/templates/paragraphs/paragraph--tile.html.twig b/templates/paragraphs/paragraph--tile.html.twig index 81785f562..d200674f1 100644 --- a/templates/paragraphs/paragraph--tile.html.twig +++ b/templates/paragraphs/paragraph--tile.html.twig @@ -1,7 +1,8 @@ {# Get values from parent to pass here #} {% set parent = paragraph._referringItem.parent.parent.entity %} +{% set tile__item__bg_image = content.field_media.0 ? 'true' : 'false' %} -{% include "@molecules/tile-item/yds-tile-item.twig" with { +{% embed "@molecules/tile-item/yds-tile-item.twig" with { tile__item__heading: content.field_heading.0['#text'], tile__item__content: content.field_text.0, tile__item__content_link: content.field_link.0['#url_title'], @@ -9,6 +10,9 @@ tile__item__vertical_alignment: parent.fields.field_style_position.0.value, tile__item__presentation_style: content.field_heading.0['#text'] ? 'heading' : 'text-only', tile__item__theme: content.field_style_color.0['#markup'], - tile__item__bg_image: paragraph.fields.field_media, } %} + {% block tile__item__image %} + {{ content.field_media }} + {% endblock %} +{% endembed %} From a1ff4e3b56b97708639cefc5dde9f92382541d76 Mon Sep 17 00:00:00 2001 From: Vincent Massaro Date: Wed, 8 May 2024 16:12:27 -0400 Subject: [PATCH 08/25] feat: run semantic-release with npx --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e31e1e065..c2b063185 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} YALESITES_BUILD_TOKEN: ${{ secrets.YALESITES_BUILD_TOKEN }} - run: npm run semantic-release + run: npx semantic-release - name: Remove Compiled Component Library uses: EndBug/add-and-commit@v7 with: From 2a826684208dbe2808acad1c7d9e5097e3c3562f Mon Sep 17 00:00:00 2001 From: Vincent Massaro Date: Wed, 8 May 2024 16:13:44 -0400 Subject: [PATCH 09/25] chore: remove unneeded semantic-release npm command --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 0a4e70075..801f61bea 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "husky:pre-commit": "lint-staged", "prepare": "husky install", "prettier": "prettier ./ --ignore-unknown --list-different", - "semantic-release": "semantic-release", "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { From 30b294db19c78d18e539aeccb444e5feccb61185 Mon Sep 17 00:00:00 2001 From: Vincent Massaro Date: Wed, 8 May 2024 16:16:55 -0400 Subject: [PATCH 10/25] ci: change commit author to github actions bot --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c2b063185..440fcf0b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,6 +21,8 @@ jobs: - name: Commit Compiled Component Library uses: EndBug/add-and-commit@v9 with: + author_name: github-actions[bot] + author_email: github-actions[bot]@users.noreply.github.com add: "node_modules/@yalesites-org/component-library-twig -f" message: "build: commit compiled component library" - name: Release From 20751d189852a394ac548226e9179d3855a9c060 Mon Sep 17 00:00:00 2001 From: Vincent Massaro Date: Wed, 8 May 2024 16:17:51 -0400 Subject: [PATCH 11/25] feat: instead of removing CI commit, reset branch to $GITHUB_SHA --- .github/workflows/release.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 440fcf0b9..e689d52cb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,8 +30,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} YALESITES_BUILD_TOKEN: ${{ secrets.YALESITES_BUILD_TOKEN }} run: npx semantic-release - - name: Remove Compiled Component Library - uses: EndBug/add-and-commit@v7 - with: - remove: "--cached -r node_modules" - message: "build: removed compiled component library from git" + - name: Reset branch to prior commit + run: | + git config user.name 'github-actions[bot]' + git config user.email 'github-actions[bot]@users.noreply.github.com' + git reset --hard $GITHUB_SHA + git push --force From 8a7335140cfd75578d77955f1109ef62ff83cb82 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Wed, 8 May 2024 15:34:01 -0500 Subject: [PATCH 12/25] feat(YSP-490): wire quote callout alignment field --- ...ock--inline-block--quote-callout.html.twig | 22 +++++++++++++++++++ ...ld--block-content--quote-callout.html.twig | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 templates/block/layout-builder/block--inline-block--quote-callout.html.twig create mode 100644 templates/field/field--block-content--quote-callout.html.twig diff --git a/templates/block/layout-builder/block--inline-block--quote-callout.html.twig b/templates/block/layout-builder/block--inline-block--quote-callout.html.twig new file mode 100644 index 000000000..bccd5d637 --- /dev/null +++ b/templates/block/layout-builder/block--inline-block--quote-callout.html.twig @@ -0,0 +1,22 @@ +{% extends "@atomic/block/layout-builder/_layout-builder-block-template.twig" %} + +{% block content %} + {% if parentNode == 'post' or parentNode == 'event' %} + {% set quote_callout__width = "content" %} + {% set quote_callout__alignment = "center" %} + {% else %} + {% set quote_callout__width = "site" %} + {% set quote_callout__alignment = "left" %} + {% endif %} + + {% include "@molecules/quote-callout/yds-quote-callout.twig" with { + quote_callout__quote: content.field_text, + quote_callout__attribution: content.field_caption.0, + quote_callout__style: content.field_style_variation.0['#markup'], + quote_callout__alignment: quote_callout__alignment, + quote_callout__quote_alignment: content.field_style_alignment.0['#markup'], + quote_callout__width: quote_callout__width, + } %} + {{dd(content)}} + +{% endblock %} diff --git a/templates/field/field--block-content--quote-callout.html.twig b/templates/field/field--block-content--quote-callout.html.twig new file mode 100644 index 000000000..18e9f3ea6 --- /dev/null +++ b/templates/field/field--block-content--quote-callout.html.twig @@ -0,0 +1,3 @@ +{% for item in items %} + {{ item.content }} +{% endfor %} From 486deacf21646eb5e59090c8c5a936343eeaa3e7 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Wed, 8 May 2024 17:30:44 -0500 Subject: [PATCH 13/25] feat(YSP-490): wiring facts and figures - WIP --- .../block--inline-block--facts.html.twig | 27 +++++++++++++++++++ ...ock--inline-block--quote-callout.html.twig | 2 -- .../field--block-content--facts.html.twig | 3 +++ ...block-content--field-facts-items.html.twig | 3 +++ .../paragraph--facts-item.html.twig | 12 +++++++++ 5 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 templates/block/layout-builder/block--inline-block--facts.html.twig create mode 100644 templates/field/field--block-content--facts.html.twig create mode 100644 templates/field/field--block-content--field-facts-items.html.twig create mode 100644 templates/paragraphs/paragraph--facts-item.html.twig diff --git a/templates/block/layout-builder/block--inline-block--facts.html.twig b/templates/block/layout-builder/block--inline-block--facts.html.twig new file mode 100644 index 000000000..366aa0dad --- /dev/null +++ b/templates/block/layout-builder/block--inline-block--facts.html.twig @@ -0,0 +1,27 @@ +{% extends "@atomic/block/layout-builder/_layout-builder-block-template.twig" %} + +{% block content %} + + {% if parentNode == 'post' or parentNode == 'event' %} + {% set facts_and_figures__width = "content" %} + {% else %} + {% set facts_and_figures__width = "site" %} + {% endif %} + + {% set facts_and_figures__group__bg_image = content.field_media.0 ? 'true' : 'false' %} + + {% embed "@organisms/facts-and-figures-group/yds-facts-and-figures-group.twig" with { + facts_and_figures__alignment: content.field_style_alignment.0['#markup'], + facts_and_figures__grid_count: content.field_style_width.0['#markup'], + facts_and_figures__presentation_style: content.field_style_variation.0['#markup'], + }%} + {% block facts_and_figures__group__items %} + {{ content.field_facts_items }} + {% endblock %} + + {% block facts_and_figures__group__image %} + {{ content.field_media }} + {% endblock %} + {% endembed %} + +{% endblock %} diff --git a/templates/block/layout-builder/block--inline-block--quote-callout.html.twig b/templates/block/layout-builder/block--inline-block--quote-callout.html.twig index bccd5d637..6608e6672 100644 --- a/templates/block/layout-builder/block--inline-block--quote-callout.html.twig +++ b/templates/block/layout-builder/block--inline-block--quote-callout.html.twig @@ -17,6 +17,4 @@ quote_callout__quote_alignment: content.field_style_alignment.0['#markup'], quote_callout__width: quote_callout__width, } %} - {{dd(content)}} - {% endblock %} diff --git a/templates/field/field--block-content--facts.html.twig b/templates/field/field--block-content--facts.html.twig new file mode 100644 index 000000000..18e9f3ea6 --- /dev/null +++ b/templates/field/field--block-content--facts.html.twig @@ -0,0 +1,3 @@ +{% for item in items %} + {{ item.content }} +{% endfor %} diff --git a/templates/field/field--block-content--field-facts-items.html.twig b/templates/field/field--block-content--field-facts-items.html.twig new file mode 100644 index 000000000..18e9f3ea6 --- /dev/null +++ b/templates/field/field--block-content--field-facts-items.html.twig @@ -0,0 +1,3 @@ +{% for item in items %} + {{ item.content }} +{% endfor %} diff --git a/templates/paragraphs/paragraph--facts-item.html.twig b/templates/paragraphs/paragraph--facts-item.html.twig new file mode 100644 index 000000000..b0ec51e7a --- /dev/null +++ b/templates/paragraphs/paragraph--facts-item.html.twig @@ -0,0 +1,12 @@ +{# Get values from parent to pass here #} +{% set parent = paragraph._referringItem.parent.parent.entity %} + +{% embed "@molecules/facts-and-figures/yds-facts-and-figures.twig" with { + facts_and_figures__stat: content.field_heading.0['#text'], + facts_and_figures__content: content.field_text.0, + facts_and_figures__alignment: parent.fields.field_style_alignment.0.value, + facts_and_figures__presentation_style: 'basic', + facts_and_figures__theme: 'none', + } +%} +{% endembed %} From a1a7e2ac1dbe57c2010570eba4ce422976538b9f Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Thu, 9 May 2024 12:35:54 -0500 Subject: [PATCH 14/25] feat(YSP-490): wiring facts and figures. remove js for fully clickable tile --- atomic.libraries.yml | 4 ---- .../block--inline-block--facts.html.twig | 13 ++++++++----- .../block--inline-block--tiles.html.twig | 2 -- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/atomic.libraries.yml b/atomic.libraries.yml index 6b1ec8bc7..76f2cc647 100644 --- a/atomic.libraries.yml +++ b/atomic.libraries.yml @@ -88,7 +88,3 @@ spotlights: js: node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/content-spotlight-portrait/content-spotlights.js: {} -tiles: - js: - node_modules/@yalesites-org/component-library-twig/dist/js/02-molecules/tile-item/yds-tile-item.js: - {} diff --git a/templates/block/layout-builder/block--inline-block--facts.html.twig b/templates/block/layout-builder/block--inline-block--facts.html.twig index 366aa0dad..53c934091 100644 --- a/templates/block/layout-builder/block--inline-block--facts.html.twig +++ b/templates/block/layout-builder/block--inline-block--facts.html.twig @@ -3,17 +3,17 @@ {% block content %} {% if parentNode == 'post' or parentNode == 'event' %} - {% set facts_and_figures__width = "content" %} + {% set facts_and_figures__group__width = "content" %} {% else %} - {% set facts_and_figures__width = "site" %} + {% set facts_and_figures__group__width = "site" %} {% endif %} {% set facts_and_figures__group__bg_image = content.field_media.0 ? 'true' : 'false' %} {% embed "@organisms/facts-and-figures-group/yds-facts-and-figures-group.twig" with { - facts_and_figures__alignment: content.field_style_alignment.0['#markup'], - facts_and_figures__grid_count: content.field_style_width.0['#markup'], - facts_and_figures__presentation_style: content.field_style_variation.0['#markup'], + facts_and_figures__group__alignment: content.field_style_alignment.0['#markup'], + facts_and_figures__group__grid_count: content.field_style_width.0['#markup'], + facts_and_figures__group__presentation_style: content.field_style_variation.0['#markup'], }%} {% block facts_and_figures__group__items %} {{ content.field_facts_items }} @@ -24,4 +24,7 @@ {% endblock %} {% endembed %} + {{dd(content)}} + + {% endblock %} diff --git a/templates/block/layout-builder/block--inline-block--tiles.html.twig b/templates/block/layout-builder/block--inline-block--tiles.html.twig index 5a0129cab..5123094b3 100644 --- a/templates/block/layout-builder/block--inline-block--tiles.html.twig +++ b/templates/block/layout-builder/block--inline-block--tiles.html.twig @@ -1,8 +1,6 @@ {% extends "@atomic/block/layout-builder/_layout-builder-block-template.twig" %} {% block content %} - {{ attach_library('atomic/tiles') }} - {% embed "@organisms/tiles/yds-tiles.twig" with { tiles__alignment: content.field_style_alignment.0['#markup'], tiles__grid_count: content.field_style_width.0['#markup'], From 73cd5920b60fd339fb75718876c117bba1d9b185 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Thu, 9 May 2024 16:23:57 -0500 Subject: [PATCH 15/25] feat(YSP-490): wiring link list and refining quote callout and facts --- .../block--inline-block--facts.html.twig | 29 ++++++++-------- .../block--inline-block--link-grid.html.twig | 33 +++++++++++++++++++ ...ock--inline-block--quote-callout.html.twig | 11 ++++++- .../field--block-content--link-grid.html.twig | 3 ++ .../field--paragraph--link-list.html.twig | 7 ++++ .../paragraphs/paragraph--link-list.html.twig | 1 + 6 files changed, 67 insertions(+), 17 deletions(-) create mode 100644 templates/block/layout-builder/block--inline-block--link-grid.html.twig create mode 100644 templates/field/field--block-content--link-grid.html.twig create mode 100644 templates/field/field--paragraph--link-list.html.twig create mode 100644 templates/paragraphs/paragraph--link-list.html.twig diff --git a/templates/block/layout-builder/block--inline-block--facts.html.twig b/templates/block/layout-builder/block--inline-block--facts.html.twig index 53c934091..1e371771d 100644 --- a/templates/block/layout-builder/block--inline-block--facts.html.twig +++ b/templates/block/layout-builder/block--inline-block--facts.html.twig @@ -10,21 +10,18 @@ {% set facts_and_figures__group__bg_image = content.field_media.0 ? 'true' : 'false' %} - {% embed "@organisms/facts-and-figures-group/yds-facts-and-figures-group.twig" with { - facts_and_figures__group__alignment: content.field_style_alignment.0['#markup'], - facts_and_figures__group__grid_count: content.field_style_width.0['#markup'], - facts_and_figures__group__presentation_style: content.field_style_variation.0['#markup'], - }%} - {% block facts_and_figures__group__items %} - {{ content.field_facts_items }} - {% endblock %} - - {% block facts_and_figures__group__image %} - {{ content.field_media }} - {% endblock %} - {% endembed %} - - {{dd(content)}} - + {% embed "@organisms/facts-and-figures-group/yds-facts-and-figures-group.twig" with { + facts_and_figures__group__alignment: content.field_style_alignment.0['#markup'], + facts_and_figures__group__grid_count: content.field_style_width.0['#markup'], + facts_and_figures__group__presentation_style: content.field_style_variation.0['#markup'], + }%} + {% block facts_and_figures__group__items %} + {{ content.field_facts_items }} + {% endblock %} + + {% block facts_and_figures__group__image %} + {{ content.field_media }} + {% endblock %} + {% endembed %} {% endblock %} diff --git a/templates/block/layout-builder/block--inline-block--link-grid.html.twig b/templates/block/layout-builder/block--inline-block--link-grid.html.twig new file mode 100644 index 000000000..1b5ae6509 --- /dev/null +++ b/templates/block/layout-builder/block--inline-block--link-grid.html.twig @@ -0,0 +1,33 @@ +{% extends "@atomic/block/layout-builder/_layout-builder-block-template.twig" %} + +{% block content %} + {% if parentNode == 'post' or parentNode == 'event' %} + {% set link_grid__width = "content" %} + {% else %} + {% set link_grid__width = "site" %} + {% endif %} + + {# add checks for each link list #} + {% set link_grid__links_one = content.field_link_lists.0 %} + {% set link_grid__links_two = content.field_link_lists.1 %} + {% set link_grid__links_three = content.field_link_lists.2 %} + {% set link_grid__links_four = content.field_link_lists.3 %} + + {% embed "@molecules/link-grid/yds-link-grid.twig" with { + link_grid__theme: content.field_style_color.0['#markup'], + }%} + {% block link_grid__links_one %} + {{content.field_link_lists.0}} + {% endblock %} + {% block link_grid__links_two %} + {{content.field_link_lists.1}} + {% endblock %} + {% block link_grid__links_three %} + {{content.field_link_lists.2}} + {% endblock %} + {% block link_grid__links_four %} + {{content.field_link_lists.3}} + {% endblock %} + {% endembed %} + +{% endblock %} diff --git a/templates/block/layout-builder/block--inline-block--quote-callout.html.twig b/templates/block/layout-builder/block--inline-block--quote-callout.html.twig index 6608e6672..5818f3be8 100644 --- a/templates/block/layout-builder/block--inline-block--quote-callout.html.twig +++ b/templates/block/layout-builder/block--inline-block--quote-callout.html.twig @@ -9,7 +9,11 @@ {% set quote_callout__alignment = "left" %} {% endif %} - {% include "@molecules/quote-callout/yds-quote-callout.twig" with { + {% if content.field_media.0 %} + {% set quote_callout__quote_image = 'with-image' %} + {% endif %} + + {% embed "@molecules/quote-callout/yds-quote-callout.twig" with { quote_callout__quote: content.field_text, quote_callout__attribution: content.field_caption.0, quote_callout__style: content.field_style_variation.0['#markup'], @@ -17,4 +21,9 @@ quote_callout__quote_alignment: content.field_style_alignment.0['#markup'], quote_callout__width: quote_callout__width, } %} + + {% block quote_callout__image %} + {{ content.field_media }} + {% endblock %} + {% endembed %} {% endblock %} diff --git a/templates/field/field--block-content--link-grid.html.twig b/templates/field/field--block-content--link-grid.html.twig new file mode 100644 index 000000000..18e9f3ea6 --- /dev/null +++ b/templates/field/field--block-content--link-grid.html.twig @@ -0,0 +1,3 @@ +{% for item in items %} + {{ item.content }} +{% endfor %} diff --git a/templates/field/field--paragraph--link-list.html.twig b/templates/field/field--paragraph--link-list.html.twig new file mode 100644 index 000000000..83aee455e --- /dev/null +++ b/templates/field/field--paragraph--link-list.html.twig @@ -0,0 +1,7 @@ +{% for item in items %} + {% include "@molecules/link-grid/_yds-link-grid--links.twig" with { + link_grid__link__content: item.content['#title'], + link_grid__link__url: item.content['#url_title'], + } + %} +{% endfor %} diff --git a/templates/paragraphs/paragraph--link-list.html.twig b/templates/paragraphs/paragraph--link-list.html.twig new file mode 100644 index 000000000..b92f65223 --- /dev/null +++ b/templates/paragraphs/paragraph--link-list.html.twig @@ -0,0 +1 @@ +{{content}} From 4514a6616be7dd383e3efbc6e59ffadbb60c2af6 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Fri, 10 May 2024 10:12:23 -0500 Subject: [PATCH 16/25] feat(YSP-490): wiring accent theme to quote callout --- .../block--inline-block--quote-callout.html.twig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/block/layout-builder/block--inline-block--quote-callout.html.twig b/templates/block/layout-builder/block--inline-block--quote-callout.html.twig index 5818f3be8..313240ded 100644 --- a/templates/block/layout-builder/block--inline-block--quote-callout.html.twig +++ b/templates/block/layout-builder/block--inline-block--quote-callout.html.twig @@ -1,6 +1,8 @@ {% extends "@atomic/block/layout-builder/_layout-builder-block-template.twig" %} {% block content %} + {{ attach_library('atomic/spotlights') }} + {% if parentNode == 'post' or parentNode == 'event' %} {% set quote_callout__width = "content" %} {% set quote_callout__alignment = "center" %} @@ -20,6 +22,7 @@ quote_callout__alignment: quote_callout__alignment, quote_callout__quote_alignment: content.field_style_alignment.0['#markup'], quote_callout__width: quote_callout__width, + quote_callout__accent_theme: content.field_style_color.0['#markup'], } %} {% block quote_callout__image %} From 1be9fc28928b86903ed9a890846cec8f671e8c56 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Fri, 10 May 2024 10:40:16 -0500 Subject: [PATCH 17/25] feat(YSP-490): hardcode quote callout component width --- .../block--inline-block--quote-callout.html.twig | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/templates/block/layout-builder/block--inline-block--quote-callout.html.twig b/templates/block/layout-builder/block--inline-block--quote-callout.html.twig index 313240ded..8ae01737d 100644 --- a/templates/block/layout-builder/block--inline-block--quote-callout.html.twig +++ b/templates/block/layout-builder/block--inline-block--quote-callout.html.twig @@ -3,14 +3,6 @@ {% block content %} {{ attach_library('atomic/spotlights') }} - {% if parentNode == 'post' or parentNode == 'event' %} - {% set quote_callout__width = "content" %} - {% set quote_callout__alignment = "center" %} - {% else %} - {% set quote_callout__width = "site" %} - {% set quote_callout__alignment = "left" %} - {% endif %} - {% if content.field_media.0 %} {% set quote_callout__quote_image = 'with-image' %} {% endif %} @@ -21,7 +13,7 @@ quote_callout__style: content.field_style_variation.0['#markup'], quote_callout__alignment: quote_callout__alignment, quote_callout__quote_alignment: content.field_style_alignment.0['#markup'], - quote_callout__width: quote_callout__width, + quote_callout__width: 'content', quote_callout__accent_theme: content.field_style_color.0['#markup'], } %} From ceb2a46ef33a4a8426f634d75a66242e2ed20e96 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Fri, 10 May 2024 10:44:58 -0500 Subject: [PATCH 18/25] feat(YSP-490): add hardcoded width and wire theme value for facts --- .../layout-builder/block--inline-block--facts.html.twig | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/templates/block/layout-builder/block--inline-block--facts.html.twig b/templates/block/layout-builder/block--inline-block--facts.html.twig index 1e371771d..a3d0b40c1 100644 --- a/templates/block/layout-builder/block--inline-block--facts.html.twig +++ b/templates/block/layout-builder/block--inline-block--facts.html.twig @@ -2,18 +2,14 @@ {% block content %} - {% if parentNode == 'post' or parentNode == 'event' %} - {% set facts_and_figures__group__width = "content" %} - {% else %} - {% set facts_and_figures__group__width = "site" %} - {% endif %} - {% set facts_and_figures__group__bg_image = content.field_media.0 ? 'true' : 'false' %} {% embed "@organisms/facts-and-figures-group/yds-facts-and-figures-group.twig" with { facts_and_figures__group__alignment: content.field_style_alignment.0['#markup'], facts_and_figures__group__grid_count: content.field_style_width.0['#markup'], facts_and_figures__group__presentation_style: content.field_style_variation.0['#markup'], + facts_and_figured__group__width: 'site', + facts_and_figures__group__theme: content.field_style_color.0['#markup'], }%} {% block facts_and_figures__group__items %} {{ content.field_facts_items }} From edbd1edc8201f2a42a0de59b0713f0e739ec0e4e Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Tue, 14 May 2024 10:27:02 -0500 Subject: [PATCH 19/25] feat(YSP-490): wire facts group heading and content fields --- .../block/layout-builder/block--inline-block--facts.html.twig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/block/layout-builder/block--inline-block--facts.html.twig b/templates/block/layout-builder/block--inline-block--facts.html.twig index a3d0b40c1..178b97779 100644 --- a/templates/block/layout-builder/block--inline-block--facts.html.twig +++ b/templates/block/layout-builder/block--inline-block--facts.html.twig @@ -5,6 +5,8 @@ {% set facts_and_figures__group__bg_image = content.field_media.0 ? 'true' : 'false' %} {% embed "@organisms/facts-and-figures-group/yds-facts-and-figures-group.twig" with { + facts_and_figures__group__heading: content.field_heading.0['#text'], + facts_and_figures__group__content: content.field_text.0['#text'], facts_and_figures__group__alignment: content.field_style_alignment.0['#markup'], facts_and_figures__group__grid_count: content.field_style_width.0['#markup'], facts_and_figures__group__presentation_style: content.field_style_variation.0['#markup'], From f2579fe506c1bf644da4cc884d2eedd9deb283d6 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Mon, 3 Jun 2024 11:14:37 -0500 Subject: [PATCH 20/25] feat(YSP-490): wire link grid heading --- .../layout-builder/block--inline-block--link-grid.html.twig | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/block/layout-builder/block--inline-block--link-grid.html.twig b/templates/block/layout-builder/block--inline-block--link-grid.html.twig index 1b5ae6509..e3e797aa1 100644 --- a/templates/block/layout-builder/block--inline-block--link-grid.html.twig +++ b/templates/block/layout-builder/block--inline-block--link-grid.html.twig @@ -15,6 +15,7 @@ {% embed "@molecules/link-grid/yds-link-grid.twig" with { link_grid__theme: content.field_style_color.0['#markup'], + link_grid__heading: content.field_heading.0['#markup'], }%} {% block link_grid__links_one %} {{content.field_link_lists.0}} From ecae81a20ddccdfd9b3e2c1b338a31bc79bd7344 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Mon, 3 Jun 2024 11:23:39 -0500 Subject: [PATCH 21/25] feat(YSP-490): fix wiring of link grid heading --- .../layout-builder/block--inline-block--link-grid.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/block/layout-builder/block--inline-block--link-grid.html.twig b/templates/block/layout-builder/block--inline-block--link-grid.html.twig index e3e797aa1..aa60372e3 100644 --- a/templates/block/layout-builder/block--inline-block--link-grid.html.twig +++ b/templates/block/layout-builder/block--inline-block--link-grid.html.twig @@ -15,7 +15,7 @@ {% embed "@molecules/link-grid/yds-link-grid.twig" with { link_grid__theme: content.field_style_color.0['#markup'], - link_grid__heading: content.field_heading.0['#markup'], + link_grid__heading: content.field_heading.0, }%} {% block link_grid__links_one %} {{content.field_link_lists.0}} From f176b37392870adc10636a486935ff947a9f068e Mon Sep 17 00:00:00 2001 From: David Blankenship <128765777+dblanken-yale@users.noreply.github.com> Date: Tue, 18 Jun 2024 10:08:22 -0400 Subject: [PATCH 22/25] YSP-487: Add JWPlayer embed (#238) Allow `allowfullscreen` for embeds --- templates/ys_embed/embed_wrapper.html.twig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/ys_embed/embed_wrapper.html.twig b/templates/ys_embed/embed_wrapper.html.twig index 733c10197..253d514ee 100644 --- a/templates/ys_embed/embed_wrapper.html.twig +++ b/templates/ys_embed/embed_wrapper.html.twig @@ -1,6 +1,7 @@ {% set embed_wrapper__embed_type = displayAttributes['embedType']|default('unknown') %} {% set embed_wrapper__width = displayAttributes['width']|default('site') %} {% set embed_wrapper__height = displayAttributes['height']|default('100%') %} +{% set embed_wrapper__allowfullscreen = displayAttributes['allowfullscreen'] == TRUE ? 'true' : 'false' %} {% if displayAttributes['isIframe'] %}
@@ -9,6 +10,7 @@ embed__title: title, embed__width: embed_wrapper__width, embed__type: embed_wrapper__embed_type, + embed__allowfullscreen: embed_wrapper__allowfullscreen, } %} {% endembed %}
From 230d9be9472d91e1a4681d36636b1966fea9e700 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Tue, 18 Jun 2024 10:00:27 -0500 Subject: [PATCH 23/25] fix(YSP-554): hide hamburger icon when all the menus are empty (#236) --- templates/layout/region--header.html.twig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/templates/layout/region--header.html.twig b/templates/layout/region--header.html.twig index 888eb0dce..e58b65ce5 100644 --- a/templates/layout/region--header.html.twig +++ b/templates/layout/region--header.html.twig @@ -5,6 +5,13 @@ {% set site_header__site_name_is_image = getHeaderSetting('site_name_image') %} {% endif %} +{# set primary and utility nave variables equal to their drupal elements #} +{# this is necessary to pass the truthiness of the elements to the site-header organism #} +{# which will set {% set site_header__hamburger = 'yes' %} #} +{# and render the hamburger icon if the primary nav exists or the ulitity nav exists #} +{% set primary_nav__items = elements.main_navigation.content['#items'] %} +{% set utility_nav__items = elements.utility_navigation.content['#items'] %} + {% embed "@organisms/site-header/yds-site-header.twig" with { site_name: site_name, site_header__border_thickness: '8', From d20269bb761082e0155781ae6c12b087230101ec Mon Sep 17 00:00:00 2001 From: laura-johnson Date: Tue, 18 Jun 2024 08:02:57 -0700 Subject: [PATCH 24/25] feat(YSP-509): Add Code Style to WYSIWYG (#234) * build: commit compiled component library * build: removed compiled component library from git * build: commit compiled component library * build: removed compiled component library from git * build: commit compiled component library * feat: ysp-509 add library and attach to template * feat: ysp-509 use hosted highlightjs * fix: ysp-509 remove compiled node_modules * feat: ysp-509 move ckeditor css to atomic * fix: ysp-509 fix border in ckeditor --------- Co-authored-by: vinmassaro --- atomic.libraries.yml | 5 +++++ css/ckeditor5.css | 5 +++++ package-lock.json | 4 ++-- package.json | 2 +- .../block/layout-builder/block--inline-block--text.html.twig | 2 ++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/atomic.libraries.yml b/atomic.libraries.yml index 76f2cc647..6098b46b5 100644 --- a/atomic.libraries.yml +++ b/atomic.libraries.yml @@ -80,6 +80,11 @@ text-link: node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/controls/text-link/yds-text-link.js: {} +text: + js: + node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/typography/text/yds-text.js: + {} + text-copy-button: js: node_modules/@yalesites-org/component-library-twig/dist/js/01-atoms/controls/text-copy-button/yds-text-copy-button.js: diff --git a/css/ckeditor5.css b/css/ckeditor5.css index 79fae313d..9028c15fa 100644 --- a/css/ckeditor5.css +++ b/css/ckeditor5.css @@ -19,6 +19,11 @@ div[contenteditable="true"] #drupal-off-canvas [data-drupal-ck-style-fence] .ck- width: 100%; } +/* Removes the border style in code blocks within ckeditor */ + .ck-content pre code { + border: 0; + } + .glb-table .ck-content * { padding: 0; height: unset; diff --git a/package-lock.json b/package-lock.json index 6e9fe970c..153e1562c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@yalesites-org/atomic", - "version": "1.29.0", + "version": "1.30.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@yalesites-org/atomic", - "version": "1.29.0", + "version": "1.30.0", "bundleDependencies": [ "@yalesites-org/component-library-twig" ], diff --git a/package.json b/package.json index 0a4e70075..d97b4da73 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@yalesites-org/atomic", - "version": "1.29.0", + "version": "1.30.0", "description": "Atomic theme for YaleSites projects.", "files": [ "components", diff --git a/templates/block/layout-builder/block--inline-block--text.html.twig b/templates/block/layout-builder/block--inline-block--text.html.twig index 46b2b0b6a..6e577040a 100644 --- a/templates/block/layout-builder/block--inline-block--text.html.twig +++ b/templates/block/layout-builder/block--inline-block--text.html.twig @@ -2,6 +2,8 @@ {% block content %} + {{ attach_library('atomic/text') }} + {% if parentNode == 'post' or parentNode == 'event' %} {% set text_field__width = "content" %} {% set text_field__alignment = "center" %} From 093b74dde4823b2d6743701fa582efe10734c328 Mon Sep 17 00:00:00 2001 From: Vincent Massaro Date: Wed, 19 Jun 2024 23:43:59 -0400 Subject: [PATCH 25/25] feat: update component-library-twig to 1.43.0 --- package-lock.json | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 153e1562c..9b01684d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2068,9 +2068,9 @@ "inBundle": true }, "node_modules/@yalesites-org/component-library-twig": { - "version": "1.42.1", - "resolved": "https://npm.pkg.github.com/download/@yalesites-org/component-library-twig/1.42.1/7b1ab4fdfb9e698fae18aa1a8092fb2ff7d2c1a8", - "integrity": "sha512-sbf4kI7AVFy5ihx4SJwtczcnoqQgnmbLR8896PmvxxNeReTTyY9/1SEn3UmXKPDXldK+SBGfVCcrsjQly1d/Dw==", + "version": "1.43.0", + "resolved": "https://npm.pkg.github.com/download/@yalesites-org/component-library-twig/1.43.0/d42f87e6deb926ea43fa9d66cc759300633d04db", + "integrity": "sha512-K0LdgmthqmShEerj+IP9mIvxkZGpRiINcZA24Ay2M3ou+CYx2ZCBZykSJjVVDe5sQ1WRdutHGweMDWCElnl25Q==", "hasInstallScript": true, "inBundle": true, "dependencies": { @@ -2081,6 +2081,7 @@ "clean-webpack-plugin": "^4.0.0", "copy-webpack-plugin": "^4.6.0", "glob": "^7.2.0", + "highlight.js": "^11.9.0", "imagemin-webpack-plugin": "^2.4.2", "mini-css-extract-plugin": "^1.6.2", "node-sass-glob-importer": "^5.3.2", @@ -2091,6 +2092,15 @@ "webpack-merge": "^5.8.0" } }, + "node_modules/@yalesites-org/component-library-twig/node_modules/highlight.js": { + "version": "11.9.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz", + "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==", + "inBundle": true, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/@yalesites-org/eslint-config-and-other-formatting": { "version": "1.5.4", "resolved": "https://npm.pkg.github.com/download/@yalesites-org/eslint-config-and-other-formatting/1.5.4/99238a7d6c8aa6998aed59412b9cc9ea522a7f7e", @@ -22720,9 +22730,9 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, "@yalesites-org/component-library-twig": { - "version": "1.42.1", - "resolved": "https://npm.pkg.github.com/download/@yalesites-org/component-library-twig/1.42.1/7b1ab4fdfb9e698fae18aa1a8092fb2ff7d2c1a8", - "integrity": "sha512-sbf4kI7AVFy5ihx4SJwtczcnoqQgnmbLR8896PmvxxNeReTTyY9/1SEn3UmXKPDXldK+SBGfVCcrsjQly1d/Dw==", + "version": "1.43.0", + "resolved": "https://npm.pkg.github.com/download/@yalesites-org/component-library-twig/1.43.0/d42f87e6deb926ea43fa9d66cc759300633d04db", + "integrity": "sha512-K0LdgmthqmShEerj+IP9mIvxkZGpRiINcZA24Ay2M3ou+CYx2ZCBZykSJjVVDe5sQ1WRdutHGweMDWCElnl25Q==", "requires": { "@storybook/storybook-deployer": "^2.8.11", "@yalesites-org/tokens": "^1.20.0", @@ -22731,6 +22741,7 @@ "clean-webpack-plugin": "^4.0.0", "copy-webpack-plugin": "^4.6.0", "glob": "^7.2.0", + "highlight.js": "^11.9.0", "imagemin-webpack-plugin": "^2.4.2", "mini-css-extract-plugin": "^1.6.2", "node-sass-glob-importer": "^5.3.2", @@ -22739,6 +22750,13 @@ "twig-drupal-filters": "^3.1.2", "webpack": "^4.46.0", "webpack-merge": "^5.8.0" + }, + "dependencies": { + "highlight.js": { + "version": "11.9.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz", + "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==" + } } }, "@yalesites-org/eslint-config-and-other-formatting": {