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

[NFDIV-4331] Add mobile styles for hub progress bar #3904

Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
fa031ae
NFDIV-4196: Update hub page, update layout of progess bar
FaisalMoJ Aug 27, 2024
290e195
NFDIV-4196: Fix unit test
FaisalMoJ Aug 27, 2024
8488751
NFDIV-4196: Resolve PR comments
FaisalMoJ Sep 2, 2024
b021b60
Update src/main/assets/scss/main.scss
FaisalMoJ Sep 2, 2024
70d8b3b
Update src/main/assets/scss/main.scss
FaisalMoJ Sep 2, 2024
e9d2b60
Update src/main/steps/common/hmcts-progress-bar/_progress-bar.scss
FaisalMoJ Sep 2, 2024
b9a2e68
Update src/main/assets/scss/main.scss
FaisalMoJ Sep 2, 2024
a579f1e
Update src/main/assets/scss/main.scss
FaisalMoJ Sep 3, 2024
4588230
Update src/main/steps/applicant1/hub-page/template.njk
FaisalMoJ Sep 3, 2024
53158ca
Update src/main/assets/scss/main.scss
FaisalMoJ Sep 3, 2024
73632b8
NFDIV-4196: Repalce root url with a constant
FaisalMoJ Sep 3, 2024
754619c
NFDIV-4196: Update text on submitted page
FaisalMoJ Sep 10, 2024
c48790f
Merge branch 'master' into NFDIV-4196
FaisalMoJ Sep 10, 2024
fbb268d
NFDIV-4196: Update feedback text for Welsh
FaisalMoJ Sep 10, 2024
616733c
Merge branch 'master' into NFDIV-4196
FaisalMoJ Sep 19, 2024
88d137c
Merge branch 'master' into NFDIV-4196
FaisalMoJ Sep 24, 2024
4adf125
NFDIV-4201: Add application saved hub page, update submitted page (#3…
FaisalMoJ Sep 24, 2024
b9b84cf
Merge branch 'NFDIV-4177-pre-request-information-feature' into NFDIV-…
FaisalMoJ Sep 25, 2024
9728b50
fix(deps): update dependency @types/node to v20.16.8 (#3897)
renovate[bot] Sep 25, 2024
606bbda
fix(deps): update dependency @types/node to v20.16.9 (#3899)
renovate[bot] Sep 26, 2024
16ee9fa
chore(deps): update dependency webpack to v5.95.0 (#3900)
renovate[bot] Sep 26, 2024
0359c08
chore(deps): update webdriverio monorepo to v9.1.1 (#3901)
renovate[bot] Sep 26, 2024
006c1c1
Add mobile styles for progress bar and refactor deskptop styles
adamg-hmcts Sep 26, 2024
c0ef42d
Merge request for info base branch and resolve conflicts
adamg-hmcts Sep 26, 2024
c5a32a4
Resolve missed conflict in template selector
adamg-hmcts Sep 26, 2024
1bf219a
Remove import that was added by mistake
adamg-hmcts Sep 26, 2024
ebfb647
Delete CSS that is no longer in use
adamg-hmcts Sep 26, 2024
583eac7
fix(deps): update dependency @types/node to v20.16.10 (#3906)
renovate[bot] Sep 30, 2024
f626669
chore(deps): update webdriverio monorepo to v9.1.2 (#3905)
renovate[bot] Sep 30, 2024
493cf93
fix(deps): update dependency helmet to v7.2.0 (#3907)
renovate[bot] Sep 30, 2024
bb2a135
fix(deps): update dependency helmet to v8 (#3908)
renovate[bot] Sep 30, 2024
bdf0b36
chore(deps): update dependency hashicorp/terraform to v1.9.7 (#3913)
renovate[bot] Oct 3, 2024
a2dece7
chore(deps): update dependency node to v20.18.0 (#3915)
renovate[bot] Oct 4, 2024
d91e5e8
fix(deps): update dependency @types/lodash to v4.17.10 (#3914)
renovate[bot] Oct 4, 2024
2f75d71
[NFDIV-4314] Use payment service requests created by case-api (Part 1…
adamg-hmcts Oct 4, 2024
7720e16
Update README.md (#3917)
adamg-hmcts Oct 4, 2024
cfc3e76
[NFDIV-4411] Remove vulnerable version of cookie dependency (#3921)
adamg-hmcts Oct 9, 2024
788b661
chore(deps): update webdriverio monorepo to v9.1.3 (#3920)
renovate[bot] Oct 9, 2024
27387e2
fix(deps): update dependency @types/node to v20.16.11 (#3919)
renovate[bot] Oct 9, 2024
c62ea60
fix(deps): update dependency pdfjs-dist to v4.7.76 (#3918)
renovate[bot] Oct 9, 2024
65a1d72
chore(deps): update webdriverio monorepo to v9.1.4 (#3923)
renovate[bot] Oct 10, 2024
c8c71a2
fix(deps): update dependency cookie-parser to v1.4.7 (#3924)
renovate[bot] Oct 10, 2024
4fe1ae6
fix(deps): update dependency form-data to v4.0.1 (#3926)
renovate[bot] Oct 10, 2024
66b2517
fix(deps): update dependency express to v4.21.1 (#3925)
renovate[bot] Oct 10, 2024
4c558cf
fix(deps): update dependency typescript to v5.6.3 (#3927)
renovate[bot] Oct 10, 2024
e9018c7
chore(deps): update dependency @playwright/test to v1.48.0 (#3928)
renovate[bot] Oct 10, 2024
b9db60a
chore(deps): update webdriverio monorepo to v9.1.5 (#3929)
renovate[bot] Oct 11, 2024
a16304b
fix(deps): update dependency govuk-frontend to v5.7.0 (#3930)
renovate[bot] Oct 11, 2024
ea6bc90
chore(deps): update dependency cookie to v1 (#3931)
renovate[bot] Oct 11, 2024
f294fb7
chore(deps): update dependency cookie to v1.0.1 (#3933)
renovate[bot] Oct 14, 2024
eef5858
chore(deps): update webdriverio monorepo to v9.2.1 (#3936)
renovate[bot] Oct 14, 2024
d887a5b
fix(deps): update dependency govuk-frontend to v5.7.1 (#3934)
renovate[bot] Oct 14, 2024
60cee84
[NFDIV-4314] Use payment service requests created by case-api (Part 2…
adamg-hmcts Oct 14, 2024
47c1201
NFDIV-4299: Add fortify scans to nightly pipeline (#3935)
FaisalMoJ Oct 14, 2024
1507320
NFDIV-4299: Temporary disable fortify scan to fix issues (#3939)
FaisalMoJ Oct 15, 2024
90710ca
NFDIV-4358: Update bailiff service url (#3922)
FaisalMoJ Oct 16, 2024
1bc8b9f
chore(deps): update dependency @playwright/test to v1.48.1 (#3940)
renovate[bot] Oct 17, 2024
601f6c8
chore(deps): update dependency hashicorp/terraform to v1.9.8 (#3941)
renovate[bot] Oct 17, 2024
0f66fe9
fix(deps): update dependency @types/node to v20.16.12 (#3942)
renovate[bot] Oct 17, 2024
8553a27
chore(deps): update dependency npm-run-all2 to v6.2.4 (#3946)
renovate[bot] Oct 18, 2024
d4a4b92
NFDIV-4438 Update text temporarily for webchat agents busy (#3943)
pallavijustice Oct 18, 2024
223b018
Revert "NFDIV-4438 Update text temporarily for webchat agents busy (#…
DelythJustice Oct 18, 2024
af45e46
chore(deps): update dependency html-webpack-plugin to v5.6.2 (#3945)
renovate[bot] Oct 18, 2024
bb4571e
fix(deps): update dependency @types/lodash to v4.17.12 (#3950)
renovate[bot] Oct 21, 2024
4ab13f7
chore(deps): update yarn to v3.8.6 (#3949)
renovate[bot] Oct 21, 2024
f99afdc
fix(deps): update dependency @types/node to v20.16.13 (#3951)
renovate[bot] Oct 21, 2024
8de0ac0
fix(deps): update dependency negotiator to v0.6.4 (#3952)
renovate[bot] Oct 21, 2024
1d1af22
fix(deps): update dependency negotiator to v1 (#3953)
renovate[bot] Oct 21, 2024
8d9f39b
NFDIV-4350: Update read me file (#3948)
FaisalMoJ Oct 21, 2024
3845c68
fix(deps): update dependency @types/node to v20.16.14 (#3955)
renovate[bot] Oct 22, 2024
5baf59b
Merge branch 'master' into nfdiv-4331-add-mobile-styles-for-hub-progr…
adamg-hmcts Oct 22, 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
50 changes: 1 addition & 49 deletions src/main/assets/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@import './webchat';
@import './review-pages';
@import './timeout-modal';
@import './progress-bar';

.hmcts-button-link,
.uppy-FileInput-btn {
Expand Down Expand Up @@ -45,55 +46,6 @@ section {
color: govuk-colour('red');
}

.hmcts-progress-bar__icon {
position: relative;
background-color: govuk-colour('white');
border: 4px solid govuk-colour('mid-grey');
border-radius: 50%;
box-sizing: border-box;
display: block;
height: 44px;
margin-left: auto;
margin-right: auto;
width: 44px; }

.hmcts-progress-bar__icon--complete {
background-color: govuk-colour('blue');
border: 4px solid govuk-colour('blue');
background-image: url(/hmcts-assets/images/icon-progress-tick.svg);
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: 23px;
}

.hmcts-progress-bar__list {
font-size: 0;
list-style: none;
margin: 0;
padding: 0;
position: relative;
text-align: justify;
vertical-align: top; }

.hmcts-progress-bar__list::after {
content: "";
display: inline-block;
width: 100%; }

.hmcts-progress-bar__list::before {
border-top: 4px solid govuk-colour('mid-grey');
content: "";
left: 30px;
position: absolute;
top: 20px;
bottom: 0;
width: 90%; }

.hmcts-progress-bar__icon--active {
background-color: govuk-colour('blue');
border: 4px solid govuk-colour('blue');
font-weight: 700; }

.govuk-panel--confirmation {
background-color: #00703C; }

Expand Down
150 changes: 150 additions & 0 deletions src/main/assets/scss/progress-bar.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
.hmcts-progress-bar-vertical {
margin: 40px 0;
}

.hmcts-progress-bar__icon {
position: relative;
background-color: govuk-colour('white');
border: 4px solid govuk-colour('mid-grey');
border-radius: 50%;
box-sizing: border-box;
display: block;
height: 44px;
margin-bottom: auto auto govuk-spacing(7);
width: 44px;

&--complete {
background-color: govuk-colour('blue');
border: 4px solid govuk-colour('blue');
background-image: url('/hmcts-assets/images/icon-progress-tick.svg');
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: 23px;

@include govuk-if-ie8 {
background-image: url(#{$hmcts-images-path}icon-progress-tick.png);
}
}

&--active {
background-color: govuk-colour('blue');
border: 4px solid govuk-colour('blue');
font-weight: 700;
}
}

.hmcts-progress-bar__label {
@include govuk-font(16);
word-wrap: normal;
display: block;
font-weight: inherit;
margin-top: 10px;
position: relative;
}

.hmcts-progress-bar__list {
font-size: 0;
list-style: none;
margin: 0;
padding: 0;
position: relative;
text-align: justify;
vertical-align: top;

@include govuk-if-ie8 {
display: table;
table-layout: fixed;
width: 100%;
}

&::after {
content: "";
display: inline-block;
width: 100%;
}

&::before {
border-top: 4px solid govuk-colour('mid-grey');
content: "";
left: 30px;
position: absolute;
top: 20px;
bottom: 0;
width: 90%;
}
}

.hmcts-progress-bar__list-item {
@include govuk-font(19);
display: inline-block;
max-width: 20%;
position: relative;
text-align: center;
vertical-align: top;
width:100px;

// IE8 does not support the text justify approach for spacing
@include govuk-if-ie8 {
display: table-cell;
}

&:first-child, &:last-child {
&::before {
border-top: 6px solid govuk-colour("white");
content: "";
position: absolute;
top: 13px; left: 0;
width: 50%;
}
}

&:first-child::before {
left: 0;
}

&:last-child::before {
left: auto;
right: 0;
}
}

@media screen and (max-width: map-get($govuk-breakpoints, desktop)) {
.hmcts-progress-bar-vertical {
margin: 21px 0;

.hmcts-progress-bar {
&__list-item {
max-width:45px; display:block; margin-top: 10px;
margin-top: 19px;
}

&__icon {
height: 37px;
width: 37px;

&--complete {
background-size: 19px;
}
}

&__list::before {
border-top:none;
position:absolute;
top: 0px;
border-left: 6px solid govuk-colour('mid-grey');
height: 100%;
position:absolute;
left:20px;
top:0;
}

&__label {
margin-top:-29px;
margin-left:50px;
width:350px;
text-align:left;
font-size: 1.1rem;
}
}
}
}
1 change: 0 additions & 1 deletion src/main/steps/applicant1/hub-page/template.njk
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
</div>

<hr class="govuk-section-break govuk-section-break--l govuk-section-break--additional">
<div class="govuk-!-padding-bottom-8"></div>

{% include "../../common/progress-bar.njk" %}

Expand Down
138 changes: 0 additions & 138 deletions src/main/steps/common/hmcts-progress-bar/_progress-bar.scss

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/steps/common/hmcts-progress-bar/template.njk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="hmcts-progress-bar {{- ' ' + params.classes if params.classes}}">
<div class="hmcts-progress-bar-vertical {{- ' ' + params.classes if params.classes}}">
<ol class="hmcts-progress-bar__list">
{% for item in params.items %}
<li class="hmcts-progress-bar__list-item" {{ 'aria-current="step"' | safe if item.active }}>
Expand Down