Skip to content

Commit

Permalink
Merge pull request #356 from Bixal/release/1.8.0
Browse files Browse the repository at this point in the history
Release/1.8.0
  • Loading branch information
mattsqd authored Dec 11, 2024
2 parents a42d83a + c1f96bb commit a5398e3
Show file tree
Hide file tree
Showing 25 changed files with 723 additions and 205 deletions.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"drupal/maillog": "1.x-dev@dev",
"drupal/mailsystem": "^4.4",
"drupal/media_library_edit": "^3.0",
"drupal/media_remote_hls": "^1.0",
"drupal/menu_admin_per_menu": "^1.5",
"drupal/metatag": "^2.0",
"drupal/override_node_options": "^2.7",
Expand Down
275 changes: 188 additions & 87 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions composer.log
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,5 @@ c844a0df1fb652429755003179a5177c|Matt Poole|feature/BSD-305-dep-update|Tue Oct 1
56ccb5a257914e0eced9c581db3dc19d|Matt Poole|release/1.5.0|Wed Oct 16 09:17:37 EDT 2024|./composer.sh update
835eac30efa74f467f99dea027b5e553|Matt Poole|feature/BSD-329-site-wide-alert-be|Fri Nov 1 15:48:57 EDT 2024|./composer.sh require drupal/sitewide_alert
79be0192ea4e882a1cf2b73eb098c76e|Matt Poole|feature/BSD-342-update-deps|Wed Nov 13 14:23:04 EST 2024|./composer.sh update
7ba32a3b2d2e71420c79a194217d54ff|Matt Poole|feature/BSD-348-update-deps|Fri Nov 22 10:45:45 EST 2024|./composer.sh update
fa3ebb6ff574f4eb1ae36967973062ed|John Franklin|feature/BSD-298-enable-hls-video|Fri Nov 22 11:45:43 EST 2024|./composer.sh require drupal/media_remote_hls
67 changes: 67 additions & 0 deletions config/sync/core.entity_form_display.media.hls_video.default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
uuid: 3aa18c7a-3a5e-4902-9ce3-f9bc813df535
langcode: en
status: true
dependencies:
config:
- field.field.media.hls_video.field_media_media_remote
- media.type.hls_video
module:
- path
id: media.hls_video.default
targetEntityType: media
bundle: hls_video
mode: default
content:
created:
type: datetime_timestamp
weight: 10
region: content
settings: { }
third_party_settings: { }
field_media_media_remote:
type: string_textfield
weight: 0
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
langcode:
type: language_select
weight: 2
region: content
settings:
include_locked: true
third_party_settings: { }
name:
type: string_textfield
weight: -5
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
path:
type: path
weight: 30
region: content
settings: { }
third_party_settings: { }
status:
type: boolean_checkbox
weight: 100
region: content
settings:
display_label: true
third_party_settings: { }
uid:
type: entity_reference_autocomplete
weight: 5
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
hidden: { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
uuid: 278bae80-6c7d-48db-a6a9-93b6dc62bdba
langcode: en
status: true
dependencies:
config:
- core.entity_form_mode.media.media_library
- field.field.media.hls_video.field_media_media_remote
- media.type.hls_video
id: media.hls_video.media_library
targetEntityType: media
bundle: hls_video
mode: media_library
content:
name:
type: string_textfield
weight: 0
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
hidden:
created: true
field_media_media_remote: true
langcode: true
path: true
status: true
uid: true
32 changes: 32 additions & 0 deletions config/sync/core.entity_view_display.media.hls_video.default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
uuid: 89538217-2bd1-4d8c-a553-b9afdeb624d5
langcode: en
status: true
dependencies:
config:
- field.field.media.hls_video.field_media_media_remote
- media.type.hls_video
module:
- media_remote_hls
id: media.hls_video.default
targetEntityType: media
bundle: hls_video
mode: default
content:
field_media_media_remote:
type: media_remote_hls
label: hidden
settings:
width: '960'
height: '600'
autoplay: '1'
formatter_class: Drupal\media_remote_hls\Plugin\Field\FieldFormatter\MediaRemoteHLSFormatter
third_party_settings: { }
weight: 0
region: content
hidden:
created: true
langcode: true
name: true
search_api_excerpt: true
thumbnail: true
uid: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
uuid: a48aacb5-1842-44a1-8f5a-a2126d6e3679
langcode: en
status: true
dependencies:
config:
- core.entity_view_mode.media.media_library
- field.field.media.hls_video.field_media_media_remote
- image.style.medium
- media.type.hls_video
module:
- image
id: media.hls_video.media_library
targetEntityType: media
bundle: hls_video
mode: media_library
content:
thumbnail:
type: image
label: hidden
settings:
image_link: ''
image_style: medium
image_loading:
attribute: lazy
third_party_settings: { }
weight: 0
region: content
hidden:
created: true
field_media_media_remote: true
langcode: true
name: true
search_api_excerpt: true
uid: true
2 changes: 2 additions & 0 deletions config/sync/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ module:
media: 0
media_library: 0
media_library_edit: 0
media_remote: 0
media_remote_hls: 0
menu_link_content: 0
menu_ui: 0
metatag: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
uuid: 5bcc2e43-d005-474d-9f0b-9b715e168fba
langcode: en
status: true
dependencies:
config:
- field.storage.media.field_media_media_remote
- media.type.hls_video
id: media.hls_video.field_media_media_remote
field_name: field_media_media_remote
entity_type: media
bundle: hls_video
label: 'Remote Media URL'
description: ''
required: true
translatable: true
default_value: { }
default_value_callback: ''
settings: { }
field_type: string
21 changes: 21 additions & 0 deletions config/sync/field.storage.media.field_media_media_remote.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
uuid: c8ffa937-f683-4509-a7bd-0e7dac2bd470
langcode: en
status: true
dependencies:
module:
- media
id: media.field_media_media_remote
field_name: field_media_media_remote
entity_type: media
type: string
settings:
max_length: 255
case_sensitive: false
is_ascii: false
module: core
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
11 changes: 11 additions & 0 deletions config/sync/language.content_settings.media.hls_video.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
uuid: a88483a5-0ed4-4676-8186-32640de95525
langcode: en
status: true
dependencies:
config:
- media.type.hls_video
id: media.hls_video
target_entity_type_id: media
target_bundle: hls_video
default_langcode: site_default
language_alterable: false
15 changes: 15 additions & 0 deletions config/sync/media.type.hls_video.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
uuid: 158e198c-4114-492e-af2b-fd53e6f5780a
langcode: en
status: true
dependencies:
module:
- media_remote
id: hls_video
label: 'HLS Video'
description: 'Remote video using the HLS protocol'
source: media_remote
queue_thumbnail_downloads: false
new_revision: false
source_configuration:
source_field: field_media_media_remote
field_map: { }
4 changes: 4 additions & 0 deletions config/sync/user.role.editor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
config:
- node.type.bixaler
- node.type.blog
- node.type.case_study
- node.type.contract_vehicle
- node.type.landing_page
- taxonomy.vocabulary.certifications
Expand Down Expand Up @@ -41,6 +42,7 @@ permissions:
- 'administer mainnavcta menu items'
- 'create bixaler content'
- 'create blog content'
- 'create case_study content'
- 'create contract_vehicle content'
- 'create landing_page content'
- 'create media'
Expand All @@ -52,6 +54,7 @@ permissions:
- 'create url aliases'
- 'delete any bixaler content'
- 'delete any blog content'
- 'delete any case_study content'
- 'delete any contract_vehicle content'
- 'delete any landing_page content'
- 'delete any media'
Expand All @@ -62,6 +65,7 @@ permissions:
- 'delete terms in team'
- 'edit any bixaler content'
- 'edit any blog content'
- 'edit any case_study content'
- 'edit any contract_vehicle content'
- 'edit any landing_page content'
- 'edit terms in certifications'
Expand Down
7 changes: 7 additions & 0 deletions stories/assets/styles/global/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,13 @@ h6 {
}
}

.bix-title-prefix-label {
@extend .bix-title-prefix;
border-left: none;
border-right: none;
padding: 0px;
}

dl {
line-height: 1.75;
margin-top: units(2);
Expand Down
15 changes: 12 additions & 3 deletions stories/components/section/section.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
*
* Available variables:
* - prefix: Optional string. Contains title prefix with borders on the side.
* - prefix_below: Opt boolean. If true, the prefix will show under the title.
* - prefix_label: Optional string. Adds a label to prefix seperated by a |
and removes the borders from the sides.
* - heading_type: String heading type for title.
* - title: String title of section.
* - description: String body text, can include paragraphs.
Expand Down Expand Up @@ -33,12 +36,18 @@
#}
<div class="bix-container">
{% block header %}
{% if prefix_below %}
{% include "@partials/section-title.html.twig" %}
{% endif %}
{% if prefix %}
<div class="bix-title-prefix">
{{ prefix }}
<div class="bix-title-prefix{% if prefix_label %}-label{% endif %}">
{% if prefix_label %}{{ prefix_label }}&nbsp;<span aria-hidden="true">|</span>&nbsp;{% endif %}{{ prefix }}
</div>
{% endif %}
{% include "@partials/section-title.html.twig" %}
{% if not prefix_below %}
{% include "@partials/section-title.html.twig" %}
{% endif %}

{% endblock %}

{% block description %}
Expand Down
2 changes: 2 additions & 0 deletions stories/components/section/section.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ export default {
args: {
center_content: false,
prefix: "Who we are",
prefix_below: 0,
prefix_label: '',
heading_type: "h2",
title:
"Bixal is a diverse group of strategists, designers, engineers, and thinkers.",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
_meta:
version: '1.0'
entity_type: file
uuid: f91cbcf4-ec16-4afc-affe-7ca92eb412d0
default_langcode: en
default:
uid:
-
target_id: 1
filename:
-
value: generic.png
uri:
-
value: 'public://media-icons/generic/generic.png'
filemime:
-
value: image/png
filesize:
-
value: 3900
status:
-
value: true
created:
-
value: 1732300629
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a5398e3

Please sign in to comment.