Merge pull request #268 from Crown-Commercial-Service/update-ccs-frontend

Updated CCS Frontend to v2.3.0

Author: tim-s-ccs

CHANGELOG.md

@@ -7,11 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.3.0] - 2025-11-26
+
+### Added
+
+- Updated CCS Frontend to v2.3.0
+
 ## [3.2.0] - 2025-11-25
 
 ### Added
 
-- Updated CCS Frontend to v2.1.1
+- Updated CCS Frontend to v2.2.1
 
 ## [3.1.0] - 2025-10-13
 

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ccs-frontend_helpers (3.2.0)
+    ccs-frontend_helpers (3.3.0)
       rails (>= 7.2)
 
 GEM

README.md

@@ -14,6 +14,7 @@ The following table shows the version of CCS Frontend Helpers that you should us
 
 | CCS Frontend Helpers Version  | Target GOV.UK Frontend Version | Target CCS Frontend Version |
 | ----------------------------- | ------------------------------ | --------------------------- |
+| [3.3.0](https://github.com/Crown-Commercial-Service/ccs-frontend_helpers/releases/tag/v3.3.0) | [5.13.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.13.0) | [2.3.0](https://github.com/Crown-Commercial-Service/ccs-frontend-project/releases/tag/v2.3.0) |
 | [3.2.0](https://github.com/Crown-Commercial-Service/ccs-frontend_helpers/releases/tag/v3.2.0) | [5.13.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.13.0) | [2.2.1](https://github.com/Crown-Commercial-Service/ccs-frontend-project/releases/tag/v2.2.1) |
 | [3.1.0](https://github.com/Crown-Commercial-Service/ccs-frontend_helpers/releases/tag/v3.1.0) | [5.13.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.13.0) | [2.1.0](https://github.com/Crown-Commercial-Service/ccs-frontend-project/releases/tag/v2.1.0) |
 | [3.0.0](https://github.com/Crown-Commercial-Service/ccs-frontend_helpers/releases/tag/v3.0.0) | [5.11.2](https://github.com/alphagov/govuk-frontend/releases/tag/v5.11.2) | [2.0.0](https://github.com/Crown-Commercial-Service/ccs-frontend-project/releases/tag/v2.0.0) |

bun.lock

@@ -41,7 +41,7 @@ def initialize(navigation: nil, meta: nil, **)
 
           @options[:copyright] ||= '© Crown copyright'
 
-          @logo = Logo.new(context: @context)
+          @logo = Logo.new(context: @context, show_only_crown: true)
           @navigation = navigation.map { |navigation_item| Navigation.new(context: @context, **navigation_item) } if navigation.present?
           @meta = Meta.new(context: @context, **meta) if meta
         end
@@ -62,13 +62,10 @@ def render
                 concat(tag.hr(class: 'ccs-footer__section-break'))
               end
               concat(tag.div(class: 'ccs-footer__meta') do
-                concat(tag.div(class: 'ccs-footer__meta-item') do
-                  concat(tag.div(logo.render, class: 'ccs-footer__logo'))
-                  concat(footer_copyright)
-                end)
                 concat(tag.div(class: 'ccs-footer__meta-item ccs-footer__meta-item--grow') do
                   concat(meta.render) if meta
                 end)
+                concat(tag.div(footer_copyright, class: 'ccs-footer__meta-item'))
               end)
             end
           end
@@ -88,7 +85,10 @@ def render
 
         def footer_copyright
           tag.div(class: 'ccs-footer__copyright') do
-            link_to(options[:copyright], 'https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/', class: 'ccs-footer__link')
+            link_to('https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/', class: 'ccs-footer__link') do
+              concat(tag.div(logo.render, class: 'ccs-footer__logo'))
+              concat(options[:copyright])
+            end
           end
         end
       end

lib/ccs/components/ccs/footer.rb

@@ -114,7 +114,7 @@ def footer_content_licence
             if options[:content_licence]
               concat(options[:content_licence])
             else
-              concat('All content is available under the')
+              concat('All content is available under the ')
               concat(link_to('Open Government Licence v3.0', 'https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/', class: 'govuk-footer__link', rel: 'license'))
               concat(', except where otherwise stated')
             end

lib/ccs/components/ccs/logo.rb

@@ -15,8 +15,8 @@ module Logo
         #
         # @return (see CCS::Components::CCS::Logo#render)
 
-        def ccs_logo
-          Components::CCS::Logo.new(context: self).render
+        def ccs_logo(**)
+          Components::CCS::Logo.new(context: self, **).render
         end
       end
     end

lib/ccs/components/govuk/footer.rb

@@ -2,6 +2,6 @@
 
 module CCS
   module FrontendHelpers
-    VERSION = '3.2.0'
+    VERSION = '3.3.0'
   end
 end

lib/ccs/frontend_helpers/ccs_frontend/logo.rb

@@ -6,6 +6,6 @@
   "license": "MIT",
   "devDependencies": {
     "govuk-frontend": "5.13.0",
-    "ccs-frontend": "2.2.1"
+    "ccs-frontend": "2.3.0"
   }
 }