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.

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

DP-706 Update govuk-frontend 👑 + DP-726 Update footer to match FTS #778

Merged
merged 2 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 34 additions & 7 deletions Frontend/CO.CDP.OrganisationApp/Pages/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<meta name="theme-color" content="#000000" />
<meta name="description" content="GOV.UK Central Digital Platform" />
<link rel="manifest" href="/manifest.json" />
<link rel="stylesheet" href="/css/govuk-frontend-5.4.1.min.css">
<link rel="stylesheet" href="/css/govuk-frontend-5.7.1.min.css">
<link rel="stylesheet" href="/css/site.css">
<title>Central Digital Platform - GOV.UK</title>
</head>
Expand Down Expand Up @@ -148,10 +148,34 @@
@RenderBody()
</div>

<footer class="govuk-footer" role="contentinfo">
<footer class="govuk-footer">
<div class="govuk-width-container">
<div class="govuk-footer__meta">
<div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
<h2 class="govuk-visually-hidden">Support links</h2>
<ul class="govuk-footer__inline-list">
<li class="govuk-footer__inline-list-item">
<a class="govuk-footer__link" href="https://www.gov.uk/government/organisations/crown-commercial-service">About us</a>
</li>
<li class="govuk-footer__inline-list-item">
<a class="govuk-footer__link" href="#">Contact us</a>
</li>
<li class="govuk-footer__inline-list-item">
<a class="govuk-footer__link" href="@($"{ftsService}/Home/AccessibilityStatement")">Accessibility statement</a>
</li>
<li class="govuk-footer__inline-list-item">
<a class="govuk-footer__link" href="@($"{ftsService}/Home/TermsAndConditions")">Terms and conditions</a>
</li>
<li class="govuk-footer__inline-list-item">
<a class="govuk-footer__link" href="https://www.gov.uk/government/publications/crown-commercial-service-privacy-notice/crown-commercial-service-privacy-notice">Privacy notice</a>
</li>
<li class="govuk-footer__inline-list-item">
<a class="govuk-footer__link" href="@($"{ftsService}/Home/Cookies")">Cookies</a>
</li>
<li class="govuk-footer__inline-list-item">
<a class="govuk-footer__link" href="@($"{ftsService}/Developer/Documentation")">Data and API</a>
</li>
</ul>
<svg aria-hidden="true"
focusable="false"
class="govuk-footer__licence-logo"
Expand All @@ -163,9 +187,10 @@
d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145" />
</svg>
<span class="govuk-footer__licence-description">
All content is available under the <a class="govuk-footer__link"
href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
rel="license">Open Government Licence v3.0</a>, except where otherwise stated
All content is available under the
<a class="govuk-footer__link"
href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
rel="license">Open Government Licence v3.0</a>, except where otherwise stated
</span>
</div>
<div class="govuk-footer__meta-item">
Expand All @@ -175,11 +200,13 @@
</a>
</div>
</div>
<p>Notices are based on TED XML schema. © European Union, <a class="govuk-footer__link" href="https://ted.europa.eu">https: //ted.europa.eu</a>, 1998–2020</p>
</div>
</footer>
<script type="module" src="/js/govuk-frontend-5.4.1.min.js"></script>

<script type="module" src="/js/govuk-frontend-5.7.1.min.js"></script>
<script type="module">
import { initAll } from '/js/govuk-frontend-5.4.1.min.js'
import { initAll } from '/js/govuk-frontend-5.7.1.min.js'
initAll()
</script>
@await RenderSectionAsync("Scripts", required: false)
Expand Down
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.