Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Er 918 submodule content footer component for cdt #756

Merged
merged 13 commits into from
Apr 10, 2024
Merged

Er 918 submodule content footer component for cdt #756

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f4efecf
Create new content footer component for CDT
martikat Mar 21, 2024
42e3c4e
Update content footer
nomasprime Mar 27, 2024
b252be3
Merge branch 'main' into ER-918-submodule-content-footer-component-fo…
nomasprime Mar 27, 2024
b226fa2
Govspeak and CDT style quotes concurrently (#760)
peterdavidhamilton Apr 2, 2024
6e0f2e6
Fix two_thirds tag and introduce image_card mimicking CDTs about page…
peterdavidhamilton Apr 3, 2024
31720cb
ER-957 Downloadable media (#762)
peterdavidhamilton Apr 5, 2024
fa769f0
Bump azure/login from 1 to 2 (#732)
dependabot[bot] Apr 5, 2024
fd67858
Update styling for content footer
martikat Apr 9, 2024
c3c23da
Merge branch 'main' into ER-918-submodule-content-footer-component-fo…
martikat Apr 9, 2024
8f94cd9
Update styling
martikat Apr 9, 2024
87d364f
Update content footer based on PR comments
martikat Apr 10, 2024
f713e22
Update content footer and hr logic
martikat Apr 10, 2024
4fd77ff
Merge branch 'main' into ER-918-submodule-content-footer-component-fo…
martikat Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions app/assets/stylesheets/hfeyp-v2.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ a:hover .hf-card-container .hf-card-details h3 {
}

.hf-ctas {
padding-top: govuk-spacing(7);
padding-bottom: govuk-spacing(7);
padding-top: govuk-spacing(9);
padding-bottom: govuk-spacing(4);
}

.hf-second-color {
Expand Down Expand Up @@ -73,10 +73,8 @@ a:hover .hf-card-container .hf-card-details h3 {
}

.cta-banner-img {
width: 35%;
width: 40%;
display: flex;
padding-left: 0;
padding-right: 0;
}

.chevron-card-list {
Expand Down
3 changes: 2 additions & 1 deletion app/views/pages/default.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
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)}

hr.govuk-section-break.govuk-section-break--visible.govuk-section-break--l class='govuk-!-margin-top-7 govuk-!-margin-bottom-0'
div class='govuk-grid-column-full'
hr class='govuk-section-break govuk-section-break--xl govuk-section-break--visible'

= render 'shared/ctas'

Expand Down
3 changes: 2 additions & 1 deletion app/views/pages/side_nav.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@

= m(page.body)

hr.govuk-section-break.govuk-section-break--visible.govuk-section-break--l class='govuk-!-margin-top-7 govuk-!-margin-bottom-0'
div class='govuk-grid-column-full'
hr class='govuk-section-break govuk-section-break--xl govuk-section-break--visible'

= render 'shared/ctas'

Expand Down
4 changes: 2 additions & 2 deletions app/views/shared/_content_footer.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ section class=".govuk-!-margin-top-7 govuk-!-margin-bottom-7"
div class="govuk-grid-row"
div class="govuk-grid-column-full"
div class="cta-banner"
.govuk-grid-column-two-thirds.div class="cta-banner-text"
.div class="cta-banner-text"
martikat marked this conversation as resolved.
Show resolved Hide resolved
span class="govuk-caption-m" Other early years resources from the Department for Education
h2 class="govuk-heading-l"
= content_footer.title
peterdavidhamilton marked this conversation as resolved.
Show resolved Hide resolved
p
= content_footer.body
p
= govuk_link_to content_footer.link_to_text, content_footer.link_to, class: "govuk-!-font-weight-bold"
.govuk-grid-column-one-third.div class="cta-banner-img"
.div class="cta-banner-img"
martikat marked this conversation as resolved.
Show resolved Hide resolved
img
martikat marked this conversation as resolved.
Show resolved Hide resolved
= image_tag content_footer.image.url, class: "full-width-image", alt: content_footer.image.description, title: content_footer.image.title