Merge pull request #845 from alphagov/replace-publication-header-with…

…-inverse-header Replace publication header with inverse header
alphagov · Mar 26, 2018 · bb0255d · bb0255d
2 parents 2ca3399 + 780ce8e
commit bb0255d
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 85 deletions.
diff --git a/Gemfile b/Gemfile
@@ -17,8 +17,8 @@ gem 'gds-api-adapters', '~> 52.2'
 gem 'govuk_ab_testing', '~> 2.4'
 gem 'govuk_app_config', '~> 1.3'
 gem 'govuk_frontend_toolkit', '~> 7.4'
-gem 'govuk_navigation_helpers', '~> 9.2'
-gem 'govuk_publishing_components', '~> 5.5'
+gem 'govuk_navigation_helpers', '~> 9.2.1'
+gem 'govuk_publishing_components', '~> 5.7.0'
 gem 'plek', '~> 2.1'
 gem 'slimmer', '~> 12.0'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -365,8 +365,8 @@ DEPENDENCIES
   govuk_ab_testing (~> 2.4)
   govuk_app_config (~> 1.3)
   govuk_frontend_toolkit (~> 7.4)
-  govuk_navigation_helpers (~> 9.2)
-  govuk_publishing_components (~> 5.5)
+  govuk_navigation_helpers (~> 9.2.1)
+  govuk_publishing_components (~> 5.7.0)
   govuk_schemas (~> 3.1)
   htmlentities (~> 4.3)
   jasmine-rails

diff --git a/app/assets/stylesheets/components/_publication-header.scss b/app/assets/stylesheets/components/_publication-header.scss
diff --git a/app/assets/stylesheets/views/_html-publication.scss b/app/assets/stylesheets/views/_html-publication.scss
@@ -28,6 +28,11 @@
     }
   }
 
+  .publication-header__last-changed {
+    @include core-19;
+    margin-top: $gutter-half;
+  }
+
   .column-quarter-desktop-only {
     @include grid-column( 1 / 4, $full-width: desktop );
 

diff --git a/app/views/components/_publication-header.html.erb b/app/views/components/_publication-header.html.erb
diff --git a/app/views/components/docs/publication-header.yml b/app/views/components/docs/publication-header.yml
diff --git a/app/views/content_items/html_publication.html.erb b/app/views/content_items/html_publication.html.erb
@@ -12,7 +12,15 @@
   </ol>
 </div>
 
-<%= render 'components/publication-header', title: @content_item.title, context: I18n.t("content_item.schema_name.#{@content_item.format_sub_type}", count: 1), last_changed: @content_item.last_changed %>
+<%= render 'govuk_publishing_components/components/inverse_header', {} do %>
+  <%= render 'govuk_component/title',
+        title: @content_item.title,
+        context: I18n.t("content_item.schema_name.#{@content_item.format_sub_type}", count: 1),
+        inverse: true,
+        margin_bottom: 0
+  %>
+  <p class="publication-header__last-changed"><%= @content_item.last_changed %></p>
+<% end %>
 
 <%= render 'components/notice', @content_item.withdrawal_notice_component  %>
 

diff --git a/test/components/publication_header_test.rb b/test/components/publication_header_test.rb
diff --git a/test/integration/html_publication_test.rb b/test/integration/html_publication_test.rb
@@ -8,7 +8,7 @@ class HtmlPublicationTest < ActionDispatch::IntegrationTest
   test "html publications" do
     setup_and_visit_content_item('published')
 
-    within ".app-c-publication-header" do
+    within ".gem-c-inverse-header" do
       assert page.has_text?(@content_item["details"]["format_sub_type"])
       assert page.has_text?(@content_item["title"])
 
@@ -67,7 +67,7 @@ class HtmlPublicationTest < ActionDispatch::IntegrationTest
   test "no contents are shown when headings are an empty list" do
     setup_and_visit_content_item("prime_ministers_office")
 
-    within ".app-c-publication-header" do
+    within ".gem-c-inverse-header" do
       refute page.has_text?("Contents")
     end
   end