Merge branch 'develop' into snyk-fix-5657e5e618fba33bd1fdff2006f67cbd

Author: reemi1510

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [release-176] - 2026-03-31
+
+- NRMI-258: GCA header and footer updates
+- NRMI-294: fix contrast issue on mobile
+- NRMI-319: fix sidekiq issue
+
 ## [release-175] - 2026-03-23
 
 - NRMI-278: address outdated container package
@@ -1164,6 +1170,7 @@ this should have been released in release 45 but wasn't actually merged
 
 Initial release
 
+[release-176]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-175...release-176
 [release-175]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-174...release-175
 [release-174]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-173...release-174
 [release-173]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-172...release-173

Gemfile

@@ -104,6 +104,8 @@ gem 'net-http', '>= 0.4.0'
 
 gem 'sprockets-rails', '>= 3.5.1'
 
+gem 'connection_pool', '< 3'
+
 group :development, :test do
   gem 'brakeman', require: false
   gem 'byebug', platforms: %i[mri mingw x64_mingw]

Gemfile.lock

@@ -151,7 +151,7 @@ GEM
     climate_control (0.2.0)
     coderay (1.1.3)
     concurrent-ruby (1.3.6)
-    connection_pool (3.0.2)
+    connection_pool (2.5.5)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -643,6 +643,7 @@ DEPENDENCIES
   byebug
   capybara (~> 3.40, >= 3.40.0)
   climate_control
+  connection_pool (< 3)
   csv (~> 3.3, >= 3.3.4)
   database_cleaner (~> 2.0, >= 2.0.2)
   dotenv-rails (>= 3.2.0)

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,10 +3,16 @@
 $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;
 
+
+
+.govuk-header__menu-button {
+  color: $govuk-button-text-colour;
+}
+
 .govuk-button {
   color: $govuk-button-text-colour;
   background-color: $govuk-button-colour;

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)