Merge branch 'feature/nrmi-258-GCA-header-footer-updates' of github.com:Crown-Commercial-Service/DataSubmissionServiceAPI into origin/feature/nrmi-11-banner-usability-enhancements-admin-messages-to-end-based-on-set-stop-datetime

Author: reemi1510

app/assets/images/GCA_linear_logo.png

@@ -29,8 +29,8 @@ $govuk-colours: (
   "dark-blue": #2b8cc4,
   "blue": #005ea5,
 
-  "primary": #9b1a47,
-  "secondary": #016065,
+  "primary": #8fb3ff,
+  "secondary": #bcca46,
 
   "black": #0b0c0c,
   "dark-grey": #6f777b,

app/assets/images/GCA_vertical_black.svg

@@ -3,7 +3,7 @@
 $govuk-button-colour: govuk-colour("secondary");
 $govuk-button-hover-colour: darken($govuk-button-colour, 5%);
 $govuk-button-shadow-colour: darken($govuk-button-colour, 15%);
-$govuk-button-text-colour: govuk-colour("white");
+$govuk-button-text-colour: govuk-colour("black");
 
 $button-shadow-size: $govuk-border-width-form-element;
 

app/assets/images/GCA_vertical_logo.png

@@ -15,12 +15,16 @@ $ccs-header-nav-item-border-color: darken(govuk-colour("primary"), 2);
   border-bottom: 0;
 }
 
+.govuk-header__link{
+  color: #000 !important;
+}
+
 .govuk-header__navigation-item--active {
   a {
     &:link,
     &:hover,
     &:visited {
-      color: govuk-colour("white");
+      color: govuk-colour("black");
       text-decoration: underline;
       @include govuk-media-query($until: desktop) {
         text-decoration: none;
@@ -37,15 +41,15 @@ $ccs-header-nav-item-border-color: darken(govuk-colour("primary"), 2);
 
 .govuk-header__link--homepage {
   display: block;
-  width: 122px;
+  width: 117px;
   height: 102px;
-  background-image: govuk-image-url("vertical_logo.png");
+  background-image: govuk-image-url("GCA_vertical_black.svg");
   background-repeat: no-repeat;
   background-size: cover;
   @include govuk-media-query($until: desktop) {
     width: auto;
     height: 32px;
-    background-image: govuk-image-url("horizontal_logo.png");
+    background-image: govuk-image-url("GCA_linear_logo.png");
     background-size: contain;
   }
   @include govuk-media-query($until: tablet) {

app/assets/stylesheets/_settings.scss

@@ -1,6 +1,6 @@
 module AdminHelper
   def support_email_address
-    'report-mi@crowncommercial.gov.uk'
+    'report-mi@gca.gov.uk'
   end
 
   def link_to_suppliers(suppliers)

app/assets/stylesheets/components/button/_button.scss

@@ -9,4 +9,4 @@
     %h2.govuk-heading-m
       Before you start
     %p
-      You can sign in to this service using your @crowncommercial.gov.uk email address and password.
+      You can sign in to this service using your @gca.gov.uk email address and password.

app/assets/stylesheets/components/header/_header.scss

@@ -1,13 +1,13 @@
 %header.govuk-header{"data-module" => "govuk-header", :role => "banner"}
   .govuk-header__container.govuk-width-container
     .govuk-header__logo
-      %a.govuk-header__link.govuk-header__link--homepage{:href => "https://www.crowncommercial.gov.uk/"}
+      %a.govuk-header__link.govuk-header__link--homepage{:href => "https://www.gca.gov.uk/"}
         %span.govuk-header__logotype-text.govuk-visually-hidden
-          Crown
+          Government
           %br
           Commercial
           %br
-          Service
+          Agency
     .govuk-header__content
       %a.govuk-header__link.govuk-header__link--service-name{:href => admin_root_path}
         RMI Admin