Skip to content

Commit

Permalink
remove assetsUrl being passed to header and footer (#3214)
Browse files Browse the repository at this point in the history
Co-authored-by: Alessio Venturini <[email protected]>
  • Loading branch information
rmccar and alessioventuriniAND authored May 30, 2024
1 parent 088f908 commit c7b0d16
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions src/layout/_template.njk
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{% if pageConfig.cdn or release_version or designSystemVersion %}
{# Production #}
{% set cdn_url = (pageConfig.cdn.url if pageConfig.cdn and pageConfig.cdn.url) or "https://cdn.ons.gov.uk/sdc/design-system" %}
{% set slash = "" if cdn_url | last == "/" else
{% set slash = "" if cdn_url | last == "/" else
"/" %}
{% set assetsURL = cdn_url + slash + ((pageConfig.cdn.version if pageConfig.cdn and pageConfig.cdn.version) or release_version or designSystemVersion) %}
{% elif pageConfig.assetsURL %}
Expand Down Expand Up @@ -44,11 +44,11 @@

{# Page columns #}
{% set pageColNumber = pageConfig.pageColNumber | default("12") %}
{% set pageColClasses = pageConfig.pageColClasses if pageConfig.pageColClasses else
{% set pageColClasses = pageConfig.pageColClasses if pageConfig.pageColClasses else
'' %}
{% set mainClasses = pageConfig.mainColClasses if pageConfig.mainColClasses else
{% set mainClasses = pageConfig.mainColClasses if pageConfig.mainColClasses else
'' %}
{% set themeColor = pageConfig.themeColor if pageConfig.themeColor else
{% set themeColor = pageConfig.themeColor if pageConfig.themeColor else
"#206095" %}
<!doctype html>
<html lang="{{ currentLanguageISOCode }}">
Expand Down Expand Up @@ -95,7 +95,7 @@
{% endif %}

{% if pageConfig.social %}
{% set twitterImagePath = pageConfig.social.twitterImage if pageConfig.social.twitterImage else
{% set twitterImagePath = pageConfig.social.twitterImage if pageConfig.social.twitterImage else
assetsURL + '/favicons/twitter.png' %}
<!-- Twitter -->
<meta name="twitter:card" content="summary">
Expand Down Expand Up @@ -147,7 +147,6 @@
"siteSearchAutosuggest": pageConfig.header.siteSearchAutosuggest,
"browserBanner": pageConfig.header.browserBanner,
"phase": pageConfig.header.phase,
"assetsURL": assetsURL,
"serviceLinks": pageConfig.header.serviceLinks,
"variants": pageConfig.header.variants,
"classes": pageConfig.header.classes,
Expand Down Expand Up @@ -190,7 +189,6 @@
{% if pageConfig.footer %}
{{
onsFooter({
"assetsURL": assetsURL,
"wide": pageConfig.wide,
"fullWidth": pageConfig.fullWidth,
"classes": "ons-page__footer",
Expand Down

0 comments on commit c7b0d16

Please sign in to comment.