From 10e72bbdeb9b81305d70664612a38d734fe026ee Mon Sep 17 00:00:00 2001
From: maxgds <max.harden@digital.cabinet-office.gov.uk>
Date: Fri, 12 Feb 2021 13:25:24 +0000
Subject: [PATCH] Match confirmation message to design system guidance.

---
 .../components/_cookie-banner.scss            | 32 -------------------
 .../components/_cookie_banner.html.erb        |  9 +++---
 2 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss b/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss
index f8f610d8d7..19c2e80c41 100644
--- a/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss
+++ b/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss
@@ -50,32 +50,6 @@ $govuk-cookie-banner-background: govuk-colour("light-grey", "grey-4");
   }
 }
 
-.gem-c-cookie-banner__hide-button {
-  @include govuk-font($size: 19);
-  outline: 0;
-  border: 0;
-  background: none;
-  text-decoration: underline;
-  color: $govuk-link-colour;
-  padding: govuk-spacing(0);
-  margin-top: govuk-spacing(2);
-
-  &:hover {
-    color: $govuk-link-hover-colour;
-    cursor: pointer;
-  }
-
-  &:focus {
-    @include govuk-focused-text;
-  }
-
-  @include govuk-media-query($from: desktop) {
-    margin-top: govuk-spacing(0);
-    position: absolute;
-    right: govuk-spacing(1);
-  }
-}
-
 // Override the styles from govuk_template
 // stylelint-disable selector-max-id
 .gem-c-cookie-banner#global-cookie-message {
@@ -98,10 +72,4 @@ $govuk-cookie-banner-background: govuk-colour("light-grey", "grey-4");
     @include govuk-font($size: 19);
     margin: 0 0 govuk-spacing(2) 0;
   }
-
-  .gem-c-cookie-banner__confirmation-message {
-    @include govuk-media-query($from: desktop) {
-      margin-bottom: 0;
-    }
-  }
 }
diff --git a/app/views/govuk_publishing_components/components/_cookie_banner.html.erb b/app/views/govuk_publishing_components/components/_cookie_banner.html.erb
index 187f53351a..e31d4d684c 100644
--- a/app/views/govuk_publishing_components/components/_cookie_banner.html.erb
+++ b/app/views/govuk_publishing_components/components/_cookie_banner.html.erb
@@ -1,10 +1,7 @@
 <%
   id ||= 'global-cookie-message'
   title ||= "Cookies on GOV.UK"
-
-  text ||= raw("<p>We use some essential cookies to make this website work.</p>
-                <p>We’d like to set additional cookies so we and our partners can remember your settings, understand how you use GOV.UK and make improvements.</p>
-                ")
+  text ||= raw("<p>We use cookies to collect information about how you use GOV.UK. Some of these are essential to make the site work.</p><p>We'd like to set additional cookies to understand how you use GOV.UK, remember your settings and improve government services.</p><p>We may also use cookies set by other sites to help us deliver content from their services.</p>")
   cookie_preferences_href ||= "/help/cookies"
   confirmation_message ||= raw("You can <a class='govuk-link' href='#{cookie_preferences_href}' data-module='track-click' data-track-category='cookieBanner' data-track-action='Cookie banner settings clicked from confirmation'>change your cookie settings</a> at any time.")
   services_cookies ||= nil
@@ -74,7 +71,9 @@
 
   <div class="gem-c-cookie-banner__confirmation govuk-width-container" tabindex="-1" hidden>
     <p class="gem-c-cookie-banner__confirmation-message" role="alert"><%= confirmation_message %></p>
-    <button class="gem-c-cookie-banner__hide-button" data-hide-cookie-banner="true" data-module="track-click" data-track-category="cookieBanner" data-track-action="Hide cookie banner">Hide</button>
+    <div class="govuk-button-group">
+      <button class="gem-c-cookie-banner__hide-button govuk-button" data-hide-cookie-banner="true" data-module="track-click" data-track-category="cookieBanner" data-track-action="Hide cookie banner">Hide this message</button>
+    </div>
   </div>
 
 </div>