Skip to content

Commit 53b295a

Browse files
authored
Merge pull request #79 from ubc-web-services/d10
D10
2 parents 3113b38 + f6fe4db commit 53b295a

File tree

8 files changed

+177
-22
lines changed

8 files changed

+177
-22
lines changed

ubc_editor_config/config/install/editor.editor.filtered_text.yml

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ settings:
4848
- '|'
4949
- undo
5050
- redo
51+
- removeFormat
52+
- showBlocks
5153
- Fullscreen
5254
- sourceEditing
5355
plugins:
@@ -72,20 +74,30 @@ settings:
7274
ckeditor5_sourceEditing:
7375
allowed_tags:
7476
- '<cite>'
75-
- '<a hreflang class id name data-* aria-*>'
76-
- '<blockquote cite>'
77-
- '<span class>'
78-
- '<ul type>'
79-
- '<ol type>'
80-
- '<iframe allowfullscreen frameborder height max-width src class>'
77+
- '<dd>'
78+
- '<dl>'
79+
- '<dt>'
80+
- '<kbd>'
81+
- '<samp>'
82+
- '<iframe longdesc name scrolling src title align height frameborder width allowfullscreen max-width class>'
83+
- '<img srcset>'
84+
- '<svg viewBox aria-* class>'
85+
- '<use href>'
86+
- '<span>'
87+
- '<drupal-media title class>'
88+
- '<h2 id>'
89+
- '<h3 id>'
90+
- '<h4 id>'
91+
- '<h5 id>'
92+
- '<h6 id>'
8193
ckeditor5_style:
8294
styles:
8395
-
8496
label: 'Text Hug (remove top spacing)'
8597
element: '<p class="text-hug">'
8698
-
8799
label: 'Lead Text'
88-
element: '<p class="text-lead text-ubc-blue-sea">'
100+
element: '<p class="text-lead">'
89101
-
90102
label: 'Text: small'
91103
element: '<p class="text-sm">'
@@ -170,12 +182,9 @@ settings:
170182
-
171183
label: 'Transparent Button'
172184
element: '<a class="unit-button unit-button--transparent">'
173-
-
174-
label: 'Simple Button'
175-
element: '<a class="unit-button unit-button--simple">'
176185
-
177186
label: 'Hidden Anchor'
178-
element: '<a class="anchor-invisible sr-only">'
187+
element: '<a class="anchor anchor-invisible sr-only">'
179188
editor_advanced_link_link:
180189
enabled_attributes:
181190
- id
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
langcode: en
2+
status: true
3+
dependencies:
4+
module:
5+
- focal_point
6+
name: card_focal_point_xl
7+
label: 'Card, focal point, xl'
8+
effects:
9+
6e3afed2-f98e-4eea-9b7a-e8b220af77b1:
10+
uuid: 6e3afed2-f98e-4eea-9b7a-e8b220af77b1
11+
id: focal_point_scale_and_crop
12+
weight: 1
13+
data:
14+
width: 970
15+
height: 843
16+
crop_type: focal_point
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
langcode: en
2+
status: true
3+
dependencies: { }
4+
name: video_thumbnail
5+
label: 'Video thumbnail'
6+
effects:
7+
5c2acded-7aed-40d4-a6cc-d12164bb6750:
8+
uuid: 5c2acded-7aed-40d4-a6cc-d12164bb6750
9+
id: image_scale_and_crop
10+
weight: 1
11+
data:
12+
width: 900
13+
height: 506
14+
anchor: center-center

ubc_image_styles/config/install/responsive_image.styles.card_focal_point.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@ dependencies:
44
config:
55
- image.style.card_focal_point_lg
66
- image.style.card_focal_point_sm
7+
- image.style.card_focal_point_xl
78
- image.style.medium
89
id: card_focal_point
910
label: 'Card, focal point'
1011
image_style_mappings:
1112
-
12-
breakpoint_id: responsive_image.viewport_sizing
13-
multiplier: 1x
1413
image_mapping_type: sizes
1514
image_mapping:
16-
sizes: '(min-width:960px) 640px, (min-width:640px) 320px, 100vw'
15+
sizes: '(max-width: 380px) 380px, (max-width: 640px) 640px, 970px'
1716
sizes_image_styles:
1817
- card_focal_point_lg
1918
- card_focal_point_sm
19+
- card_focal_point_xl
20+
breakpoint_id: responsive_image.viewport_sizing
21+
multiplier: 1x
2022
breakpoint_group: responsive_image
2123
fallback_image_style: medium

ubc_image_styles/ubc_image_styles.install

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,37 @@
11
<?php
22

3+
/**
4+
* Implements hook_install().
5+
*
6+
* @ingroup ubc_image_styles
7+
*/
8+
function ubc_image_styles_install() {
9+
$config = \Drupal::service('config.factory');
10+
// alter preexisting responsive image style when installing
11+
$config->getEditable('responsive_image.styles.wide')
12+
->set('dependencies.config', [
13+
'image.style.max_1300x1300',
14+
'image.style.max_2600x2600',
15+
'image.style.max_970x970',
16+
])
17+
->set('image_style_mappings', [
18+
'0' => [
19+
'image_mapping_type' => 'sizes',
20+
'breakpoint_id' => 'responsive_image.viewport_sizing',
21+
'multiplier' => '1x',
22+
'image_mapping' => [
23+
'sizes' => '(min-width: 1290px) 1290px, 100vw',
24+
'sizes_image_styles' => [
25+
'max_1300x1300',
26+
'max_2600x2600',
27+
'max_970x970',
28+
],
29+
],
30+
],
31+
])
32+
->set('fallback_image_style', 'max_970x970')
33+
->save();
34+
}
335

436
/**
537
* Update configuration from file.

ubc_media_entities/config/install/core.entity_view_display.media.remote_video.full.yml

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,64 @@ dependencies:
44
config:
55
- core.entity_view_mode.media.full
66
- field.field.media.remote_video.field_media_oembed_video
7+
- image.style.video_thumbnail
78
- media.type.remote_video
89
module:
910
- field_group
1011
- media
12+
- svg_image
1113
third_party_settings:
1214
field_group:
1315
group_wrapper:
1416
children:
17+
- thumbnail
1518
- field_media_oembed_video
19+
label: Wrapper
1620
parent_name: ''
17-
weight: 20
21+
region: hidden
22+
weight: 4
1823
format_type: html_element
1924
format_settings:
20-
label: Wrapper
25+
classes: media-embed-letterbox
26+
id: ''
2127
element: div
2228
show_label: false
2329
label_element: h3
2430
attributes: ''
2531
effect: none
2632
speed: fast
27-
id: ''
28-
classes: media-embed-letterbox
29-
label: Wrapper
3033
id: media.remote_video.full
3134
targetEntityType: media
3235
bundle: remote_video
3336
mode: full
3437
content:
3538
field_media_oembed_video:
3639
type: oembed
37-
weight: 0
3840
label: hidden
3941
settings:
4042
max_width: 900
41-
max_height: 508
43+
max_height: 506
44+
loading:
45+
attribute: lazy
4246
third_party_settings: { }
47+
weight: 0
48+
region: content
49+
thumbnail:
50+
type: image
51+
label: hidden
52+
settings:
53+
image_link: ''
54+
image_style: video_thumbnail
55+
image_loading:
56+
attribute: lazy
57+
svg_attributes:
58+
width: null
59+
height: null
60+
svg_render_as_image: true
61+
third_party_settings: { }
62+
weight: 0
4363
region: content
4464
hidden:
4565
created: true
4666
name: true
47-
thumbnail: true
4867
uid: true

ubc_media_entities/ubc_media_entities.info.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ dependencies:
99
- drupal:media
1010
- drupal:media_bulk_upload
1111
- drupal:svg_image
12+
- ubc_image_styles:ubc_image_styles
1213
core_version_requirement: ^10

ubc_media_entities/ubc_media_entities.install

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,68 @@
11
<?php
22

33

4+
/**
5+
* Implements hook_install().
6+
*
7+
* @ingroup ubc_media_entities
8+
*/
9+
function ubc_media_entities_install() {
10+
$config = \Drupal::service('config.factory');
11+
// alter preexisting media view mode when installing
12+
$config->getEditable('core.entity_view_display.media.remote_video.default')
13+
->set('dependencies.config', [
14+
'field.field.media.remote_video.field_media_oembed_video',
15+
'image.style.video_thumbnail',
16+
'media.type.remote_video',
17+
])
18+
->set('dependencies.module', [
19+
'media',
20+
'svg_image',
21+
])
22+
->set('content', [
23+
'field_media_oembed_video' => [
24+
'type' => 'oembed',
25+
'label' => 'hidden',
26+
'weight' => '0',
27+
'region' => 'content',
28+
'third_party_settings' => [],
29+
'settings' => [
30+
'max_width' => '900',
31+
'max_height' => '506',
32+
'loading' => [
33+
'attribute' => 'lazy',
34+
],
35+
],
36+
],
37+
'thumbnail' => [
38+
'type' => 'image',
39+
'label' => 'hidden',
40+
'weight' => '1',
41+
'region' => 'content',
42+
'third_party_settings' => [],
43+
'settings' => [
44+
'image_link' => '',
45+
'image_style' => 'video_thumbnail',
46+
'image_loading' => [
47+
'attribute' => 'lazy',
48+
],
49+
'svg_attributes' => [
50+
'width' => null,
51+
'height' => null,
52+
],
53+
'svg_render_as_image' => true,
54+
],
55+
],
56+
])
57+
->set('hidden', [
58+
'created' => true,
59+
'name' => true,
60+
'uid' => true,
61+
])
62+
->save();
63+
}
64+
65+
466
/**
567
* Update configuration from file.
668
* https://www.drupal.org/docs/8/api/update-api/introduction-to-update-api-for-drupal-8

0 commit comments

Comments
 (0)