From 5dbe281fc051a61c5eea81e6c88c1c3b1381dc3b Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 28 Sep 2023 09:04:28 +0100 Subject: [PATCH] removed the bottom border from the footer and examples --- .../footer/default-no-bottom-border.njk | 34 --- .../footer-in-columns-no-bottom-border.njk | 104 ------- app/pages/examples.njk | 2 - packages/components/footer/README.md | 258 ------------------ packages/components/footer/_footer.scss | 5 - packages/components/footer/template.njk | 2 +- 6 files changed, 1 insertion(+), 404 deletions(-) delete mode 100644 app/components/footer/default-no-bottom-border.njk delete mode 100644 app/components/footer/footer-in-columns-no-bottom-border.njk diff --git a/app/components/footer/default-no-bottom-border.njk b/app/components/footer/default-no-bottom-border.njk deleted file mode 100644 index d487f7fea..000000000 --- a/app/components/footer/default-no-bottom-border.njk +++ /dev/null @@ -1,34 +0,0 @@ -{% set html_style = 'background-color: #f0f4f5;' %} -{% set title = 'Footer without bottom border (default)' %} -{% from 'components/footer/macro.njk' import footer %} -{% extends 'layout.njk' %} - -{% block body %} - - {{ footer({ - "bottomBorder": "false", - "links": [ - { - "URL": "#", - "label": "Accessibility statement" - }, - { - "URL": "#", - "label": "Contact us" - }, - { - "URL": "#", - "label": "Cookies" - }, - { - "URL": "#", - "label": "Privacy policy" - }, - { - "URL": "#", - "label": "Terms and conditions" - } - ] - })}} - -{% endblock %} diff --git a/app/components/footer/footer-in-columns-no-bottom-border.njk b/app/components/footer/footer-in-columns-no-bottom-border.njk deleted file mode 100644 index 04815f713..000000000 --- a/app/components/footer/footer-in-columns-no-bottom-border.njk +++ /dev/null @@ -1,104 +0,0 @@ -{% set html_style = 'background-color: #f0f4f5;' %} -{% set title = 'Footer without bottom border (columns)' %} -{% from 'components/footer/macro.njk' import footer %} -{% extends 'layout.njk' %} - -{% block body %} - - {{ footer({ - "bottomBorder": "false", - "links": [ - { - "URL": "#", - "label": "Home" - }, - { - "URL": "#", - "label": "Health A to Z" - }, - { - "URL": "#", - "label": "Live Well" - }, - { - "URL": "#", - "label": "Mental health" - }, - { - "URL": "#", - "label": "Care and support" - }, - { - "URL": "#", - "label": "Accessibility statement" - }, - { - "URL": "#", - "label": "Pregnancy" - }, - { - "URL": "#", - "label": "NHS services" - }, - { - "URL": "#", - "label": "Coronavirus (COVID-19)" - } - ], - "linksColumn2": [ - { - "URL": "#", - "label": "NHS App" - }, - { - "URL": "#", - "label": "Find my NHS number" - }, - { - "URL": "#", - "label": "Your health records" - }, - { - "URL": "#", - "label": "About the NHS" - }, - { - "URL": "#", - "label": "Healthcare abroad" - } - ], - "linksColumn3": [ - { - "URL": "#", - "label": "Contact us" - }, - { - "URL": "#", - "label": "Other NHS websites" - }, - { - "URL": "#", - "label": "Profile editor login" - } - ], - "metaLinks": [ - { - "URL": "#", - "label": "About us" - }, - { - "URL": "#", - "label": "Accessibility statement" - }, - { - "URL": "#", - "label": "Our policies" - }, - { - "URL": "#", - "label": "Cookies" - } - ] - })}} - -{% endblock %} diff --git a/app/pages/examples.njk b/app/pages/examples.njk index 0a179088f..9585ac625 100644 --- a/app/pages/examples.njk +++ b/app/pages/examples.njk @@ -72,8 +72,6 @@
  • Fieldset with inputs
  • Footer (default)
  • Footer (columns)
    • -
  • Footer without bottom border (default)
    • -
  • Footer without bottom border (columns)
  • Header (default)
  • Header with navigation
  • Header with search
    • diff --git a/packages/components/footer/README.md b/packages/components/footer/README.md index e128e5a19..368dddb85 100644 --- a/packages/components/footer/README.md +++ b/packages/components/footer/README.md @@ -262,263 +262,6 @@ Find out more about the footer component and when to use it in the [NHS digital })}} ``` -### Footer without bottom border (default) - -[Preview the footer without bottom border (default) component](https://nhsuk.github.io/nhsuk-frontend/components/footer/default-no-bottom-border.html) - -#### HTML markup - -```html - -``` - -#### Nunjucks macro - -``` -{% from 'components/footer/macro.njk' import footer %} - -{{ footer({ - "bottomBorder": "false", - "links": [ - { - "URL": "#", - "label": "Accessibility statement" - }, - { - "URL": "#", - "label": "Contact us" - }, - { - "URL": "#", - "label": "Cookies" - }, - { - "URL": "#", - "label": "Privacy policy" - }, - { - "URL": "#", - "label": "Terms and conditions" - } - ] -})}} -``` - -### Footer without bottom border (columns) - -[Preview the Footer without bottom border (columns) component](https://nhsuk.github.io/nhsuk-frontend/components/footer/footer-in-columns-no-bottom-border.html) - -#### HTML markup - -```html - -``` - -#### Nunjucks macro - -``` -{% from 'components/footer/macro.njk' import footer %} - -{{ footer({ - "bottomBorder": "false", - "links": [ - { - "URL": "#", - "label": "Home" - }, - { - "URL": "#", - "label": "Health A to Z" - }, - { - "URL": "#", - "label": "Live Well" - }, - { - "URL": "#", - "label": "Mental health" - }, - { - "URL": "#", - "label": "Care and support" - }, - { - "URL": "#", - "label": "Accessibility statement" - }, - { - "URL": "#", - "label": "Pregnancy" - }, - { - "URL": "#", - "label": "NHS services" - }, - { - "URL": "#", - "label": "Coronavirus (COVID-19)" - } - ], - "linksColumn2": [ - { - "URL": "#", - "label": "NHS App" - }, - { - "URL": "#", - "label": "Find my NHS number" - }, - { - "URL": "#", - "label": "Your health records" - }, - { - "URL": "#", - "label": "About the NHS" - }, - { - "URL": "#", - "label": "Healthcare abroad" - } - ], - "linksColumn3": [ - { - "URL": "#", - "label": "Contact us" - }, - { - "URL": "#", - "label": "Other NHS websites" - }, - { - "URL": "#", - "label": "Profile editor login" - } - ], - "metaLinks": [ - { - "URL": "#", - "label": "About us" - }, - { - "URL": "#", - "label": "Accessibility statement" - }, - { - "URL": "#", - "label": "Our policies" - }, - { - "URL": "#", - "label": "Cookies" - } - ] -})}} -``` ### Nunjucks arguments @@ -526,7 +269,6 @@ The footer Nunjucks macro takes the following arguments: | Name | Type | Required | Description | | ------------------------- | ------- | -------- | --------------------------------------------------------------------------------------------- | -| **bottomBorder** | boolean | No | Set to "false" to remove the grey bottom border in the footer. | | **links** | array | No | Array of first column of navigation items for use in the footer. | | **links.[].url** | string | No | The href of a navigation item in the first column of the footer. | | **links.[].label** | string | No | The label of a navigation item in the first column of the footer. | diff --git a/packages/components/footer/_footer.scss b/packages/components/footer/_footer.scss index 6c4c6d1c3..cf7534df3 100644 --- a/packages/components/footer/_footer.scss +++ b/packages/components/footer/_footer.scss @@ -10,11 +10,6 @@ background-color: $color_nhsuk-grey-4; border-top: nhsuk-spacing(1) solid $color_nhsuk-blue; - border-bottom: 10px solid $color_nhsuk-grey-1; -} - -.nhsuk-footer-container--no-bottom-border { - border-bottom: 0; } .nhsuk-footer { diff --git a/packages/components/footer/template.njk b/packages/components/footer/template.njk index 31f6dae2e..206a771a6 100644 --- a/packages/components/footer/template.njk +++ b/packages/components/footer/template.njk @@ -1,5 +1,5 @@