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.

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-758] main hero layout #826

Merged
merged 32 commits into from
Oct 6, 2023
Merged

[ER-758] main hero layout #826

merged 32 commits into from
Oct 6, 2023

Conversation

ebrett
Copy link
Contributor

@ebrett ebrett commented Sep 11, 2023

A rework of #784 with two layouts, rather than a single layout.

  • application.html.slim - standard, no hero
  • main_hero.html.slim - includes hero

From the lucid board the majority of pages will have hero sections, so as we work on future design changes, it might be best to make the hero included layout the default.

Also:

ER-759 Two small changes for module overview

  • Add colour to module progress
  • Add number of pages to the section heading; the last section does not show number of pages. Moving the certificate to own section is handled by updates in contentful, therefore no code changes beyond the page numbers exception for the last section.

@viezly
Copy link

viezly bot commented Sep 11, 2023

This pull request is split into 8 parts for easier review.
👀 Review pull request on Viezly

Changed files are located in these folders:

  • /
  • app
  • app/assets
  • app/controllers
  • app/decorators
  • app/views
  • config
  • spec/lib
  • spec/system

@ebrett ebrett changed the base branch from main to ER-738-training-site-design September 11, 2023 13:29
@ebrett ebrett marked this pull request as ready for review September 11, 2023 13:38
@github-actions github-actions bot added the frontend Changes to assets detected label Sep 11, 2023
@ebrett ebrett added this to the branding milestone Sep 11, 2023
@ebrett ebrett mentioned this pull request Sep 11, 2023
@jack-coggin jack-coggin added the deployed Review app deployed for testing label Sep 20, 2023
@jack-coggin jack-coggin temporarily deployed to content September 20, 2023 13:22 — with GitHub Actions Inactive
@github-actions
Copy link

github-actions bot commented Sep 20, 2023

@jack-coggin jack-coggin temporarily deployed to development October 3, 2023 16:42 — with GitHub Actions Inactive
@jack-coggin jack-coggin temporarily deployed to content October 3, 2023 16:42 — with GitHub Actions Inactive
@github-actions github-actions bot removed documentation Improvements or additions to documentation content Course and page content changes pipeline Github workflow changes labels Oct 3, 2023
@peterdavidhamilton
Copy link
Contributor

@peterdavidhamilton
Copy link
Contributor

peterdavidhamilton commented Oct 4, 2023

Going to resolve #708 in here

- Remove unused styling
- Tidy up
- Tweaks to meet latest ACs
@peterdavidhamilton peterdavidhamilton temporarily deployed to content October 4, 2023 13:03 — with GitHub Actions Inactive
@peterdavidhamilton peterdavidhamilton temporarily deployed to development October 4, 2023 13:03 — with GitHub Actions Inactive
@github-actions github-actions bot removed the terraform Changes to Terraform detected label Oct 4, 2023
@peterdavidhamilton peterdavidhamilton temporarily deployed to content October 6, 2023 08:55 — with GitHub Actions Inactive
@peterdavidhamilton peterdavidhamilton temporarily deployed to development October 6, 2023 08:55 — with GitHub Actions Inactive
@peterdavidhamilton peterdavidhamilton merged commit 4c2684e into main Oct 6, 2023
3 of 4 checks passed
@peterdavidhamilton peterdavidhamilton temporarily deployed to development October 6, 2023 09:11 — with GitHub Actions Inactive
@peterdavidhamilton peterdavidhamilton deleted the ER-758-main-hero-layout branch October 6, 2023 09:11
peterdavidhamilton added a commit that referenced this pull request Oct 9, 2023
* Add dfe header

* Adjustments for header in preparation for adding hero section

* Main hero layout proof of concept

* Module overview updates
- Add colour to module progress
- Add pages to section heading

* styling adjustments for dfe-frontend integration

* update yarn.lock

* revert changes to dfe frontend version

* remove path shown in header

* revert dockerfile changes

* upgrade dfe frontend

* change dev cms env to staging

* revert cms env change

* decrease disk quota

* - Positional section progress bar
- Additional section for certificate in overview
- Page styling and pagination changes

* Revert "styling adjustments for dfe-frontend integration"

This reverts commit f954fd0.

* Revert "decrease disk quota"

This reverts commit 23146fe.

* Revert "Revert "styling adjustments for dfe-frontend integration""

This reverts commit 07f794b.

* fix module content view and training text page

* reduce disk quota

* Change (now redundant following move to Azure) review app envs

* Improve in app debugging for module authors

* lint

* docs

* merge with header

* - Fix test suite
- Remove unused styling
- Tidy up
- Tweaks to meet latest ACs

* Add missing hero to question response validations

---------

Co-authored-by: jack.coggin <[email protected]>
Co-authored-by: Peter David Hamilton <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployed Review app deployed for testing frontend Changes to assets detected
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants