From 5524e151574ef9c282f5407e91bca7b265218512 Mon Sep 17 00:00:00 2001 From: Dilwoar Hussain Date: Mon, 8 Jan 2018 16:45:22 +0000 Subject: [PATCH] Bump version to 28.0.0 Update header to make it easier to find support, guidance and where to log in This is part of a larger piece of work to change the homepage styling so it is easier to find things on the page and consistent with other services in the service toolkit. Examples of other pages that use this pattern can be found under the components heading on the service toolkit. https://www.gov.uk/service-toolkit The code for these pages can be found here: https://github.com/alphagov/product-page-example As part of this work we will make support easier to find and remove the beta phase banner The guidance link would go to: https://www.gov.uk/government/collections/digital-marketplace-buyers-and-suppliers-information The GOV.UK Digital Marketplace logo would go to the digital marketplace home page. Ticket ID: https://trello.com/c/mityCieG/106-update-header-to-make-it-easier-to-find-support-guidance-and-where-to-log-in --- CHANGELOG.md | 23 ++++++++ VERSION.txt | 2 +- toolkit/scss/_proposition-header.scss | 68 +++++++++++++++++++++++ toolkit/templates/inside-header.html | 4 ++ toolkit/templates/proposition-header.html | 46 +++++++++------ 5 files changed, 125 insertions(+), 18 deletions(-) create mode 100644 toolkit/templates/inside-header.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 07bf79d2..141989c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,29 @@ Records breaking changes from major version bumps +## 28.0.0 + +PR: [#397](https://github.com/alphagov/digitalmarketplace-frontend-toolkit/pull/397) + +### What changed + +- Changes existing header to product page style header. +- Product page Github: https://github.com/alphagov/product-page-example +- To get this working on a frontend application, do the following: + - in _base_page.html: + - Remove: + ```python + {% include "toolkit/phase-banner.html" %} + ``` + - Add: + ```python + {% block inside_header %} + {% include "toolkit/inside-header.html" %} + {% endblock %} + ``` + - Update the frontend toolkit to version 28.0.0 + - Update the dmutils module to version 33.0.1 and above + ## 27.0.0 PR: [#395](https://github.com/alphagov/digitalmarketplace-frontend-toolkit/pull/395) diff --git a/VERSION.txt b/VERSION.txt index 5f5a7455..0b4dfcf0 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -27.4.0 +28.0.0 diff --git a/toolkit/scss/_proposition-header.scss b/toolkit/scss/_proposition-header.scss index 1d1267e8..fb27e835 100644 --- a/toolkit/scss/_proposition-header.scss +++ b/toolkit/scss/_proposition-header.scss @@ -17,3 +17,71 @@ .logout-button:hover { text-decoration: underline; } + +#global-header.with-proposition { + .header-wrapper { + .header-global { + @media only screen and (min-width: 769px) { + width: 60%; + } + + .header-logo { + width: auto; + } + + .header-title { + float: left; + font-family: $toolkit-font-stack; + font-weight: normal; + padding-top: 7px; + font-size: 24px; + + @media only screen and (max-width: 800px) { + padding-left: 15px; + } + + @media only screen and (min-width: 473px) and (max-width: 769px) { + padding-left: 0px; + } + + a { + color: $white; + text-decoration: none; + } + + &:hover { + text-decoration: underline; + } + } + + .phase-tag { + margin-left: 10px; + margin-top: 4px; + vertical-align: top; + } + } + + .header-proposition { + text-align: right; + + @media only screen and (min-width: 769px) { + width: 40%; + } + + #proposition-links { + float: right; + + li { + @media only screen and (max-width: 769px) { + text-align: left; + width: 100%; + } + } + + @media only screen and (max-width: 769px) { + float: none; + } + } + } + } +} diff --git a/toolkit/templates/inside-header.html b/toolkit/templates/inside-header.html new file mode 100644 index 00000000..d7b2589b --- /dev/null +++ b/toolkit/templates/inside-header.html @@ -0,0 +1,4 @@ +
+ Digital Marketplace + BETA +
diff --git a/toolkit/templates/proposition-header.html b/toolkit/templates/proposition-header.html index 51bd9353..5ce5fe7b 100644 --- a/toolkit/templates/proposition-header.html +++ b/toolkit/templates/proposition-header.html @@ -2,25 +2,37 @@
Menu