-
Notifications
You must be signed in to change notification settings - Fork 5
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
Map 178 uof new header and footer #646
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
25727e0
MAP-178 implement new DPS header and footers
GurnankCheema 7f9dacb
MAP-178 remove get help (/get-help) page as new footer has phone numb…
GurnankCheema 5c0097e
MAP-178 remove remaining remnants of feedback banner
GurnankCheema ecb5b10
MAP-178 fix dps link in fallback header and css
GurnankCheema b4f2b27
Map-178 lint fix
GurnankCheema File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| .govuk-footer { | ||
| min-height: 160px; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| .hmpps-header { | ||
| @include govuk-responsive-padding(3, 'top'); | ||
| @include govuk-responsive-padding(3, 'bottom'); | ||
| background-color: govuk-colour('black'); | ||
| color: govuk-colour('white'); | ||
|
|
||
| &__container { | ||
| @include govuk-width-container; | ||
| display: flex; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| } | ||
|
|
||
| &__logo { | ||
| @include govuk-responsive-margin(2, 'right'); | ||
| position: relative; | ||
| top: -2px; | ||
| fill: govuk-colour('white'); | ||
| } | ||
|
|
||
| &__title { | ||
| @include govuk-responsive-padding(3, 'right'); | ||
| display: flex; | ||
| align-items: center; | ||
|
|
||
| &__organisation-name { | ||
| @include govuk-responsive-margin(2, 'right'); | ||
| @include govuk-font($size: 24, $weight: 'bold'); | ||
| display: flex; | ||
| align-items: center; | ||
| } | ||
|
|
||
| &__service-name { | ||
| @include govuk-responsive-margin(2, 'right'); | ||
| @include govuk-font(24); | ||
| display: none; | ||
|
|
||
| @include govuk-media-query($from: desktop) { | ||
| display: flex; | ||
| align-items: center; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| &__link { | ||
| @include govuk-link-common; | ||
| @include govuk-link-style-default; | ||
|
|
||
| text-underline-offset: 0.1em; | ||
|
|
||
| &:link, | ||
| &:visited, | ||
| &:active { | ||
| color: govuk-colour('white'); | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| &:hover { | ||
| text-decoration: underline; | ||
| } | ||
|
|
||
| &:focus { | ||
| color: govuk-colour('black'); | ||
|
|
||
| svg { | ||
| fill: govuk-colour('black'); | ||
| } | ||
| } | ||
|
|
||
| &__sub-text { | ||
| @include govuk-font(16); | ||
| display: none; | ||
|
|
||
| @include govuk-media-query($from: tablet) { | ||
| display: block; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| &__navigation { | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: flex-end; | ||
| list-style: none; | ||
| margin: 0; | ||
| padding: 0; | ||
|
|
||
| @include govuk-media-query($from: tablet) { | ||
| flex-direction: row; | ||
| align-items: center; | ||
| } | ||
|
|
||
| &__item { | ||
| @include govuk-font(19); | ||
| margin-bottom: govuk-spacing(1); | ||
| text-align: right; | ||
|
|
||
| @include govuk-media-query($from: tablet) { | ||
| @include govuk-responsive-margin(4, 'right'); | ||
| @include govuk-responsive-padding(4, 'right'); | ||
| margin-bottom: 0; | ||
| border-right: 1px solid govuk-colour('white'); | ||
| } | ||
|
|
||
| a { | ||
| display: inline-block; | ||
| } | ||
|
|
||
| &:last-child { | ||
| margin-right: 0; | ||
| border-right: 0; | ||
| padding-right: 0; | ||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
||
| @media print { | ||
| display: none; | ||
| } | ||
| } | ||
|
|
||
| .govuk-phase-banner { | ||
| @include govuk-width-container; | ||
| border: none; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| const { offender } = require('../mockApis/data') | ||
| const ReportUseOfForcePage = require('../pages/createReport/reportUseOfForcePage') | ||
|
|
||
| context('Report use of force page', () => { | ||
| beforeEach(() => { | ||
| cy.task('reset') | ||
| cy.task('stubLogin', { firstName: 'James', lastName: 'Stuart' }) | ||
| cy.task('stubOffenderDetails', offender) | ||
| }) | ||
|
|
||
| it('New components should exist', () => { | ||
| cy.task('stubComponents') | ||
| cy.login() | ||
|
|
||
| const page = ReportUseOfForcePage.visit(offender.bookingId) | ||
| page.commonComponentsHeader().should('exist') | ||
| page.commonComponentsFooter().should('exist') | ||
| }) | ||
|
|
||
| it('New components should not exist', () => { | ||
| cy.task('stubComponentsFail') | ||
| cy.login() | ||
|
|
||
| const page = ReportUseOfForcePage.visit(offender.bookingId) | ||
| page.commonComponentsHeader().should('not.exist') | ||
| page.commonComponentsFooter().should('not.exist') | ||
| page.fallbackHeaderUserName().contains('J. Stuart') | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
needs wider container width in Use of force incidents page
used 1170px instead of 1150px previously used so it's same as new header width