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

Jump to bottom

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

merged 13 commits into from
Apr 10, 2024

Conversation

nomasprime
Copy link
Contributor

@nomasprime nomasprime commented Mar 27, 2024 •
edited by peterdavidhamilton
Loading

martikat and others added 3 commits March 27, 2024 14:25
@peterdavidhamilton peterdavidhamilton added this to the rc2.0.0 milestone Apr 2, 2024
peterdavidhamilton and others added 6 commits April 9, 2024 11:51
@peterdavidhamilton @martikat
Govspeak and CDT style quotes concurrently (#760)
b226fa2
@peterdavidhamilton @martikat
Fix two_thirds tag and introduce image_card mimicking CDTs about page (…
6e0f2e6 
…#761)
@peterdavidhamilton @martikat
ER-957 Downloadable media (#762)
31720cb 
Custom tag using manual variables as MVP.
Dynamic variables require model association with media.
@dependabot @martikat
Bump azure/login from 1 to 2 (#732)
fa769f0 
Bumps [azure/login](https://github.com/azure/login) from 1 to 2.
- [Release notes](https://github.com/azure/login/releases)
- [Commits](Azure/login@v1...v2)

---
updated-dependencies:
- dependency-name: azure/login
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@martikat
Update styling for content footer
fd67858
@martikat
Merge branch 'main' into ER-918-submodule-content-footer-component-fo…
c3c23da 
…r-cdt
peterdavidhamilton
peterdavidhamilton suggested changes Apr 10, 2024
View reviewed changes
Copy link
Contributor

@peterdavidhamilton peterdavidhamilton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whilst you convert to the correct slim template shorthand double-check these 👀 lines particularly

app/views/shared/_content_footer.html.slim Outdated Show resolved Hide resolved
app/views/shared/_content_footer.html.slim Outdated Show resolved Hide resolved
app/views/shared/_content_footer.html.slim Outdated Show resolved Hide resolved
peterdavidhamilton
peterdavidhamilton reviewed Apr 10, 2024
View reviewed changes
Copy link
Contributor

@peterdavidhamilton peterdavidhamilton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@martikat here's how I might have approached the variables

app/helpers/content_helper.rb Show resolved Hide resolved
app/helpers/content_helper.rb Show resolved Hide resolved
app/views/pages/default.html.slim Show resolved Hide resolved
app/views/shared/_content_footer.html.slim Show resolved Hide resolved
@peterdavidhamilton peterdavidhamilton added this pull request to the merge queue Apr 10, 2024
Merged via the queue into main with commit 86e9fd8 Apr 10, 2024
1 check passed
@peterdavidhamilton peterdavidhamilton deleted the ER-918-submodule-content-footer-component-for-cdt branch April 10, 2024 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martikat martikat martikat approved these changes

@peterdavidhamilton peterdavidhamilton peterdavidhamilton approved these changes

@jack-coggin jack-coggin Awaiting requested review from jack-coggin

Assignees

@martikat martikat

Labels
None yet
Projects
None yet
Milestone
v2.0.0
Development

Successfully merging this pull request may close these issues.
3 participants
@nomasprime @peterdavidhamilton @martikat