Skip to content

Commit

Permalink
Merge pull request #582 from chapter-three/deployment/20211103
Browse files Browse the repository at this point in the history
Deployment/20211103
  • Loading branch information
melwong-jcc authored Nov 3, 2021
2 parents 5261d9d + 53409fe commit c85bd87
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 76 deletions.
3 changes: 1 addition & 2 deletions composer-manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ packages:
drupal/honeypot: 1.30.0
drupal/inline_entity_form: 1.0.0-rc6
drupal/key: 1.14.0
drupal/linkit: 4.3.0
drupal/linkit: 4.4.0
drupal/log_stdout: 1.1.0
drupal/login_emailusername: 1.1.0
drupal/maillog: 'dev-1.x:3ec675bd7842c04bc01860fa8b3f424f95a17d93'
Expand All @@ -106,7 +106,6 @@ packages:
drupal/range: 1.2.0
drupal/redirect: 1.6.0
drupal/restui: 1.20.0
drupal/robotstxt: 1.4.0
drupal/role_delegation: 1.1.0
drupal/scheduler: 1.3.0
drupal/scheduler_content_moderation_integration: 1.3.0
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@
"drupal/range": "^1.1",
"drupal/redirect": "^1.3",
"drupal/restui": "^1.20",
"drupal/robotstxt": "^1.4",
"drupal/role_delegation": "^1.0",
"drupal/scheduler": "^1.3",
"drupal/scheduler_content_moderation_integration": "^1.3",
Expand Down
76 changes: 8 additions & 68 deletions composer.lock

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

1 change: 0 additions & 1 deletion config/config-default/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ module:
rh_media: 0
rh_node: 0
rh_taxonomy: 0
robotstxt: 0
role_delegation: 0
scheduler: 0
scheduler_content_moderation_integration: 0
Expand Down
3 changes: 0 additions & 3 deletions config/config-default/robotstxt.settings.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,24 @@

{% set column_content_left = {field_media: content.field_media, body: content.body} %}

{% set right_column %}
<div class="jcc-share--spacer"></div>
{% endset %}

<div class="jcc-share__container">
{% include '@organisms/sections/share/share.twig' with {
share: {
email_modal: drupal_entity('webform', 'share_this_page'),
text_modal: drupal_entity('webform', 'mark_my_place_text_message')
}
} only %}
</div>

{% if column_content_left|render %}
{% include '@organisms/sections/text-section/text-section.twig' with {
text_section: {
column_content_left: column_content_left
column_content_left: column_content_left,
column_content_right: right_column,
}
} only %}
{% endif %}
Expand Down

0 comments on commit c85bd87

Please sign in to comment.