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.

Sign up for GitHub

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

Jump to bottom

EPAD8-2563: Update Pattern Lab includes of CSS and JS to match Drupal #1552

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

EPAD8-2563: Update Pattern Lab includes of CSS and JS to match Drupal #1552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a16d1cf
Fix CKEditor5 readiness patch
dcmouyard Oct 21, 2024
80d7226
EPAD8-2563: Update Pattern Lab includes of CSS and JS to match Drupal
dcmouyard Oct 21, 2024
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
2 changes: 1 addition & 1 deletion services/drupal/composer.patches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
"Fix problem with adding content into nested paragraphs containing same field name": "patches/layout_paragraphs-unique_field_ids-3258029-MR-eb1df.patch"
},
"drupal/filter_html_plus": {
"CKEditor5 readiness": "https://git.drupalcode.org/project/filter_html_plus/-/merge_requests/1.diff"
"CKEditor5 readiness": "https://www.drupal.org/files/issues/2024-10-18/3322249-ckeditor5-10.patch"
},
"drupal/anchor_link": {
"Start a 3.0.x branch for CKEditor Anchor Link for semantic versioning and better integration with Drupal 10, CKEditor 5, and LinkIt" : "https://www.drupal.org/files/issues/2023-08-22/anchor_link-ckeditor5-compatibility-3206676-98.patch"
Expand Down
15 changes: 11 additions & 4 deletions services/drupal/web/themes/epa_theme/source/_meta/_foot.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,18 @@
{% endif -%}

<script src="{{ location_root }}core/assets/vendor/jquery/jquery.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/assets/vendor/css-escape/css.escape.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/assets/vendor/es6-promise/es6-promise.auto.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/assets/vendor/once/once.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/assets/vendor/jquery-once/jquery.once.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/misc/drupalSettingsLoader.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/misc/drupal.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/misc/drupal.init.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/assets/vendor/tabbable/index.umd.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/misc/progress.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/assets/vendor/loadjs/loadjs.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/misc/debounce.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/misc/announce.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/misc/message.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}core/misc/ajax.js?{{ cacheBuster }}"></script>
<script src="{{ location_root }}themes/contrib/stable/js/ajax.js?{{ cacheBuster }}"></script>
<script src="{{ location_theme }}js/dist/common.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_theme }}js/dist/scripts.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_theme }}js/dist/header-search.min.js?{{ cacheBuster }}"></script>
Expand All @@ -32,10 +37,12 @@
<script src="{{ location_theme }}js/dist/hero-slideshow.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_theme }}js/dist/image-gallery.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_theme }}js/dist/media-link.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_theme }}js/dist/private-sitewide-alert.es6.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_theme }}js/dist/private-sitewide-alert.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_theme }}js/dist/protected-links.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_theme }}js/dist/sidenav-menu.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_theme }}js/dist/sitewide-alert.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_theme }}js/dist/toggle-admin.min.js?{{ cacheBuster }}"></script>
<script src="{{ location_theme }}js/dist/vid-copy.min.js?{{ cacheBuster }}"></script>

<!--DO NOT REMOVE-->
{{ patternLabFoot|raw }}
Expand Down
70 changes: 35 additions & 35 deletions services/drupal/web/themes/epa_theme/source/_meta/_head.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,41 @@
<title>{{ page_title }} | {{ site_name }}</title>

{% if standalone_template %}
<!-- START: The following can be tweaked or removed. -->
<link rel="canonical" href="https://archive.epa.gov/">
<link rel="shortlink" href="https://archive.epa.gov/">
<meta name="description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated.">
<meta name="keywords" content="EPA, archive, web">
<meta property="DC.title" content="{{ page_title }}">
<meta property="DC.description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated.">
<meta property="DC.Subject.epachannel" content="Learn the Issues">
<meta property="DC.type" content="Overviews and Factsheets">
<meta property="DC.date.created" content="2023-12-04">
<meta property="DC.date.modified" content="2023-12-04">
<meta property="DC.date.reviewed" content="2023-12-04">
<meta property="DC.creator" content="US EPA,OA">
<meta property="DC.language" content="en">
<meta property="WebArea" content="Archive">
<meta property="ContentType" content="Basic page">
<meta property="og:site_name" content="US EPA">
<meta property="og:type" content="website">
<meta property="og:url" content="https://archive.epa.gov">
<meta property="og:title" content="{{ page_title }} | {{ site_name }}">
<meta property="og:description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated.">
<meta property="og:image" content="https://www.epa.gov/system/files/images/2022-03/epa-standard-twitter.jpg">
<meta property="og:image:width" content="1200">
<meta property="og:image:height" content="630">
<meta property="og:updated_time" content="2023-12-04">
<meta property="og:image:alt" content="U.S. Environmental Protection Agency">
<meta property="og:country_name" content="United States of America">
<meta property="article:published_time" content="2023-12-04T00:00:00-05:00">
<meta property="article:modified_time" content="2023-12-04">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:image:alt" content="U.S. Environmental Protection Agency">
<meta name="twitter:image:height" content="600">
<meta name="twitter:image:width" content="1200">
<meta name="twitter:image" content="https://www.epa.gov/system/files/images/2022-03/epa-standard-twitter.jpg">
<!-- END: The above can be tweaked or removed. -->
<!-- START: The following can be tweaked or removed. -->
<link rel="canonical" href="https://archive.epa.gov/">
<link rel="shortlink" href="https://archive.epa.gov/">
<meta name="description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated.">
<meta name="keywords" content="EPA, archive, web">
<meta property="DC.title" content="{{ page_title }}">
<meta property="DC.description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated.">
<meta property="DC.Subject.epachannel" content="Learn the Issues">
<meta property="DC.type" content="Overviews and Factsheets">
<meta property="DC.date.created" content="2023-12-04">
<meta property="DC.date.modified" content="2023-12-04">
<meta property="DC.date.reviewed" content="2023-12-04">
<meta property="DC.creator" content="US EPA,OA">
<meta property="DC.language" content="en">
<meta property="WebArea" content="Archive">
<meta property="ContentType" content="Basic page">
<meta property="og:site_name" content="US EPA">
<meta property="og:type" content="website">
<meta property="og:url" content="https://archive.epa.gov">
<meta property="og:title" content="{{ page_title }} | {{ site_name }}">
<meta property="og:description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated.">
<meta property="og:image" content="https://www.epa.gov/system/files/images/2022-03/epa-standard-twitter.jpg">
<meta property="og:image:width" content="1200">
<meta property="og:image:height" content="630">
<meta property="og:updated_time" content="2023-12-04">
<meta property="og:image:alt" content="U.S. Environmental Protection Agency">
<meta property="og:country_name" content="United States of America">
<meta property="article:published_time" content="2023-12-04T00:00:00-05:00">
<meta property="article:modified_time" content="2023-12-04">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:image:alt" content="U.S. Environmental Protection Agency">
<meta name="twitter:image:height" content="600">
<meta name="twitter:image:width" content="1200">
<meta name="twitter:image" content="https://www.epa.gov/system/files/images/2022-03/epa-standard-twitter.jpg">
<!-- END: The above can be tweaked or removed. -->
{% endif %}

<link rel="icon" type="image/x-icon" href="{{ location_theme }}images/favicon.ico">
Expand Down