Skip to content

Commit

Permalink
Address formatting bugs in ticket and add back to top link
Browse files Browse the repository at this point in the history
  • Loading branch information
martikat committed Apr 11, 2024
1 parent 86e9fd8 commit 285cb49
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 19 deletions.
8 changes: 7 additions & 1 deletion app/assets/stylesheets/_links.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@

.govuk-breadcrumbs li {
font-size: 16px;
}
}

@media (max-width: 40.0525em) {
.govuk-breadcrumbs li {
font-size: 14px;
}
}
4 changes: 0 additions & 4 deletions app/assets/stylesheets/dfe-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand Down
5 changes: 2 additions & 3 deletions app/views/layouts/_banner.html.slim
Original file line number Diff line number Diff line change
@@ -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')
= 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')
2 changes: 1 addition & 1 deletion app/views/markup/_downloadable_media.html.slim
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 2 additions & 10 deletions app/views/pages/default.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions app/views/pages/side_nav.slim
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions app/views/shared/_back_to_top.html.slim
Original file line number Diff line number Diff line change
@@ -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')
10 changes: 10 additions & 0 deletions app/views/shared/_citation.html.slim
Original file line number Diff line number Diff line change
@@ -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)}

0 comments on commit 285cb49

Please sign in to comment.