Skip to content

Commit

Permalink
Merge branch 'develop' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
james-hollinger committed Jul 13, 2024
2 parents 4268327 + b233ec0 commit cad7aa7
Show file tree
Hide file tree
Showing 42 changed files with 798 additions and 377 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@

.content-header h1 {
font-size: 40px;
line-height: 1.1;
}

.breadcrumb {
Expand Down Expand Up @@ -208,6 +209,7 @@

.content-header h1 {
font-size: 40px;
line-height: 1.1;
}

.content-header {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container-box container" uiPidpInjectViewportCss>
<div class="content-box">
<header>
<h2>BC Provider account information</h2>
<h1>BC Provider account information</h1>
</header>
<div class="content">
<h3>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@ ol {
.viewport-all {
& header {
margin: var(--header-margin);
& h2 {
margin: 0;
padding: calc(var(--gap) / 2) calc(var(--gap) * 2);
background-color: pidp.$grey-10;
& h1 {
color: #036;
font-size: 3.125rem;
font-weight: 700;
margin-bottom: 0;
}
}
& .content {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container-box container" uiPidpInjectViewportCss>
<div class="content-box">
<header>
<h2>BC Provider Account Information</h2>
<h1>BC Provider Account Information</h1>
</header>
<div class="content">
<section class="error-card" [class.show-card]="showErrorCard">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,11 @@
.viewport-all {
& header {
margin: var(--header-margin);
& h2 {
margin: 0;
padding: calc(var(--gap) / 2) calc(var(--gap) * 2);
background-color: pidp.$grey-10;
& h1 {
color: #036;
font-size: 3.125rem;
font-weight: 700;
margin-bottom: 0;
}
}
& .content {
Expand Down Expand Up @@ -275,3 +276,13 @@
}
}
}

.viewport-small,
.viewport-xsmall {
& header {
& h1 {
font-size: 40px;
line-height: 1.1;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="box container" uiPidpInjectViewportCss>
<header>
<h2 class="title">Enrolment</h2>
<h1 class="title">Enrolment</h1>
</header>

<div class="content">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,14 @@ span {
.viewport-all {
&.box {
padding: var(--header-padding) 0 var(--header-padding) var(--header-padding);
h1 {
color: #036;
font-size: 3.125rem;
font-weight: 700;
margin-bottom: 0;
}
& .title {
background-color: pidp.$bcgov-color-background-grey;
padding: 9px 24px;
padding: 1rem 0;
}
}
& .content {
Expand Down Expand Up @@ -109,3 +114,13 @@ span {
padding-left: 0;
}
}

.viewport-small,
.viewport-xsmall {
& header {
& h1 {
font-size: 40px;
line-height: 1.1;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="container">
<div class="container" uiPidpInjectViewportCss>
<ui-page mode="full" [form]="formState.form" (submitted)="onSubmit()">
<ui-page-header>{{ title }}</ui-page-header>
<h1>{{ title }}</h1>

<ng-container *ngIf="completed; else notCompleted">
<ui-page-section>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
.viewport-all {
padding: 1.25rem 0.75rem;

h1 {
color: #036;
font-size: 3.125rem;
font-weight: 700;
margin-bottom: 0;
padding: 2rem 0;
}
}

.viewport-small,
.viewport-xsmall {
h1 {
font-size: 40px;
line-height: 1.1;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
AlertComponent,
AlertContentDirective,
AnchorDirective,
InjectViewportCssClassDirective,
PageComponent,
PageFooterActionDirective,
PageFooterComponent,
Expand Down Expand Up @@ -58,6 +59,7 @@ import {
AlertComponent,
AlertContentDirective,
AnchorDirective,
InjectViewportCssClassDirective,
MatButtonModule,
MatFormFieldModule,
MatInputModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="container">
<div class="container" uiPidpInjectViewportCss>
<ui-page mode="full">
<ui-page-header>{{ title }}</ui-page-header>
<h1>{{ title }}</h1>

<ui-alert
*ngIf="accessRequestFailed"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
.viewport-all {
padding: 1.25rem 0.75rem;

h1 {
color: #036;
font-size: 3.125rem;
font-weight: 700;
margin-bottom: 0;
padding: 2rem 0;
}
}
.viewport-small,
.viewport-xsmall {
h1 {
font-size: 40px;
line-height: 1.1;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
AlertComponent,
AlertContentDirective,
AnchorDirective,
InjectViewportCssClassDirective,
PageComponent,
PageFooterActionDirective,
PageFooterComponent,
Expand Down Expand Up @@ -42,6 +43,7 @@ import {
AlertContentDirective,
AnchorDirective,
EnrolmentErrorComponent,
InjectViewportCssClassDirective,
MatButtonModule,
NgIf,
PageComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<app-enrolment-error *ngIf="enrolmentError"></app-enrolment-error>
<ng-container *ngIf="completed; else notCompleted">
<header>
<h2 class="title">Thank you for enrolling for MS Teams access.</h2>
<h1 class="title">Thank you for enrolling for MS Teams access.</h1>
</header>
<section class="completed">
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@

.viewport-all {
& header {
& h2 {
margin: 0;
padding: calc(var(--gap) / 2) calc(var(--gap));
background-color: pidp.$grey-10;
& h1 {
color: #036;
font-size: 3.125rem;
font-weight: 700;
margin-bottom: 0;
padding: 2rem 0;
}
}
& .content {
Expand Down Expand Up @@ -106,3 +108,13 @@
}
}
}

.viewport-small,
.viewport-xsmall {
& header {
& h1 {
font-size: 40px;
line-height: 1.1;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h3>Endorsement</h3>
</ng-container>
<ng-template #notCompleted>
<header>
<h2 class="title">Welcome to your MS Teams enrolment application.</h2>
<h1>Welcome to your MS Teams enrolment application.</h1>
</header>
<ng-container [ngSwitch]="currentPage">
<ng-container *ngSwitchCase="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@
.viewport-all {
&.box {
padding: var(--header-padding) 0 var(--header-padding) var(--header-padding);
& .title {
background-color: pidp.$bcgov-color-background-grey;
padding: 9px 24px;
h1 {
color: #036;
font-size: 3.125rem;
font-weight: 700;
margin-bottom: 0;
}
}
& header {
Expand Down Expand Up @@ -146,3 +148,23 @@
}
}
}

.viewport-large,
.viewport-medium,
.viewport-small,
.viewport-xsmall {
& header {
& h1 {
line-height: 1.1;
}
}
}

.viewport-small,
.viewport-xsmall {
& header {
& h1 {
font-size: 40px;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div class="container" uiPidpInjectViewportCss>
<ui-page mode="full">
<ui-page-header>{{ title }}</ui-page-header>
<h1>{{ title }}</h1>

<ui-alert
*ngIf="accessRequestFailed"
Expand Down Expand Up @@ -82,3 +83,4 @@
</button>
</ui-page-footer>
</ui-page>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
.viewport-all {
padding: 1.25rem 0.75rem;
h1 {
color: #036;
font-size: 3.125rem;
font-weight: 700;
margin-bottom: 0;
padding: 2rem 0;
}
}

.viewport-small,
.viewport-xsmall {
h1 {
font-size: 40px;
line-height: 1.1;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
AlertComponent,
AlertContentDirective,
AnchorDirective,
InjectViewportCssClassDirective,
PageComponent,
PageFooterActionDirective,
PageFooterComponent,
Expand Down Expand Up @@ -38,6 +39,7 @@ import { ProviderReportingPortalResource } from './provider-reporting-portal-res
AlertContentDirective,
AnchorDirective,
EnrolmentErrorComponent,
InjectViewportCssClassDirective,
MatButtonModule,
NgIf,
PageComponent,
Expand Down
Loading

0 comments on commit cad7aa7

Please sign in to comment.