Replace Document Collection styles with Design System

alphagov · Apr 18, 2023 · eb4c15a · eb4c15a
1 parent 0c3a617
commit eb4c15a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 24 deletions.
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -85,7 +85,6 @@ $govuk-include-default-font-face: false;
 @import "views/html-publication";
 @import "views/detailed-guide";
 @import "views/publication";
-@import "views/document-collection";
 @import "views/consultation";
 @import "views/speech";
 @import "views/news-article";

diff --git a/app/assets/stylesheets/views/_document-collection.scss b/app/assets/stylesheets/views/_document-collection.scss
diff --git a/app/presenters/document_collection_presenter.rb b/app/presenters/document_collection_presenter.rb
@@ -57,7 +57,7 @@ def group_heading(group)
     view_context.content_tag(
       heading_level,
       title,
-      class: "group-title",
+      class: "govuk-body govuk-!-font-size-27 govuk-!-font-weight-bold",
       id: group_title_id(title),
     )
   end

diff --git a/app/views/content_items/_document_collection_body.html.erb b/app/views/content_items/_document_collection_body.html.erb
@@ -1,5 +1,7 @@
 <% if @content_item.body.present? %>
+  <div class="govuk-!-margin-bottom-8">
   <%= render 'govuk_publishing_components/components/govspeak', @content_item.govspeak_body %>
+  </div>
 <% end %>
 
 <% @content_item.groups.each_with_index do |group, group_index| %>
@@ -13,7 +15,7 @@
     <% end %>
   <% end %>
 
-  <div data-module="gem-track-click">
+  <div data-module="gem-track-click" class="govuk-!-margin-bottom-8">
     <%= render 'govuk_publishing_components/components/document_list', items: @content_item.group_document_links(group, group_index) %>
   </div>
 <% end %>
diff --git a/test/integration/document_collection_test.rb b/test/integration/document_collection_test.rb
@@ -62,7 +62,7 @@ class DocumentCollectionTest < ActionDispatch::IntegrationTest
     group_count = groups.count
 
     groups.each do |group|
-      assert page.has_css?(".group-title", text: group["title"])
+      assert page.has_css?(".govuk-body.govuk-!-font-size-27.govuk-!-font-weight-bold", text: group["title"])
     end
 
     within ".app-c-contents-list-with-body" do

diff --git a/test/presenters/document_collection_presenter_test.rb b/test/presenters/document_collection_presenter_test.rb
@@ -42,7 +42,7 @@ class PresentedDocumentCollection < TestCase
     end
 
     test "presents a group heading with generated ID" do
-      heading = '<h3 class="group-title" id="heading-with-spaces">Heading with Spaces</h3>'
+      heading = '<h3 class="govuk-body govuk-!-font-size-27 govuk-!-font-weight-bold" id="heading-with-spaces">Heading with Spaces</h3>'
 
       assert_equal heading, presented_item.group_heading("title" => "Heading with Spaces")
     end