Skip to content

Commit

Permalink
Merge branch '8.0.x' into remove-responsive-preview
Browse files Browse the repository at this point in the history
* 8.0.x:
  Remove jquery_ui (#820)
  Remove blazy and slick integration
  Remove thunder_demo module
  Remove drupal/jquery_ui_draggable dependency
  • Loading branch information
Christian Fritsch committed Jul 12, 2024
2 parents 73021e5 + 362cf2d commit dbfdfb7
Show file tree
Hide file tree
Showing 119 changed files with 705 additions and 4,504 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ jobs:
composer require "drupal/thunder_admin" --no-update
composer require "drupal/shariff" --no-update
composer require "drupal/ctools" --no-update
composer require "drupal/slick" --no-update
composer require "drupal/blazy" --no-update
composer require "drupal/core-dev:~10.0.0" --no-update
composer update
Expand Down
7 changes: 1 addition & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,12 @@
"drupal/admin_toolbar": "^3.4",
"drupal/autofill": "^1.1",
"drupal/autosave_form": "^1.6",
"drupal/blazy": "^2.14",
"drupal/checklistapi": "^2.1",
"drupal/core-recommended": "~10.3.0@stable",
"drupal/config_selector": "^2.1",
"drupal/config_update": "^1.7 || ^2.0",
"drupal/content_lock": "^2.1",
"drupal/crop": "^2.2",
"drupal/default_content": "^1.0-alpha7||^2.0@ALPHA",
"drupal/diff": "1.7",
"drupal/dropzonejs": "^2.8",
"drupal/empty_fields": "^1.0-alpha1",
Expand Down Expand Up @@ -94,7 +92,6 @@
"drupal/select2": "^1.7",
"drupal/search_api_mark_outdated": "^1.0",
"drupal/simple_sitemap": "^4.1.6",
"drupal/slick": "^2.7",
"drupal/token": "^1.7",
"drupal/update_helper": "^2.0||^3.0.3||^4.0",
"drupal/search_api": "^1.29",
Expand All @@ -108,9 +105,7 @@
"npm-asset/slick-carousel": "^1.8",
"npm-asset/select2": "^4.0.7",
"caxy/php-htmldiff": "^0.1.14",
"webonyx/graphql-php": "^14.11.8",
"drupal/jquery_ui": "^1.6",
"drupal/jquery_ui_draggable": "^2.1"
"webonyx/graphql-php": "^14.11.8"
},
"suggest": {
"drupal/search_api_solr": "Provides a Apache Solr backend for the Search API module"
Expand Down
61 changes: 0 additions & 61 deletions config/install/filter.format.basic_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,12 @@ langcode: en
status: true
dependencies:
module:
- blazy
- editor
- linkit
- slick
name: 'Basic HTML'
format: basic_html
weight: 0
filters:
blazy_filter:
id: blazy_filter
provider: blazy
status: false
weight: 3
settings:
media_switch: ''
hybrid_style: ''
box_style: ''
box_media_style: ''
box_caption: ''
filter_tags:
img: img
iframe: iframe
use_data_uri: '0'
editor_file_reference:
id: editor_file_reference
provider: editor
Expand Down Expand Up @@ -71,47 +54,3 @@ filters:
weight: 0
settings:
title: true
slick_filter:
id: slick_filter
provider: slick
status: false
weight: 4
settings:
caption:
alt: '0'
title: '0'
optionset: default
layout: ''
background: false
box_caption: ''
box_caption_custom: ''
box_media_style: ''
loading: ''
responsive_image_style: ''
box_style: ''
image_style: ''
media_switch: ''
ratio: ''
thumbnail_style: ''
grid: ''
grid_medium: ''
grid_small: ''
style: ''
skin: ''
overridables:
arrows: '0'
autoplay: '0'
dots: '0'
draggable: '0'
infinite: '0'
mouseWheel: '0'
randomize: '0'
variableWidth: '0'
optionset_thumbnail: ''
skin_thumbnail: ''
thumbnail_caption: ''
thumbnail_effect: ''
thumbnail_position: ''
override: false
preserve_keys: false
visible_items: null
61 changes: 0 additions & 61 deletions config/install/filter.format.full_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,12 @@ langcode: en
status: true
dependencies:
module:
- blazy
- editor
- linkit
- slick
name: 'Full HTML'
format: full_html
weight: 2
filters:
blazy_filter:
id: blazy_filter
provider: blazy
status: false
weight: 3
settings:
media_switch: ''
hybrid_style: ''
box_style: ''
box_media_style: ''
box_caption: ''
filter_tags:
img: img
iframe: iframe
use_data_uri: '0'
editor_file_reference:
id: editor_file_reference
provider: editor
Expand Down Expand Up @@ -71,47 +54,3 @@ filters:
weight: 0
settings:
title: true
slick_filter:
id: slick_filter
provider: slick
status: false
weight: 4
settings:
caption:
alt: '0'
title: '0'
optionset: default
layout: ''
background: false
box_caption: ''
box_caption_custom: ''
box_media_style: ''
loading: ''
responsive_image_style: ''
box_style: ''
image_style: ''
media_switch: ''
ratio: ''
thumbnail_style: ''
grid: ''
grid_medium: ''
grid_small: ''
style: ''
skin: ''
overridables:
arrows: '0'
autoplay: '0'
dots: '0'
draggable: '0'
infinite: '0'
mouseWheel: '0'
randomize: '0'
variableWidth: '0'
optionset_thumbnail: ''
skin_thumbnail: ''
thumbnail_caption: ''
thumbnail_effect: ''
thumbnail_position: ''
override: false
preserve_keys: false
visible_items: null
64 changes: 1 addition & 63 deletions config/install/filter.format.restricted_html.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
langcode: en
status: true
dependencies:
module:
- blazy
- slick
dependencies: { }
name: 'Restricted HTML'
format: restricted_html
weight: 1
filters:
blazy_filter:
id: blazy_filter
provider: blazy
status: false
weight: 3
settings:
media_switch: ''
hybrid_style: ''
box_style: ''
box_media_style: ''
box_caption: ''
filter_tags:
img: img
iframe: iframe
use_data_uri: '0'
filter_autop:
id: filter_autop
provider: filter
Expand All @@ -45,47 +27,3 @@ filters:
weight: 0
settings:
filter_url_length: 72
slick_filter:
id: slick_filter
provider: slick
status: false
weight: 4
settings:
caption:
alt: '0'
title: '0'
optionset: default
layout: ''
background: false
box_caption: ''
box_caption_custom: ''
box_media_style: ''
loading: ''
responsive_image_style: ''
box_style: ''
image_style: ''
media_switch: ''
ratio: ''
thumbnail_style: ''
grid: ''
grid_medium: ''
grid_small: ''
style: ''
skin: ''
overridables:
arrows: '0'
autoplay: '0'
dots: '0'
draggable: '0'
infinite: '0'
mouseWheel: '0'
randomize: '0'
variableWidth: '0'
optionset_thumbnail: ''
skin_thumbnail: ''
thumbnail_caption: ''
thumbnail_effect: ''
thumbnail_position: ''
override: false
preserve_keys: false
visible_items: null
74 changes: 4 additions & 70 deletions config/install/views.view.media_library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ display:
type: mini
options:
offset: 0
pagination_heading_level: h4
items_per_page: 24
total_pages: null
id: 0
Expand All @@ -150,7 +151,6 @@ display:
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down Expand Up @@ -466,29 +466,7 @@ display:
- url.query_args
- user
- user.permissions
tags:
- 'config:core.entity_view_display.media.gallery.default'
- 'config:core.entity_view_display.media.gallery.media_library'
- 'config:core.entity_view_display.media.gallery.paragraph_preview'
- 'config:core.entity_view_display.media.image.default'
- 'config:core.entity_view_display.media.image.media_library'
- 'config:core.entity_view_display.media.image.paragraph_preview'
- 'config:core.entity_view_display.media.image.slick'
- 'config:core.entity_view_display.media.image.thumbnail'
- 'config:core.entity_view_display.media.instagram.default'
- 'config:core.entity_view_display.media.instagram.media_library'
- 'config:core.entity_view_display.media.instagram.paragraph_preview'
- 'config:core.entity_view_display.media.instagram.thumbnail'
- 'config:core.entity_view_display.media.pinterest.default'
- 'config:core.entity_view_display.media.pinterest.media_library'
- 'config:core.entity_view_display.media.pinterest.paragraph_preview'
- 'config:core.entity_view_display.media.twitter.default'
- 'config:core.entity_view_display.media.twitter.media_library'
- 'config:core.entity_view_display.media.twitter.paragraph_preview'
- 'config:core.entity_view_display.media.video.default'
- 'config:core.entity_view_display.media.video.media_library'
- 'config:core.entity_view_display.media.video.paragraph_preview'
- 'config:core.entity_view_display.media.video.thumbnail'
tags: { }
page:
id: page
display_title: Page
Expand Down Expand Up @@ -784,29 +762,7 @@ display:
- url.query_args
- user
- user.permissions
tags:
- 'config:core.entity_view_display.media.gallery.default'
- 'config:core.entity_view_display.media.gallery.media_library'
- 'config:core.entity_view_display.media.gallery.paragraph_preview'
- 'config:core.entity_view_display.media.image.default'
- 'config:core.entity_view_display.media.image.media_library'
- 'config:core.entity_view_display.media.image.paragraph_preview'
- 'config:core.entity_view_display.media.image.slick'
- 'config:core.entity_view_display.media.image.thumbnail'
- 'config:core.entity_view_display.media.instagram.default'
- 'config:core.entity_view_display.media.instagram.media_library'
- 'config:core.entity_view_display.media.instagram.paragraph_preview'
- 'config:core.entity_view_display.media.instagram.thumbnail'
- 'config:core.entity_view_display.media.pinterest.default'
- 'config:core.entity_view_display.media.pinterest.media_library'
- 'config:core.entity_view_display.media.pinterest.paragraph_preview'
- 'config:core.entity_view_display.media.twitter.default'
- 'config:core.entity_view_display.media.twitter.media_library'
- 'config:core.entity_view_display.media.twitter.paragraph_preview'
- 'config:core.entity_view_display.media.video.default'
- 'config:core.entity_view_display.media.video.media_library'
- 'config:core.entity_view_display.media.video.paragraph_preview'
- 'config:core.entity_view_display.media.video.thumbnail'
tags: { }
widget:
id: widget
display_title: Widget
Expand Down Expand Up @@ -1137,29 +1093,7 @@ display:
- url
- url.query_args
- user.permissions
tags:
- 'config:core.entity_view_display.media.gallery.default'
- 'config:core.entity_view_display.media.gallery.media_library'
- 'config:core.entity_view_display.media.gallery.paragraph_preview'
- 'config:core.entity_view_display.media.image.default'
- 'config:core.entity_view_display.media.image.media_library'
- 'config:core.entity_view_display.media.image.paragraph_preview'
- 'config:core.entity_view_display.media.image.slick'
- 'config:core.entity_view_display.media.image.thumbnail'
- 'config:core.entity_view_display.media.instagram.default'
- 'config:core.entity_view_display.media.instagram.media_library'
- 'config:core.entity_view_display.media.instagram.paragraph_preview'
- 'config:core.entity_view_display.media.instagram.thumbnail'
- 'config:core.entity_view_display.media.pinterest.default'
- 'config:core.entity_view_display.media.pinterest.media_library'
- 'config:core.entity_view_display.media.pinterest.paragraph_preview'
- 'config:core.entity_view_display.media.twitter.default'
- 'config:core.entity_view_display.media.twitter.media_library'
- 'config:core.entity_view_display.media.twitter.paragraph_preview'
- 'config:core.entity_view_display.media.video.default'
- 'config:core.entity_view_display.media.video.media_library'
- 'config:core.entity_view_display.media.video.paragraph_preview'
- 'config:core.entity_view_display.media.video.thumbnail'
tags: { }
widget_table:
id: widget_table
display_title: 'Widget (table)'
Expand Down
Loading

0 comments on commit dbfdfb7

Please sign in to comment.