From dea3f296ad44412d285326056c1b8bd738d17340 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 28 Nov 2019 11:08:27 +0000 Subject: [PATCH 1/3] Replace `js-footer` class on global footer Was on old footer from GOVUK Template but not moved across when we adopted the GOVUK Frontend footer component. --- app/templates/admin_template.html | 1 + 1 file changed, 1 insertion(+) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 3f4af50d5..64d78f397 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -145,6 +145,7 @@ {% endif %} {{ notify_footer({ + "classes": "js-footer", "navigation": [ { "columns": 1, From f05f7b26616b3a8c39b2cff00844e67678215c84 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 28 Nov 2019 11:27:24 +0000 Subject: [PATCH 2/3] Return main content area to position: static Was set to `position: relative` to solve an issue on the produce page. This introduced other issues with the sticky JS and the fix is only needed for the product page so this moves it to that CSS. The previous fix was applied here: https://github.com/alphagov/notifications-admin/commit/9441dd0b375ecb26dd42949a14fb41dad5a1bebb --- app/assets/stylesheets/govuk-frontend/overrides.scss | 8 -------- app/assets/stylesheets/views/product-page.scss | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/govuk-frontend/overrides.scss b/app/assets/stylesheets/govuk-frontend/overrides.scss index 30ca08c30..4269c4181 100644 --- a/app/assets/stylesheets/govuk-frontend/overrides.scss +++ b/app/assets/stylesheets/govuk-frontend/overrides.scss @@ -11,14 +11,6 @@ } -// The GOV.UK Frontend header component wraps content that is `position: relative` -// This changes its z-index position, putting it above the `
` section -// We need the `
` section to be above it, like the default order, to hide the theme colour -// bar on full-width pages -.govuk-main-wrapper { - position: relative; -} - // Additional padding-bottom override, following the GOV.UK Frontend spacing scale: // https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale .govuk-\!-padding-bottom-12 { diff --git a/app/assets/stylesheets/views/product-page.scss b/app/assets/stylesheets/views/product-page.scss index 21b9eff30..afc0d09bb 100644 --- a/app/assets/stylesheets/views/product-page.scss +++ b/app/assets/stylesheets/views/product-page.scss @@ -2,6 +2,11 @@ &-intro { + // The GOV.UK Frontend header component wraps content that is `position: relative` + // This changes its z-index position, putting it above the `
` section in the stacking order + // We need the `
` section to be above it, like the default order, so when we apply the + // negative margin-top it overlaps the theme bar at the bottom of the header + position: relative; margin: -10px 0 $gutter * 1.5 0; padding: 0 0 $gutter * 2 0; background: $govuk-blue; From a4482ee734da590b4f0bdd4ffc8c03b4d289d5bc Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Wed, 27 Nov 2019 17:19:25 +0000 Subject: [PATCH 3/3] Set font-family on buttons to NTA temporarily Until we change all the buttons to use GOVUK Frontend we need this CSS to give them the New Transport (NTA) font-family. Was previously in GOVUK Template CSS but missed out from being moved across when this was removed: https://github.com/alphagov/govuk_template/blob/f164b2825b1479d7c7d4bdbec4ba9c8e171f504c/source/assets/stylesheets/_basic.scss#L6 --- app/assets/stylesheets/globals.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/assets/stylesheets/globals.scss b/app/assets/stylesheets/globals.scss index 33204ec3c..8db4a7fc7 100644 --- a/app/assets/stylesheets/globals.scss +++ b/app/assets/stylesheets/globals.scss @@ -1,3 +1,5 @@ +@import 'settings/typography-font-families'; + // needed for IE10 desktop snap mode: http://menacingcloud.com/?c=cssViewportOrMetaTag @-ms-viewport { width: device-width; @@ -88,3 +90,10 @@ button:focus { outline: 3px solid $focus-colour; outline-offset: 0; } + +// To be removed when all buttons follow the GOV.UK Frontend conventions +// - https://design-system.service.gov.uk/components/button/ + +button { + font-family: $govuk-font-family-nta; +}