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-1010 Formatting and Behaviour issues related to 404 Not found page #780

Merged
merged 8 commits into from
Apr 29, 2024
Merged

ER-1010 Formatting and Behaviour issues related to 404 Not found page #780

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
917790c
Update font size for contents list when in mobile
martikat Apr 25, 2024
ec04608
Address bugs from QA
martikat Apr 25, 2024
ad1002a
Merge branch 'main' into ER-1010-bug-fixes
martikat Apr 25, 2024
33bd6a2
Update based on PR comments
martikat Apr 26, 2024
b16278a
Hardcode href in cookie notice
martikat Apr 26, 2024
3b57246
Merge branch 'main' into ER-1010-bug-fixes
martikat Apr 26, 2024
22ea5bb
Update format of text for preferences saved text
martikat Apr 26, 2024
084a783
Update logic for showing banner styling
martikat Apr 29, 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
6 changes: 6 additions & 0 deletions app/assets/stylesheets/page-contents.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@ The following was govspeak and custom kramdown for the list of page content anch
font-size: 16px;
}

@media (max-width: 40.0525em) {
.contents-on-page ul {
font-size: 14px;
}
}

.contents-on-page li {
padding-top: 10px;
line-height: 1.3;
Expand Down
6 changes: 5 additions & 1 deletion app/controllers/pages_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ def index
end

def show
render page.to_partial_path
if page.nil?
render 'errors/not_found'
else
render page.to_partial_path
end
end

private
Expand Down
2 changes: 1 addition & 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 @@ -5,7 +5,7 @@
= render partial: 'hero', locals: { hero: page.hero }

.govuk-grid-row
.govuk-grid-column-one-quarter.sticky.mob-section
martikat marked this conversation as resolved.
Show resolved Hide resolved
.govuk-grid-column-one-quarter.sticky.mob-section class='govuk-!-margin-bottom-4'
input#menu-icon-chk.menu-btn[type="checkbox" name="menu-icon" checked]
label.menu-icon.govuk-body-l[for="menu-icon-chk"]
svg[xmlns="http://www.w3.org/2000/svg" height="1em" viewbox="0 0 448 512"]
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,4 @@ en:
blank: Last name must not be blank
settings:
cookie_policy_legend: Do you want to accept analytics cookies?
preferences_saved_html: Your cookie settings were saved</br><a class='govuk-link' href='%{return_url}'>Go back to Help for early years providers</a>
martikat marked this conversation as resolved.
Show resolved Hide resolved
preferences_saved_html: Your cookie settings were saved. [Go back to Help for early years providers](%{return_url}).