diff --git a/app/assets/stylesheets/_links.scss b/app/assets/stylesheets/_links.scss index 5419563b..e0143759 100644 --- a/app/assets/stylesheets/_links.scss +++ b/app/assets/stylesheets/_links.scss @@ -6,4 +6,10 @@ .govuk-breadcrumbs li { font-size: 16px; -} \ No newline at end of file +} + +@media (max-width: 40.0525em) { + .govuk-breadcrumbs li { + font-size: 14px; + } +} diff --git a/app/assets/stylesheets/dfe-header.scss b/app/assets/stylesheets/dfe-header.scss index db873142..662f8f06 100644 --- a/app/assets/stylesheets/dfe-header.scss +++ b/app/assets/stylesheets/dfe-header.scss @@ -98,10 +98,6 @@ header #service-name { .dfe-content-page--header { background: $light-blue; - @include govuk-media-query($until: tablet) { - padding: govuk-spacing(2); - } - img { max-width: 100%; width: 100%; diff --git a/app/views/layouts/_banner.html.slim b/app/views/layouts/_banner.html.slim index 332e3a57..b03d7e42 100644 --- a/app/views/layouts/_banner.html.slim +++ b/app/views/layouts/_banner.html.slim @@ -1,3 +1,2 @@ -aside.govuk-width-container title='Beta Banner' - = govuk_phase_banner(tag: { text: 'Beta' }, classes: 'noprint') do - = t 'phase_banner_html', feedback_link: govuk_link_to('feedback', Rails.configuration.feedback_url, target: :_blank, rel: 'noopener noreferrer') \ No newline at end of file += govuk_phase_banner(tag: { text: 'Beta' }, classes: 'noprint') do + = t 'phase_banner_html', feedback_link: govuk_link_to('feedback', Rails.configuration.feedback_url, target: :_blank, rel: 'noopener noreferrer') diff --git a/app/views/markup/_downloadable_media.html.slim b/app/views/markup/_downloadable_media.html.slim index 6f558d87..b45ddb55 100644 --- a/app/views/markup/_downloadable_media.html.slim +++ b/app/views/markup/_downloadable_media.html.slim @@ -1,4 +1,4 @@ -section.gem-c-attachment class='govuk-!-display-none-print govuk-!-margin-bottom-6 govuk-!-margin-top-' +section.gem-c-attachment class='govuk-!-display-none-print govuk-!-margin-bottom-6 govuk-!-margin-top-7' .gem-c-attachment__thumbnail a.govuk-link target='_self' tabindex='-1' aria-hidden='true' href=pdf_url diff --git a/app/views/pages/default.html.slim b/app/views/pages/default.html.slim index b5cb330f..92598b01 100644 --- a/app/views/pages/default.html.slim +++ b/app/views/pages/default.html.slim @@ -21,18 +21,10 @@ .govuk-grid-column-full = m(page.body) -.hf-citation - .gem-c-metadata data-module="gem-toggle metadata" data-gem-toggle-module-started="true" data-metadata-module-started="true" - dl.gem-c-metadata__list data-module="gem-track-click" data-gem-track-click-module-started="true" - dt.gem-c-metadata__term From: - dd.gem-c-metadata__definition - a.govuk-link href="https://www.gov.uk/government/organisations/department-for-education" Department for Education - dt.gem-c-metadata__term Published: - dd.gem-c-metadata__definition = page.created_at.to_s(:long) - dt.gem-c-metadata__term Updated: - dd.gem-c-metadata__definition data-module="ga4-link-tracker" data-ga4-track-links-only="" data-ga4-link="{"event_name":"navigation","type":"content history","section":"Top","action":"opened"}" data-ga4-link-tracker-module-started="true" #{page.updated_at.to_s(:long)} += render 'shared/citation' - if page.content_list.present? + = render 'shared/back_to_top' = render 'shared/print' .govuk-grid-column-full diff --git a/app/views/pages/side_nav.slim b/app/views/pages/side_nav.slim index de601b9e..cd6ae171 100644 --- a/app/views/pages/side_nav.slim +++ b/app/views/pages/side_nav.slim @@ -34,6 +34,8 @@ = m(page.body) - if page.content_list.present? + = render 'shared/citation' + = render 'shared/back_to_top' = render 'shared/print' .govuk-grid-column-full diff --git a/app/views/shared/_back_to_top.html.slim b/app/views/shared/_back_to_top.html.slim new file mode 100644 index 00000000..7e311246 --- /dev/null +++ b/app/views/shared/_back_to_top.html.slim @@ -0,0 +1,2 @@ +div.app-back-to-top class='govuk-!-margin-bottom-7' data-module='app-back-to-top' + = govuk_back_to_top_link('#top') diff --git a/app/views/shared/_citation.html.slim b/app/views/shared/_citation.html.slim new file mode 100644 index 00000000..84b7e766 --- /dev/null +++ b/app/views/shared/_citation.html.slim @@ -0,0 +1,10 @@ +.hf-citation + .gem-c-metadata data-module="gem-toggle metadata" data-gem-toggle-module-started="true" data-metadata-module-started="true" + dl.gem-c-metadata__list data-module="gem-track-click" data-gem-track-click-module-started="true" + dt.gem-c-metadata__term From: + dd.gem-c-metadata__definition + a.govuk-link href="https://www.gov.uk/government/organisations/department-for-education" Department for Education + dt.gem-c-metadata__term Published: + dd.gem-c-metadata__definition = page.created_at.to_s(:long) + dt.gem-c-metadata__term Updated: + dd.gem-c-metadata__definition data-module="ga4-link-tracker" data-ga4-track-links-only="" data-ga4-link="{"event_name":"navigation","type":"content history","section":"Top","action":"opened"}" data-ga4-link-tracker-module-started="true" #{page.updated_at.to_s(:long)}