From 91230eca48fdda5e78dd1b56c602bf4023522060 Mon Sep 17 00:00:00 2001 From: Vanita Barrett Date: Wed, 27 Mar 2019 14:08:05 +0000 Subject: [PATCH 1/8] Update shared view partials --- app/views/shared/_footer_navigation.html.erb | 4 ++-- app/views/shared/_publisher_metadata_with_logo.html.erb | 6 +++--- app/views/shared/_sidebar_navigation.html.erb | 2 +- app/views/shared/_title_and_translations.html.erb | 4 ++-- app/views/shared/_translations.html.erb | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/shared/_footer_navigation.html.erb b/app/views/shared/_footer_navigation.html.erb index 20e66bfac..ccfda0f22 100644 --- a/app/views/shared/_footer_navigation.html.erb +++ b/app/views/shared/_footer_navigation.html.erb @@ -4,8 +4,8 @@ <% end %> <% if @contextual_footer.present? %> -
-
+
+
<%= @contextual_footer %>
diff --git a/app/views/shared/_publisher_metadata_with_logo.html.erb b/app/views/shared/_publisher_metadata_with_logo.html.erb index ba8249917..a7c4583fb 100644 --- a/app/views/shared/_publisher_metadata_with_logo.html.erb +++ b/app/views/shared/_publisher_metadata_with_logo.html.erb @@ -1,9 +1,9 @@ -
+
-
+
<%= render "components/publisher-metadata", @content_item.publisher_metadata %>
-
+
<% if @content_item.try(:logo) %> <%= image_tag @content_item.logo[:path], alt: @content_item.logo[:alt_text], diff --git a/app/views/shared/_sidebar_navigation.html.erb b/app/views/shared/_sidebar_navigation.html.erb index 40a986d08..af53679eb 100644 --- a/app/views/shared/_sidebar_navigation.html.erb +++ b/app/views/shared/_sidebar_navigation.html.erb @@ -2,6 +2,6 @@ content_item = @content_item.content_item.parsed_content %> -
+
<%= render 'govuk_publishing_components/components/contextual_sidebar', content_item: content_item %>
diff --git a/app/views/shared/_title_and_translations.html.erb b/app/views/shared/_title_and_translations.html.erb index 54b783987..1632bfdfa 100644 --- a/app/views/shared/_title_and_translations.html.erb +++ b/app/views/shared/_title_and_translations.html.erb @@ -1,5 +1,5 @@ -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
<%= render 'shared/translations' %> diff --git a/app/views/shared/_translations.html.erb b/app/views/shared/_translations.html.erb index f5601dbe8..b11775ca8 100644 --- a/app/views/shared/_translations.html.erb +++ b/app/views/shared/_translations.html.erb @@ -1,5 +1,5 @@ <% if @content_item.available_translations.length > 1 %> -
+
<%= render 'govuk_publishing_components/components/translation-nav', translations: @content_item.available_translations %>
From 68ac0add7a01b2b48ea689e14a4bd92b7da6268c Mon Sep 17 00:00:00 2001 From: Vanita Barrett Date: Wed, 27 Mar 2019 14:31:56 +0000 Subject: [PATCH 2/8] Update content item templates --- .../_body_with_related_links.html.erb | 8 ++++---- app/views/content_items/case_study.html.erb | 10 +++++----- app/views/content_items/coming_soon.html.erb | 4 ++-- app/views/content_items/consultation.html.erb | 8 ++++---- app/views/content_items/contact.html.erb | 8 ++++---- .../corporate_information_page.html.erb | 14 +++++++------- app/views/content_items/detailed_guide.html.erb | 10 +++++----- .../content_items/document_collection.html.erb | 10 +++++----- app/views/content_items/fatality_notice.html.erb | 10 +++++----- app/views/content_items/gone.html.erb | 4 ++-- app/views/content_items/guide.html+print.erb | 4 ++-- app/views/content_items/guide.html.erb | 6 +++--- app/views/content_items/news_article.html.erb | 10 +++++----- app/views/content_items/publication.html.erb | 10 +++++----- .../service_sign_in/_choose_sign_in.html.erb | 8 ++++---- .../service_sign_in/_create_new_account.html.erb | 4 ++-- .../content_items/specialist_document.html.erb | 10 +++++----- app/views/content_items/speech.html.erb | 10 +++++----- .../content_items/statistical_data_set.html.erb | 10 +++++----- .../content_items/statistics_announcement.html.erb | 10 +++++----- app/views/content_items/take_part.html.erb | 8 ++++---- .../topical_event_about_page.html.erb | 8 ++++---- .../content_items/travel_advice.html+print.erb | 4 ++-- app/views/content_items/travel_advice.html.erb | 12 ++++++------ app/views/content_items/unpublishing.html.erb | 4 ++-- app/views/content_items/working_group.html.erb | 6 +++--- .../world_location_news_article.html.erb | 10 +++++----- 27 files changed, 110 insertions(+), 110 deletions(-) diff --git a/app/views/content_items/_body_with_related_links.html.erb b/app/views/content_items/_body_with_related_links.html.erb index 6827483d0..2425ae88b 100644 --- a/app/views/content_items/_body_with_related_links.html.erb +++ b/app/views/content_items/_body_with_related_links.html.erb @@ -1,14 +1,14 @@ <% content_for :simple_header, true %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', title: @content_item.title %>
-
-
+
+
<%= render 'govuk_publishing_components/components/govspeak', { direction: page_text_direction, disable_youtube_expansions: true } do %> <%= raw @content_item.body %> diff --git a/app/views/content_items/case_study.html.erb b/app/views/content_items/case_study.html.erb index 432e47e62..a35fe7fbf 100644 --- a/app/views/content_items/case_study.html.erb +++ b/app/views/content_items/case_study.html.erb @@ -4,12 +4,12 @@ ) %> <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
<%= render 'shared/translations' %> -
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
@@ -17,8 +17,8 @@ <%= render 'shared/publisher_metadata_with_logo' %> <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> -
-
+
+
<%= render 'components/figure', src: @content_item.image["url"], diff --git a/app/views/content_items/coming_soon.html.erb b/app/views/content_items/coming_soon.html.erb index 79f80a11b..fb1974e9c 100644 --- a/app/views/content_items/coming_soon.html.erb +++ b/app/views/content_items/coming_soon.html.erb @@ -1,5 +1,5 @@ -
-
+
+
<%= render 'govuk_publishing_components/components/title', title: 'Coming soon' %>

diff --git a/app/views/content_items/consultation.html.erb b/app/views/content_items/consultation.html.erb index b962b8cf0..4db3e95f3 100644 --- a/app/views/content_items/consultation.html.erb +++ b/app/views/content_items/consultation.html.erb @@ -4,8 +4,8 @@ ) %> <% end %> -

-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
<%= render 'shared/translations' %> @@ -15,8 +15,8 @@ <%= render 'shared/history_notice', content_item: @content_item %> <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> -
-
+
+
<%= render 'components/important-metadata', items: @content_item.important_metadata %> <% if @content_item.unopened? %> diff --git a/app/views/content_items/contact.html.erb b/app/views/content_items/contact.html.erb index 46dd11107..191d39f2d 100644 --- a/app/views/content_items/contact.html.erb +++ b/app/views/content_items/contact.html.erb @@ -6,14 +6,14 @@ <% content_for :simple_header, true %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
-
-
+
+
<% body = capture do %> <% if @content_item.online_form_links.any? %> diff --git a/app/views/content_items/corporate_information_page.html.erb b/app/views/content_items/corporate_information_page.html.erb index 9777a0345..c2ba3fe01 100644 --- a/app/views/content_items/corporate_information_page.html.erb +++ b/app/views/content_items/corporate_information_page.html.erb @@ -27,24 +27,24 @@ <% end %>
-
-
+
+
<%= render 'govuk_publishing_components/components/organisation_logo', @content_item.organisation_logo %>
-
-
+
+
<%= render 'govuk_publishing_components/components/title', title: @content_item.title %>
<%= render 'shared/translations' %> -
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %> <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
-
-
+
+
<%= render "components/contents-list-with-body", contents: @content_item.contents do %>
<%= render 'govuk_publishing_components/components/govspeak', content: "#{@content_item.body}#{@additional_body}".html_safe %> diff --git a/app/views/content_items/detailed_guide.html.erb b/app/views/content_items/detailed_guide.html.erb index 549c42447..0876bf1ad 100644 --- a/app/views/content_items/detailed_guide.html.erb +++ b/app/views/content_items/detailed_guide.html.erb @@ -4,12 +4,12 @@ ) %> <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
<%= render 'shared/translations' %> -
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
@@ -18,8 +18,8 @@ <%= render 'shared/history_notice', content_item: @content_item %> <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> -
-
+
+
<%= render 'components/important-metadata', items: @content_item.important_metadata %> <%= render "components/contents-list-with-body", contents: @content_item.contents do %> diff --git a/app/views/content_items/document_collection.html.erb b/app/views/content_items/document_collection.html.erb index 0479bbe62..08273a19f 100644 --- a/app/views/content_items/document_collection.html.erb +++ b/app/views/content_items/document_collection.html.erb @@ -4,15 +4,15 @@ ) %> <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', context: t("content_item.schema_name.#{@content_item.document_type}", count: 1), title: @content_item.title, average_title_length: "long" %>
<%= render 'shared/translations', content_item: @content_item %> -
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %> <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> <%= render 'shared/history_notice', content_item: @content_item %> @@ -21,8 +21,8 @@ <%= render 'shared/publisher_metadata_with_logo' %> -
-
+
+
<%= render 'components/important-metadata', items: @content_item.important_metadata %> diff --git a/app/views/content_items/fatality_notice.html.erb b/app/views/content_items/fatality_notice.html.erb index 75443db0b..e8bd314b6 100644 --- a/app/views/content_items/fatality_notice.html.erb +++ b/app/views/content_items/fatality_notice.html.erb @@ -4,12 +4,12 @@ ) %> <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
<%= render 'shared/translations' %> -
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
@@ -17,8 +17,8 @@ <%= render 'shared/publisher_metadata_with_logo' %> <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> -
-
+
+
<%= render 'components/important-metadata', items: @content_item.important_metadata %> diff --git a/app/views/content_items/gone.html.erb b/app/views/content_items/gone.html.erb index 419834569..5a65faced 100644 --- a/app/views/content_items/gone.html.erb +++ b/app/views/content_items/gone.html.erb @@ -1,5 +1,5 @@ -
-
+
+
<%= render 'govuk_publishing_components/components/title', title: 'The page you\'re looking for is no longer available' %>

diff --git a/app/views/content_items/guide.html+print.erb b/app/views/content_items/guide.html+print.erb index 8ef9984b0..8d35a1b2d 100644 --- a/app/views/content_items/guide.html+print.erb +++ b/app/views/content_items/guide.html+print.erb @@ -6,8 +6,8 @@ <% end %> -

-
+
+
<%= render 'govuk_publishing_components/components/title', { title: @content_item.title } %> <% @content_item.parts.each_with_index do |part, index| %>
diff --git a/app/views/content_items/guide.html.erb b/app/views/content_items/guide.html.erb index a09c15f12..5b19c4643 100644 --- a/app/views/content_items/guide.html.erb +++ b/app/views/content_items/guide.html.erb @@ -7,8 +7,8 @@ <% content_for :simple_header, true %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', { title: @content_item.content_title } %> <% if @content_item.show_guide_navigation? %> @@ -18,7 +18,7 @@ <% end %>
-
+
<% if @content_item.has_parts? %> <% if @content_item.show_guide_navigation? %>

diff --git a/app/views/content_items/news_article.html.erb b/app/views/content_items/news_article.html.erb index d5020e379..89a82574b 100644 --- a/app/views/content_items/news_article.html.erb +++ b/app/views/content_items/news_article.html.erb @@ -4,12 +4,12 @@ ) %> <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
<%= render 'shared/translations' %> -
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
@@ -18,8 +18,8 @@ <%= render 'shared/history_notice', content_item: @content_item %> <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> -
-
+
+
<%= render 'components/figure', src: @content_item.image["url"], diff --git a/app/views/content_items/publication.html.erb b/app/views/content_items/publication.html.erb index c41e22f69..45b7b8620 100644 --- a/app/views/content_items/publication.html.erb +++ b/app/views/content_items/publication.html.erb @@ -4,8 +4,8 @@ ) %> <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', context: t("content_item.schema_name.#{@content_item.document_type}", count: 1), title: @content_item.title, @@ -13,7 +13,7 @@
<%= render 'shared/translations' %> -
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
@@ -22,8 +22,8 @@ <%= render 'shared/history_notice', content_item: @content_item %> <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> -
-
+
+
<%= render 'components/important-metadata', items: @content_item.important_metadata %>
<%= render 'publication_inline_body' %> diff --git a/app/views/content_items/service_sign_in/_choose_sign_in.html.erb b/app/views/content_items/service_sign_in/_choose_sign_in.html.erb index 919939ae3..b74cfda26 100644 --- a/app/views/content_items/service_sign_in/_choose_sign_in.html.erb +++ b/app/views/content_items/service_sign_in/_choose_sign_in.html.erb @@ -1,6 +1,6 @@ <% if @error %> -
-
+
+
<%= render "govuk_publishing_components/components/error_summary", { title: t('service_sign_in.error.title'), items: [ @@ -24,8 +24,8 @@ data: data_attrs) do %> <% legend_text = render 'govuk_publishing_components/components/title', title: @content_item.title %> <%= render "govuk_publishing_components/components/fieldset", legend_text: legend_text do %> -
-
+
+
<%= render 'govuk_publishing_components/components/govspeak', content: raw(@content_item.description) %> <% if @error %> <%= render "components/error-message", text: t('service_sign_in.error.option') %> diff --git a/app/views/content_items/service_sign_in/_create_new_account.html.erb b/app/views/content_items/service_sign_in/_create_new_account.html.erb index 043644d52..b909fe336 100644 --- a/app/views/content_items/service_sign_in/_create_new_account.html.erb +++ b/app/views/content_items/service_sign_in/_create_new_account.html.erb @@ -1,5 +1,5 @@ -
-
+
+
<%= render 'govuk_publishing_components/components/title', title: @content_item.title %> <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.body.html_safe %>
diff --git a/app/views/content_items/specialist_document.html.erb b/app/views/content_items/specialist_document.html.erb index dfdc374a2..d7cc38fea 100644 --- a/app/views/content_items/specialist_document.html.erb +++ b/app/views/content_items/specialist_document.html.erb @@ -6,20 +6,20 @@ <% content_for :simple_header, true %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
<%= render 'shared/translations' %> -
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
<%= render 'shared/publisher_metadata_with_logo' %> -
-
+
+
<%= render 'components/important-metadata', items: @content_item.important_metadata %> diff --git a/app/views/content_items/speech.html.erb b/app/views/content_items/speech.html.erb index 9b932b52c..27694c639 100644 --- a/app/views/content_items/speech.html.erb +++ b/app/views/content_items/speech.html.erb @@ -4,12 +4,12 @@ ) %> <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
<%= render 'shared/translations' %> -
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
@@ -18,8 +18,8 @@ <%= render 'shared/history_notice', content_item: @content_item %> <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> -
-
+
+
<%= render 'components/important-metadata', items: @content_item.important_metadata %> diff --git a/app/views/content_items/statistical_data_set.html.erb b/app/views/content_items/statistical_data_set.html.erb index 14c6ddcb7..4beae325d 100644 --- a/app/views/content_items/statistical_data_set.html.erb +++ b/app/views/content_items/statistical_data_set.html.erb @@ -4,15 +4,15 @@ ) %> <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', context: t("content_item.schema_name.#{@content_item.document_type}", count: 1), title: @content_item.title, average_title_length: "long" %>
<%= render 'shared/translations', content_item: @content_item %> -
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %> <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> <%= render 'shared/history_notice', content_item: @content_item %> @@ -20,8 +20,8 @@
<%= render 'shared/publisher_metadata_with_logo' %> -
-
+
+
<%= render 'components/important-metadata', items: @content_item.important_metadata %> <%= render "components/contents-list-with-body", contents: @content_item.contents do %> diff --git a/app/views/content_items/statistics_announcement.html.erb b/app/views/content_items/statistics_announcement.html.erb index 3bf6c2db7..9f931c0ac 100644 --- a/app/views/content_items/statistics_announcement.html.erb +++ b/app/views/content_items/statistics_announcement.html.erb @@ -4,8 +4,8 @@ ) %> <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %> <%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
@@ -13,8 +13,8 @@ <%= render 'shared/publisher_metadata_with_logo' %> -
-
+
+
<%= render "components/important-metadata", items: @content_item.important_metadata, margin_bottom: true %> @@ -43,7 +43,7 @@ title: nbsp_between_last_two_words(@content_item.forthcoming_notice_title) %> <% end %>
-
+
<%= render 'govuk_publishing_components/components/related_navigation', content_item: @content_item.content_item.parsed_content, context: :sidebar %>
diff --git a/app/views/content_items/take_part.html.erb b/app/views/content_items/take_part.html.erb index 4661d37e8..adc415532 100644 --- a/app/views/content_items/take_part.html.erb +++ b/app/views/content_items/take_part.html.erb @@ -4,8 +4,8 @@ ) %> <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %> <%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
@@ -13,8 +13,8 @@ <%= render 'shared/translations' %>
-
-
+
+
<%= render 'components/figure', src: @content_item.image["url"], alt: @content_item.image["alt_text"], diff --git a/app/views/content_items/topical_event_about_page.html.erb b/app/views/content_items/topical_event_about_page.html.erb index 062dc9c01..a03bef7d5 100644 --- a/app/views/content_items/topical_event_about_page.html.erb +++ b/app/views/content_items/topical_event_about_page.html.erb @@ -6,14 +6,14 @@ <%= render 'shared/title_and_translations', content_item: @content_item %> -
-
+
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
-
-
+
+
<%= render "components/contents-list-with-body", { contents: @content_item.contents, } do %> diff --git a/app/views/content_items/travel_advice.html+print.erb b/app/views/content_items/travel_advice.html+print.erb index e80d21315..f4ad4d323 100644 --- a/app/views/content_items/travel_advice.html+print.erb +++ b/app/views/content_items/travel_advice.html+print.erb @@ -6,8 +6,8 @@ <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %> <% @content_item.parts.each_with_index do |part, i| %>
diff --git a/app/views/content_items/travel_advice.html.erb b/app/views/content_items/travel_advice.html.erb index d8bc2433d..20350d9b1 100644 --- a/app/views/content_items/travel_advice.html.erb +++ b/app/views/content_items/travel_advice.html.erb @@ -12,15 +12,15 @@ ) %> <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
-
-
+
+

<%= @content_item.current_part_title %>

diff --git a/app/views/content_items/unpublishing.html.erb b/app/views/content_items/unpublishing.html.erb index 89e7f0117..375841433 100644 --- a/app/views/content_items/unpublishing.html.erb +++ b/app/views/content_items/unpublishing.html.erb @@ -1,5 +1,5 @@ -
-
+
+
<%= render 'govuk_publishing_components/components/title', title: 'The page you\'re looking for is no longer available' %>

diff --git a/app/views/content_items/working_group.html.erb b/app/views/content_items/working_group.html.erb index 864c41b60..97c305bbe 100644 --- a/app/views/content_items/working_group.html.erb +++ b/app/views/content_items/working_group.html.erb @@ -20,12 +20,12 @@ <% end %> <% end %> -

-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
<%= render 'shared/translations' %> -
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %> <%= render 'components/contents-list-with-body', contents: @content_item.contents do %> <%= render 'govuk_publishing_components/components/govspeak', diff --git a/app/views/content_items/world_location_news_article.html.erb b/app/views/content_items/world_location_news_article.html.erb index 55361e084..c5a93b0fa 100644 --- a/app/views/content_items/world_location_news_article.html.erb +++ b/app/views/content_items/world_location_news_article.html.erb @@ -4,12 +4,12 @@ ) %> <% end %> -
-
+
+
<%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
<%= render 'shared/translations' %> -
+
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
@@ -18,8 +18,8 @@ <%= render 'shared/history_notice', content_item: @content_item %> <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> -
-
+
+
<%= render 'components/figure', src: @content_item.image["url"], From 89e583582d5b559374c2a20ac90cd32cf42376c8 Mon Sep 17 00:00:00 2001 From: Vanita Barrett Date: Wed, 27 Mar 2019 14:40:11 +0000 Subject: [PATCH 3/8] Replace variables in css --- app/assets/stylesheets/application.scss | 6 +++--- .../stylesheets/components/_back-to-top.scss | 6 +++--- app/assets/stylesheets/components/_banner.scss | 10 +++++----- .../components/_contents-list-with-body.scss | 10 +++++----- .../stylesheets/components/_download-link.scss | 6 +++--- app/assets/stylesheets/components/_figure.scss | 8 ++++---- .../components/_important-metadata.scss | 6 +++--- .../stylesheets/components/_published-dates.scss | 2 +- .../components/_publisher-metadata.scss | 4 ++-- .../helpers/_content-bottom-margin.scss | 2 +- app/assets/stylesheets/helpers/_parts.scss | 16 ++++++++-------- .../helpers/_publisher-metadata-with-logo.scss | 8 ++++---- .../stylesheets/helpers/_sidebar-with-body.scss | 2 +- app/assets/stylesheets/mixins/_margins.scss | 8 ++++---- app/assets/stylesheets/views/_answer.scss | 2 +- app/assets/stylesheets/views/_coming-soon.scss | 2 +- app/assets/stylesheets/views/_consultation.scss | 2 +- .../stylesheets/views/_document-collection.scss | 8 ++++---- app/assets/stylesheets/views/_help-page.scss | 2 +- .../stylesheets/views/_html-publication.scss | 8 +++----- app/assets/stylesheets/views/_travel-advice.scss | 4 ++-- app/assets/stylesheets/views/_unpublishing.scss | 4 ++-- .../content_items/html_publication.html.erb | 4 ++-- 23 files changed, 64 insertions(+), 66 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f9643040a..498880ace 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,5 +1,8 @@ // The main application stylesheet +// Components from govuk_publishing_components gem +@import 'govuk_publishing_components/all_components'; + // govuk_frontend_toolkit imports @import 'colours'; @import 'measurements'; @@ -21,9 +24,6 @@ // Components from this application @import 'components/*'; -// Components from govuk_publishing_components gem -@import 'govuk_publishing_components/all_components'; - // pages specific view imports @import 'views/case-studies'; @import 'views/coming-soon'; diff --git a/app/assets/stylesheets/components/_back-to-top.scss b/app/assets/stylesheets/components/_back-to-top.scss index a63b7ccb0..8ef60a2ba 100644 --- a/app/assets/stylesheets/components/_back-to-top.scss +++ b/app/assets/stylesheets/components/_back-to-top.scss @@ -1,9 +1,9 @@ .app-c-back-to-top { @include core-16; display: inline-block; - margin-bottom: $gutter-half; - margin-left: $gutter-half; - margin-right: $gutter-half; + margin-bottom: govuk-spacing(3); + margin-left: govuk-spacing(3); + margin-right: govuk-spacing(3); } .app-c-back-to-top__icon { diff --git a/app/assets/stylesheets/components/_banner.scss b/app/assets/stylesheets/components/_banner.scss index 74f117a86..938481b0f 100644 --- a/app/assets/stylesheets/components/_banner.scss +++ b/app/assets/stylesheets/components/_banner.scss @@ -6,17 +6,17 @@ @include white-links; background: $govuk-blue; color: $white; - padding: $gutter-half; + padding: govuk-spacing(3); clear: both; @include media(tablet) { - padding: $gutter-two-thirds $gutter; + padding: govuk-spacing(4) govuk-spacing(6); } } .app-c-banner--grid { @include media(tablet) { - padding: $gutter; + padding: govuk-spacing(6); } } @@ -26,12 +26,12 @@ .app-c-banner__title { @include bold-27; - margin-bottom: $gutter-one-third; + margin-bottom: govuk-spacing(2); } .app-c-banner__desc { @include core-19; // Ensure the text has a line-length of around 60 characters max-width: 30em; - padding-top: $gutter-one-third; + padding-top: govuk-spacing(2); } diff --git a/app/assets/stylesheets/components/_contents-list-with-body.scss b/app/assets/stylesheets/components/_contents-list-with-body.scss index d01bcf347..ebb19b180 100644 --- a/app/assets/stylesheets/components/_contents-list-with-body.scss +++ b/app/assets/stylesheets/components/_contents-list-with-body.scss @@ -13,10 +13,10 @@ } .app-c-contents-list-with-body__link-wrapper { - padding-bottom: $gutter-one-third; + padding-bottom: govuk-spacing(2); .app-c-back-to-top { - padding-bottom: $gutter-one-third; + padding-bottom: govuk-spacing(2); } } @@ -32,17 +32,17 @@ z-index: 1; @include media(tablet) { - padding-left: $gutter-one-third; + padding-left: govuk-spacing(2); } .app-c-back-to-top { color: $link-colour; margin-bottom: 0; - padding: $gutter-half; + padding: govuk-spacing(3); width: percentage(2 / 3); @include media(tablet) { - padding: $gutter-two-thirds; + padding: govuk-spacing(4); } } diff --git a/app/assets/stylesheets/components/_download-link.scss b/app/assets/stylesheets/components/_download-link.scss index f71a08f3a..01245ba06 100644 --- a/app/assets/stylesheets/components/_download-link.scss +++ b/app/assets/stylesheets/components/_download-link.scss @@ -1,11 +1,11 @@ .app-c-download-link { display: inline-block; @include bold-19; - margin-top: $gutter-half; - margin-bottom: $gutter-half; + margin-top: govuk-spacing(3); + margin-bottom: govuk-spacing(3); @include media(tablet) { - margin-top: $gutter; + margin-top: govuk-spacing(6); } } diff --git a/app/assets/stylesheets/components/_figure.scss b/app/assets/stylesheets/components/_figure.scss index e63d383bf..f32c836a3 100644 --- a/app/assets/stylesheets/components/_figure.scss +++ b/app/assets/stylesheets/components/_figure.scss @@ -3,7 +3,7 @@ @include responsive-bottom-margin; border-top: 1px solid $border-colour; - padding-top: $gutter-half; + padding-top: govuk-spacing(3); } .app-c-figure__image { @@ -28,12 +28,12 @@ box-sizing: border-box; float: left; - padding-left: $gutter-half; + padding-left: govuk-spacing(3); width: 50%; } @include media(mobile) { - margin-top: $gutter-one-third; + margin-top: govuk-spacing(2); } } @@ -41,6 +41,6 @@ margin-bottom: 0; @include media(desktop, tablet) { - margin-bottom: $gutter-one-third; + margin-bottom: govuk-spacing(2); } } diff --git a/app/assets/stylesheets/components/_important-metadata.scss b/app/assets/stylesheets/components/_important-metadata.scss index cb7480812..01af03fd0 100644 --- a/app/assets/stylesheets/components/_important-metadata.scss +++ b/app/assets/stylesheets/components/_important-metadata.scss @@ -3,11 +3,11 @@ @include white-links; background: $govuk-blue; color: $white; - padding: $gutter-half; + padding: govuk-spacing(3); @include media(tablet) { overflow: auto; - padding: $gutter-two-thirds $gutter; + padding: govuk-spacing(4) govuk-spacing(6); } } @@ -25,7 +25,7 @@ .app-c-important-metadata__term { float: left; - padding-right: $gutter-one-third / 2; + padding-right: govuk-spacing(1); } .app-c-important-metadata__definition { diff --git a/app/assets/stylesheets/components/_published-dates.scss b/app/assets/stylesheets/components/_published-dates.scss index ea226a091..2b96a7ea2 100644 --- a/app/assets/stylesheets/components/_published-dates.scss +++ b/app/assets/stylesheets/components/_published-dates.scss @@ -25,6 +25,6 @@ } .app-c-published-dates--history { - padding-top: $gutter-one-third; + padding-top: govuk-spacing(2); border-top: 1px solid $border-colour; } diff --git a/app/assets/stylesheets/components/_publisher-metadata.scss b/app/assets/stylesheets/components/_publisher-metadata.scss index 6d300a298..d18d9afc9 100644 --- a/app/assets/stylesheets/components/_publisher-metadata.scss +++ b/app/assets/stylesheets/components/_publisher-metadata.scss @@ -1,7 +1,7 @@ .app-c-publisher-metadata { @include responsive-bottom-margin; @include core-16; - padding-top: $gutter-half; + padding-top: govuk-spacing(3); } .app-c-publisher-metadata__other a { @@ -10,7 +10,7 @@ .app-c-publisher-metadata__term { float: left; - padding-right: $gutter-one-third / 2; + padding-right: govuk-spacing(1); .direction-rtl & { float: none; diff --git a/app/assets/stylesheets/helpers/_content-bottom-margin.scss b/app/assets/stylesheets/helpers/_content-bottom-margin.scss index 94ca1b04e..d7f904a86 100644 --- a/app/assets/stylesheets/helpers/_content-bottom-margin.scss +++ b/app/assets/stylesheets/helpers/_content-bottom-margin.scss @@ -1,5 +1,5 @@ .content-bottom-margin { - margin-bottom: $gutter-two-thirds; + margin-bottom: govuk-spacing(4); @include media(tablet) { @include responsive-bottom-margin; diff --git a/app/assets/stylesheets/helpers/_parts.scss b/app/assets/stylesheets/helpers/_parts.scss index bed424c65..7c2a03c6c 100644 --- a/app/assets/stylesheets/helpers/_parts.scss +++ b/app/assets/stylesheets/helpers/_parts.scss @@ -1,13 +1,13 @@ @mixin parts { .part-navigation-container { - margin-top: $gutter; - margin-bottom: $gutter; - padding-bottom: $gutter-half; + margin-top: govuk-spacing(6); + margin-bottom: govuk-spacing(6); + padding-bottom: govuk-spacing(3); @include media(tablet) { margin-top: 0; margin-bottom: 0; - padding-bottom: $gutter-half; + padding-bottom: govuk-spacing(3); } border-bottom: 1px solid $grey-2; @@ -33,12 +33,12 @@ .part-title { @include bold-27; - margin-bottom: $gutter-half; - margin-top: $gutter-half; + margin-bottom: govuk-spacing(3); + margin-top: govuk-spacing(3); @include media(tablet) { - margin-bottom: $gutter-two-thirds; - margin-top: $gutter-two-thirds; + margin-bottom: govuk-spacing(4); + margin-top: govuk-spacing(4); } } } diff --git a/app/assets/stylesheets/helpers/_publisher-metadata-with-logo.scss b/app/assets/stylesheets/helpers/_publisher-metadata-with-logo.scss index 0c20c5055..b9c063f76 100644 --- a/app/assets/stylesheets/helpers/_publisher-metadata-with-logo.scss +++ b/app/assets/stylesheets/helpers/_publisher-metadata-with-logo.scss @@ -4,8 +4,8 @@ .metadata-logo-wrapper { @extend %contain-floats; border-top: 1px solid $border-colour; - margin-left: $gutter-half; - margin-right: $gutter-half; + margin-left: govuk-spacing(3); + margin-right: govuk-spacing(3); .metadata-column { padding-left: 0; @@ -14,8 +14,8 @@ .metadata-logo { max-height: 90px; max-width: 100%; - padding-bottom: $gutter-half; - padding-top: $gutter-half; + padding-bottom: govuk-spacing(3); + padding-top: govuk-spacing(3); @include media(tablet) { float: right; diff --git a/app/assets/stylesheets/helpers/_sidebar-with-body.scss b/app/assets/stylesheets/helpers/_sidebar-with-body.scss index 506aa8566..c57cb1762 100644 --- a/app/assets/stylesheets/helpers/_sidebar-with-body.scss +++ b/app/assets/stylesheets/helpers/_sidebar-with-body.scss @@ -1,6 +1,6 @@ @mixin sidebar-with-body { .sidebar-with-body { position: relative; - margin-bottom: $gutter * 1.5; + margin-bottom: govuk-spacing(8); } } diff --git a/app/assets/stylesheets/mixins/_margins.scss b/app/assets/stylesheets/mixins/_margins.scss index 33656c0d3..9767b6614 100644 --- a/app/assets/stylesheets/mixins/_margins.scss +++ b/app/assets/stylesheets/mixins/_margins.scss @@ -1,16 +1,16 @@ @mixin responsive-bottom-margin { - margin-bottom: $gutter-half; + margin-bottom: govuk-spacing(3); @include media(tablet) { - margin-bottom: $gutter * 1.5; + margin-bottom: govuk-spacing(8); } } @mixin responsive-top-margin { - margin-top: $gutter-half; + margin-top: govuk-spacing(3); @include media(tablet) { - margin-top: $gutter * 1.5; + margin-top: govuk-spacing(8); } } diff --git a/app/assets/stylesheets/views/_answer.scss b/app/assets/stylesheets/views/_answer.scss index fe1c06f30..7f83f27c9 100644 --- a/app/assets/stylesheets/views/_answer.scss +++ b/app/assets/stylesheets/views/_answer.scss @@ -2,6 +2,6 @@ @include add-title-margin; .last-updated { - padding-bottom: $gutter-half; + padding-bottom: govuk-spacing(3); } } diff --git a/app/assets/stylesheets/views/_coming-soon.scss b/app/assets/stylesheets/views/_coming-soon.scss index 32d9afca3..d32bc6c63 100644 --- a/app/assets/stylesheets/views/_coming-soon.scss +++ b/app/assets/stylesheets/views/_coming-soon.scss @@ -1,6 +1,6 @@ .coming-soon { .summary { @include core-24; - margin-bottom: $gutter-half; + margin-bottom: govuk-spacing(3); } } diff --git a/app/assets/stylesheets/views/_consultation.scss b/app/assets/stylesheets/views/_consultation.scss index 6c9aaa9c9..325cef0fe 100644 --- a/app/assets/stylesheets/views/_consultation.scss +++ b/app/assets/stylesheets/views/_consultation.scss @@ -9,7 +9,7 @@ border-top: 1px solid $border-colour; @include media(tablet) { - padding-top: $gutter; + padding-top: govuk-spacing(6); } } } diff --git a/app/assets/stylesheets/views/_document-collection.scss b/app/assets/stylesheets/views/_document-collection.scss index 1c26ed94a..d0a72990f 100644 --- a/app/assets/stylesheets/views/_document-collection.scss +++ b/app/assets/stylesheets/views/_document-collection.scss @@ -4,12 +4,12 @@ .group-title { @include bold-27; - margin-top: $gutter; - margin-bottom: $gutter-half; + margin-top: govuk-spacing(6); + margin-bottom: govuk-spacing(3); @include media(desktop) { - margin-top: $gutter * 1.5; - margin-bottom: $gutter-two-thirds; + margin-top: govuk-spacing(8); + margin-bottom: govuk-spacing(4); } &:first-child { diff --git a/app/assets/stylesheets/views/_help-page.scss b/app/assets/stylesheets/views/_help-page.scss index c2a2c6eff..505db2149 100644 --- a/app/assets/stylesheets/views/_help-page.scss +++ b/app/assets/stylesheets/views/_help-page.scss @@ -2,6 +2,6 @@ @include add-title-margin; .last-updated { - padding-bottom: $gutter-half; + padding-bottom: govuk-spacing(3); } } diff --git a/app/assets/stylesheets/views/_html-publication.scss b/app/assets/stylesheets/views/_html-publication.scss index 9eeec0659..55891f4ec 100644 --- a/app/assets/stylesheets/views/_html-publication.scss +++ b/app/assets/stylesheets/views/_html-publication.scss @@ -9,16 +9,14 @@ } .publication-external { - @extend %grid-row; - margin-bottom: $gutter-two-thirds; + margin-bottom: govuk-spacing(4); position: relative; .organisation-logos { - @include grid-column(1 / 4); list-style-type: none; .organisation-logo { - padding-bottom: $gutter-one-third; + padding-bottom: govuk-spacing(2); } } @@ -30,7 +28,7 @@ .publication-header__last-changed { @include core-19; - margin-top: $gutter-half; + margin-top: govuk-spacing(3); } .column-quarter-desktop-only { diff --git a/app/assets/stylesheets/views/_travel-advice.scss b/app/assets/stylesheets/views/_travel-advice.scss index 0185010a2..286dee1ba 100644 --- a/app/assets/stylesheets/views/_travel-advice.scss +++ b/app/assets/stylesheets/views/_travel-advice.scss @@ -3,7 +3,7 @@ @include add-title-margin; .part-navigation { - margin-bottom: $gutter * 1.5; + margin-bottom: govuk-spacing(8); } // TODO: Remove this when components can accept variable unidirectional spacing, @@ -11,7 +11,7 @@ .map { @include responsive-bottom-margin; - margin-top: $gutter; + margin-top: govuk-spacing(6); .map-image { max-width: 100%; diff --git a/app/assets/stylesheets/views/_unpublishing.scss b/app/assets/stylesheets/views/_unpublishing.scss index 3da64626c..915a49154 100644 --- a/app/assets/stylesheets/views/_unpublishing.scss +++ b/app/assets/stylesheets/views/_unpublishing.scss @@ -1,10 +1,10 @@ .unpublishing, .gone { - margin-bottom: $gutter * 2; + margin-bottom: govuk-spacing(9); .summary, .alternative { @include core-19; - margin-bottom: $gutter-half; + margin-bottom: govuk-spacing(3); } } diff --git a/app/views/content_items/html_publication.html.erb b/app/views/content_items/html_publication.html.erb index 9934beae2..28e4693e9 100644 --- a/app/views/content_items/html_publication.html.erb +++ b/app/views/content_items/html_publication.html.erb @@ -9,8 +9,8 @@ %> <% if @content_item.organisations %> -
-
    +
    +
      <% @content_item.organisations.each do |organisation| %> <% logo_attributes = @content_item.organisation_logo(organisation) %> <% next unless logo_attributes %> From dc69a13fd848ebc9b27c3c66662b3d3147d6435a Mon Sep 17 00:00:00 2001 From: Vanita Barrett Date: Thu, 28 Mar 2019 09:49:19 +0000 Subject: [PATCH 4/8] Rename banner component class --- app/assets/stylesheets/components/_banner.scss | 4 +--- app/views/components/_banner.html.erb | 2 +- test/components/banner_test.rb | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/components/_banner.scss b/app/assets/stylesheets/components/_banner.scss index 938481b0f..2c1cece2b 100644 --- a/app/assets/stylesheets/components/_banner.scss +++ b/app/assets/stylesheets/components/_banner.scss @@ -1,5 +1,3 @@ -@import "grid_layout"; - .app-c-banner { @include responsive-bottom-margin; @include core-19; @@ -14,7 +12,7 @@ } } -.app-c-banner--grid { +.app-c-banner--aside { @include media(tablet) { padding: govuk-spacing(6); } diff --git a/app/views/components/_banner.html.erb b/app/views/components/_banner.html.erb index 15f04c539..1fae0306e 100644 --- a/app/views/components/_banner.html.erb +++ b/app/views/components/_banner.html.erb @@ -11,7 +11,7 @@ <%= text %>

      <% end %> -
      +
      <%= content_block %> <% if aside %>

      <%= aside %>

      diff --git a/test/components/banner_test.rb b/test/components/banner_test.rb index 219f456f3..d1cd176d6 100644 --- a/test/components/banner_test.rb +++ b/test/components/banner_test.rb @@ -14,7 +14,7 @@ def component_name test "renders a banner with text correctly" do render_component(title: 'Summary', text: 'This was published under the 2010 to 2015 Conservative government') - assert_select ".app-c-banner--grid", false + assert_select ".app-c-banner--aside", false assert_select ".app-c-banner__desc", text: 'This was published under the 2010 to 2015 Conservative government' end @@ -26,7 +26,7 @@ def component_name test "renders a banner with title and text correctly" do render_component(title: 'Summary', text: 'This was published under the 2010 to 2015 Conservative government') - assert_select ".app-c-banner--grid", false + assert_select ".app-c-banner--aside", false assert_select ".app-c-banner__title", text: 'Summary' assert_select ".app-c-banner__desc", text: 'This was published under the 2010 to 2015 Conservative government' end @@ -36,7 +36,7 @@ def component_name text: 'This was published under the 2010 to 2015 Conservative government', aside: 'This consultation ran from 9:30am on 30 January 2017 to 5pm on 28 February 2017') - assert_select ".app-c-banner--grid" + assert_select ".app-c-banner--aside" assert_select ".app-c-banner__title", text: 'Summary' assert_select ".app-c-banner__desc", text: 'This was published under the 2010 to 2015 Conservative government' assert_select ".app-c-banner__desc", text: 'This consultation ran from 9:30am on 30 January 2017 to 5pm on 28 February 2017' From 38579ea7dd6fd3c05cfa825468e7240731ac9842 Mon Sep 17 00:00:00 2001 From: Vanita Barrett Date: Thu, 28 Mar 2019 14:38:51 +0000 Subject: [PATCH 5/8] Replace grid system in html publications --- .../stylesheets/views/_html-publication.scss | 34 ++++++++----------- .../content_items/html_publication.html.erb | 6 ++-- test/integration/html_publication_test.rb | 4 +-- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/views/_html-publication.scss b/app/assets/stylesheets/views/_html-publication.scss index 55891f4ec..c157d4766 100644 --- a/app/assets/stylesheets/views/_html-publication.scss +++ b/app/assets/stylesheets/views/_html-publication.scss @@ -1,5 +1,3 @@ -@import "grid_layout"; - .html-publication { @include sidebar-with-body; @@ -31,36 +29,34 @@ margin-top: govuk-spacing(3); } - .column-quarter-desktop-only { - @include grid-column( 1 / 4, $full-width: desktop ); - + .main-content-container { .direction-rtl & { - float: right; + float: left; } } - .column-three-quarters-desktop-only { - @include grid-column( 3 / 4, $full-width: desktop ); - + .contents-list-container { .direction-rtl & { float: right; } } - .offset-quarter-desktop-only { - margin-left: 25%; + .main-content-container { + width: 100%; + padding: 0 15px; + box-sizing: border-box; - .direction-rtl & { - margin-left: 0; - margin-right: 25%; + @include media(desktop) { + width: 75%; + float: right; } + } - @include media(false, $desktop-breakpoint) { - margin: 0; + .offset-empty-contents-list { + float: right; - .direction-rtl & { - margin: 0; - } + .direction-rtl & { + float: left; } } diff --git a/app/views/content_items/html_publication.html.erb b/app/views/content_items/html_publication.html.erb index 28e4693e9..7291db105 100644 --- a/app/views/content_items/html_publication.html.erb +++ b/app/views/content_items/html_publication.html.erb @@ -35,12 +35,12 @@ <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
      <% if @content_item.contents.any? %> -
      +
      <%= render 'govuk_publishing_components/components/contents_list', contents: @content_item.contents, format_numbers: true %>
      <% end %> @@ -51,7 +51,7 @@
      -
      +
      <%= render 'govuk_publishing_components/components/govspeak_html_publication', @content_item.govspeak_body %>
      diff --git a/test/integration/html_publication_test.rb b/test/integration/html_publication_test.rb index 29b403006..3c3ad33e7 100644 --- a/test/integration/html_publication_test.rb +++ b/test/integration/html_publication_test.rb @@ -26,7 +26,7 @@ class HtmlPublicationTest < ActionDispatch::IntegrationTest test "html publications with meta data" do setup_and_visit_content_item("print_with_meta_data") - within ".grid-row" do + within ".govuk-grid-row.sidebar-with-body" do assert page.find(".print-meta-data", visible: false) assert page.has_no_text?("© Crown copyright #{@content_item['details']['public_timestamp'].to_date.year}") @@ -40,7 +40,7 @@ class HtmlPublicationTest < ActionDispatch::IntegrationTest test "html publications with meta data - print version" do setup_and_visit_content_item("print_with_meta_data", "?medium=print") - within ".grid-row" do + within ".govuk-grid-row.sidebar-with-body" do assert page.find(".print-meta-data", visible: true) assert page.has_text?("© Crown copyright #{@content_item['details']['public_timestamp'].to_date.year}") From 1ecf2dac18bb0d91a4633906885c35af81a9906b Mon Sep 17 00:00:00 2001 From: Vanita Barrett Date: Thu, 28 Mar 2019 14:42:15 +0000 Subject: [PATCH 6/8] Remove frontend toolkit measurements import --- app/assets/stylesheets/application.scss | 1 - app/assets/stylesheets/print.scss | 1 - 2 files changed, 2 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 498880ace..c276cdbac 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -5,7 +5,6 @@ // govuk_frontend_toolkit imports @import 'colours'; -@import 'measurements'; @import 'shims'; @import 'typography'; diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss index 5a67179ca..a2000b43f 100644 --- a/app/assets/stylesheets/print.scss +++ b/app/assets/stylesheets/print.scss @@ -1,5 +1,4 @@ // govuk_frontend_toolkit imports -@import 'measurements'; @import 'typography'; @import 'govuk_publishing_components/all_components_print'; From 6291804ff1ea95de3165ad54926044ab56386c07 Mon Sep 17 00:00:00 2001 From: Vanita Barrett Date: Wed, 17 Apr 2019 10:23:03 +0000 Subject: [PATCH 7/8] Replace class for testing with id --- app/views/content_items/guide.html+print.erb | 2 +- app/views/content_items/travel_advice.html+print.erb | 2 +- test/controllers/content_items_controller_test.rb | 2 +- test/integration/guide_print_test.rb | 2 +- test/integration/travel_advice_print_test.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/content_items/guide.html+print.erb b/app/views/content_items/guide.html+print.erb index 8d35a1b2d..2199b021b 100644 --- a/app/views/content_items/guide.html+print.erb +++ b/app/views/content_items/guide.html+print.erb @@ -6,7 +6,7 @@ <% end %> -
      +
      <%= render 'govuk_publishing_components/components/title', { title: @content_item.title } %> <% @content_item.parts.each_with_index do |part, index| %> diff --git a/app/views/content_items/travel_advice.html+print.erb b/app/views/content_items/travel_advice.html+print.erb index f4ad4d323..31f0ee353 100644 --- a/app/views/content_items/travel_advice.html+print.erb +++ b/app/views/content_items/travel_advice.html+print.erb @@ -6,7 +6,7 @@ <% end %> -
      +
      <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %> <% @content_item.parts.each_with_index do |part, i| %> diff --git a/test/controllers/content_items_controller_test.rb b/test/controllers/content_items_controller_test.rb index 7eaa2ddfc..49a974dab 100644 --- a/test/controllers/content_items_controller_test.rb +++ b/test/controllers/content_items_controller_test.rb @@ -221,7 +221,7 @@ class ContentItemsControllerTest < ActionController::TestCase assert_response :success assert_equal request.variant, [:print] - assert_select ".travel-advice-print" + assert_select "#travel-advice-print" end test "gets item from content store even when url contains multi-byte UTF8 character" do diff --git a/test/integration/guide_print_test.rb b/test/integration/guide_print_test.rb index 2f2fd67e7..8edcb4179 100644 --- a/test/integration/guide_print_test.rb +++ b/test/integration/guide_print_test.rb @@ -3,7 +3,7 @@ class GuidePrint < ActionDispatch::IntegrationTest test "it renders the print view" do setup_and_visit_guide_print('guide') - assert page.has_css?(".guide-print") + assert page.has_css?("#guide-print") end test "it is not indexable by search engines" do diff --git a/test/integration/travel_advice_print_test.rb b/test/integration/travel_advice_print_test.rb index db5971efb..71c69077f 100644 --- a/test/integration/travel_advice_print_test.rb +++ b/test/integration/travel_advice_print_test.rb @@ -3,7 +3,7 @@ class TravelAdvicePrint < ActionDispatch::IntegrationTest test "it renders the print view" do setup_and_visit_travel_advice_print('full-country') - assert page.has_css?(".travel-advice-print") + assert page.has_css?("#travel-advice-print") end test "it is not indexable by search engines" do From ebe605453ee28a942aa60e9b912e66a7cab7239a Mon Sep 17 00:00:00 2001 From: Vanita Barrett Date: Wed, 17 Apr 2019 10:34:46 +0000 Subject: [PATCH 8/8] Replace contain-floats with govuk-clearfix --- .../stylesheets/helpers/_publisher-metadata-with-logo.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/helpers/_publisher-metadata-with-logo.scss b/app/assets/stylesheets/helpers/_publisher-metadata-with-logo.scss index b9c063f76..a315a28e3 100644 --- a/app/assets/stylesheets/helpers/_publisher-metadata-with-logo.scss +++ b/app/assets/stylesheets/helpers/_publisher-metadata-with-logo.scss @@ -2,7 +2,7 @@ // roll out the combination of metadata + logo across // formats so they may ultimately become component styles. .metadata-logo-wrapper { - @extend %contain-floats; + @include govuk-clearfix; border-top: 1px solid $border-colour; margin-left: govuk-spacing(3); margin-right: govuk-spacing(3);