Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Usagov 2130 try to upgrade uswds ckeditor #2174

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"drupal/admin_toolbar": "^3.4",
"drupal/allowed_formats": "^3.0",
"drupal/autologout": "^2.0",
"drupal/ckeditor5_embedded_content": "^2.0",
"drupal/ckeditor_media_resize": "^1.0@beta",
"drupal/ckeditor_templates": "^1.3",
"drupal/ckeditor_templates_ui": "^1.5",
Expand All @@ -34,6 +35,7 @@
"drupal/ctools": "^3.7",
"drupal/devel": "^5.1",
"drupal/diff": "^1.0",
"drupal/embedded_content": "^2.0",
"drupal/entity_embed": "^1.5",
"drupal/entity_reference_revisions": "^1.9",
"drupal/externalauth": "^2",
Expand Down Expand Up @@ -65,7 +67,7 @@
"drupal/tome": "^1.6",
"drupal/twig_tweak": "^3.1",
"drupal/uswds_base": "^2.4",
"drupal/uswds_ckeditor_integration": "^2.0",
"drupal/uswds_ckeditor_integration": "^3.1",
"drupal/uswds_paragraph_components": "^3.0",
"drupal/views_data_export": "^1.4",
"drupal/views_menu_children_filter": "^3.0@RC",
Expand Down
90 changes: 67 additions & 23 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/sync/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module:
block_content: 0
breakpoint: 0
ckeditor5: 0
ckeditor5_embedded_content: 0
ckeditor_media_resize: 0
composer_deploy: 0
conditional_fields: 0
Expand All @@ -30,6 +29,7 @@ module:
dynamic_page_cache: 0
editor: 0
embed: 0
embedded_content: 0
entity_embed: 0
entity_reference_revisions: 0
faqfield: 0
Expand Down
16 changes: 16 additions & 0 deletions config/sync/embedded_content.button.default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
uuid: 19484be1-4a2c-47a3-a434-fc0512e9edd6
langcode: en
status: true
dependencies: { }
_core:
default_config_hash: 85TaSgJg6GmdfwCgIrSjQybqf3le4qpjywtDBKRbV_M
id: default
label: Default
settings:
label_singular: 'embedded content'
icon: |
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M500.3 7.251C507.7 13.33 512 22.41 512 31.1V175.1C512 202.5 483.3 223.1 447.1 223.1C412.7 223.1 383.1 202.5 383.1 175.1C383.1 149.5 412.7 127.1 447.1 127.1V71.03L351.1 90.23V207.1C351.1 234.5 323.3 255.1 287.1 255.1C252.7 255.1 223.1 234.5 223.1 207.1C223.1 181.5 252.7 159.1 287.1 159.1V63.1C287.1 48.74 298.8 35.61 313.7 32.62L473.7 .6198C483.1-1.261 492.9 1.173 500.3 7.251H500.3zM74.66 303.1L86.5 286.2C92.43 277.3 102.4 271.1 113.1 271.1H174.9C185.6 271.1 195.6 277.3 201.5 286.2L213.3 303.1H239.1C266.5 303.1 287.1 325.5 287.1 351.1V463.1C287.1 490.5 266.5 511.1 239.1 511.1H47.1C21.49 511.1-.0019 490.5-.0019 463.1V351.1C-.0019 325.5 21.49 303.1 47.1 303.1H74.66zM143.1 359.1C117.5 359.1 95.1 381.5 95.1 407.1C95.1 434.5 117.5 455.1 143.1 455.1C170.5 455.1 191.1 434.5 191.1 407.1C191.1 381.5 170.5 359.1 143.1 359.1zM440.3 367.1H496C502.7 367.1 508.6 372.1 510.1 378.4C513.3 384.6 511.6 391.7 506.5 396L378.5 508C372.9 512.1 364.6 513.3 358.6 508.9C352.6 504.6 350.3 496.6 353.3 489.7L391.7 399.1H336C329.3 399.1 323.4 395.9 321 389.6C318.7 383.4 320.4 376.3 325.5 371.1L453.5 259.1C459.1 255 467.4 254.7 473.4 259.1C479.4 263.4 481.6 271.4 478.7 278.3L440.3 367.1zM116.7 219.1L19.85 119.2C-8.112 90.26-6.614 42.31 24.85 15.34C51.82-8.137 93.26-3.642 118.2 21.83L128.2 32.32L137.7 21.83C162.7-3.642 203.6-8.137 231.6 15.34C262.6 42.31 264.1 90.26 236.1 119.2L139.7 219.1C133.2 225.6 122.7 225.6 116.7 219.1H116.7z"/></svg>
condition: ''
dialog_settings:
width: 800px
height: auto
1 change: 0 additions & 1 deletion config/sync/user.role.site_admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies:
- taxonomy.vocabulary.uswds_breakpoints
- taxonomy.vocabulary.uswds_classes
module:
- action
- system
- taxonomy
- tome_static
Expand Down
Loading