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

[FSADT1-1058] BCSC form breakpoints #676

Merged
merged 8 commits into from
Dec 14, 2023
Merged

[FSADT1-1058] BCSC form breakpoints #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d35bab9
fix: fix width of read-only cards
fterra-encora Dec 12, 2023
e38d6b0
fix: adjust inline notification style
fterra-encora Dec 12, 2023
1764908
fix: tweek notification and confirmation
fterra-encora Dec 12, 2023
5d3c725
fix: adjust read-only cards breakpoints
fterra-encora Dec 12, 2023
bd876f8
fix: adjust modal and button breakpoints
fterra-encora Dec 12, 2023
46cbbd3
fix: adjust modal width
fterra-encora Dec 13, 2023
2ed1efe
fix(sec): fixing possible security hotspot
paulushcgcj Dec 14, 2023
01f168b
Merge branch 'main' into feat/FSADT1-1058
paulushcgcj Dec 14, 2023
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
31 changes: 23 additions & 8 deletions frontend/src/assets/styles/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,21 @@ cds-progress-step.step-inactive::part(cds--progress-optional) {
color: #939395;
}

cds-inline-notification {
min-width: 7.6875rem;
}

cds-inline-notification::part(div),
cds-inline-notification,
.cds--inline-notification {
max-width: 100%;
border-radius: 0.25rem;
}

cds-inline-notification::part(cds--inline-notification__details) {
margin-right: 1rem;
}

cds-actionable-notification::part(div),
cds-actionable-notification,
.cds--actionable-notification {
Expand Down Expand Up @@ -687,6 +695,7 @@ div#app {
border: 1px solid var(--light-theme-border-border-subtle-00, #dfdfe1);
background: #fff;
max-width: 50.4375rem;
box-sizing: border-box;
}

.divider {
Expand Down Expand Up @@ -959,6 +968,7 @@ div#app {
}

cds-modal::part(dialog) {
width: 40rem;
border-radius: 0.5rem;
}

Expand Down Expand Up @@ -1242,7 +1252,8 @@ cds-header-panel[expanded] {
}

cds-modal::part(dialog) {
max-height: 20.5rem;
width: 100%;
height: auto;
margin-bottom: 0;
margin-top: auto;
position: relative;
Expand All @@ -1255,6 +1266,7 @@ cds-header-panel[expanded] {
}

cds-modal-footer {
height: auto;
display: flex;
padding: 0rem 1rem 1rem 1rem;
flex-direction: column;
Expand All @@ -1263,8 +1275,8 @@ cds-header-panel[expanded] {
align-self: stretch;
}

cds-modal#reject-modal::part(dialog) {
max-height: 37rem;
cds-modal-footer-button::part(button) {
padding-bottom: 1rem;
}

cds-modal#reject-modal cds-modal-body.grouping-12,
Expand Down Expand Up @@ -1331,6 +1343,10 @@ cds-header-panel[expanded] {
margin-top: 2rem;
}

.screen cds-button {
width: 100%;
}

.frame-03 {
flex-direction: column-reverse;
align-items: flex-start;
Expand Down Expand Up @@ -1400,6 +1416,10 @@ cds-header-panel[expanded] {
cds-table {
width: 82rem;
}

.card {
padding: 1.5rem;
}
}

/* Medium (from 672px to 1055px) */
Expand Down Expand Up @@ -1457,11 +1477,6 @@ cds-header-panel[expanded] {
.grouping-10 .grouping-11:first-child{
width: 40%;
}

cds-modal#reject-modal::part(dialog),
cds-modal#approve-modal::part(dialog) {
width: 95%;
}

cds-modal#reject-modal cds-modal-body.grouping-12,
cds-modal#approve-modal cds-modal-body {
Expand Down
25 changes: 12 additions & 13 deletions frontend/src/pages/FormBCSCPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,14 +357,14 @@ watch([error], () => {
title="">
<p class="cds--inline-notification-content">
<strong>Read-only: </strong>
If something is incorrect visit
If something is incorrect
<a
href=""
target="_blank"
rel="noopener noreferrer"
@click.prevent="changePersonalInfoModalActive = true"
>Change your personal information
</a>
>change your personal information</a
>
and then restart your application.
</p>
</cds-inline-notification>
Expand Down Expand Up @@ -472,7 +472,7 @@ watch([error], () => {
</cds-button>

<cds-modal
id="help-modal"
id="address-change-bc-modal"
size="md"
:open="changePersonalInfoModalActive"
@cds-modal-closed="changePersonalInfoModalActive = false"
Expand All @@ -485,17 +485,16 @@ watch([error], () => {
</cds-modal-header>
<cds-modal-body>
<p>
Visit
<a
Visit
<a
href='https://www2.gov.bc.ca/gov/content/governments/government-id/bc-services-card/your-card/change-personal-information'
target="_blank">Change your personal information
</a>
target="_blank"
rel="noopener noreferrer"
>Change your personal information</a
>
to update your name, address or date of birth.<br /><br />
Go to your
<a
href='https://id.gov.bc.ca/account/'
target="_blank">BC Services account
</a>
Go to your
<a href="https://id.gov.bc.ca/account/" target="_blank" rel="noopener noreferrer">BC Services account</a>
to update your email address.<br /><br />
You can then log back into this application using your BC Services Card.
</p>
Expand Down
Loading