Skip to content

Commit 3b9a326

Browse files
authored
Merge pull request #3358 from TechnologyEnhancedLearning/Develop/Fix/TD-6095-Self-assessment-Certificate-page-issue
TD-6095- Modified CSS to fix certificate view.
2 parents cfb2eb8 + 70b7d6f commit 3b9a326

File tree

2 files changed

+26
-28
lines changed

2 files changed

+26
-28
lines changed

DigitalLearningSolutions.Web/Styles/learningPortal/selfassessmentcertificate.scss

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,22 +99,22 @@
9999
width: 100%;
100100
}
101101

102-
.pg-2 {
102+
.certificate .pg-2 {
103103
background-color: white;
104104
width: 100%;
105105
position: relative;
106106
display: flex;
107107
flex-direction: column;
108-
width: 100%;
109108
max-width: 210mm;
110109
min-height: 297mm;
111110
margin: 0;
112111
position: relative;
113112
background: white;
114113
}
115114

116-
.pg-2 .body {
115+
.certificate .pg-2 .body {
117116
padding: 50px;
117+
flex: 1;
118118
}
119119

120120
.activity {
@@ -126,6 +126,7 @@
126126

127127
.activity p, ul {
128128
width: 100%;
129+
word-break: break-word;
129130
}
130131

131132
.activity ul {
@@ -157,12 +158,6 @@
157158
.certificate .pg-1 {
158159
width: 100%;
159160
}
160-
161-
162-
163-
.pg-2 {
164-
width: 100%;
165-
}
166161
}
167162

168163
.certificate h1 {
@@ -378,18 +373,21 @@
378373
.certificate .nhsuk-u-margin-bottom-2 {
379374
margin-bottom: 8px !important;
380375
}
381-
}
376+
}
377+
382378
@media screen and (max-width: 767px) {
383379
.certificate {
384-
width: 95%;
380+
width: 100%;
385381
justify-content: space-around;
386382
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
387383
-webkit-print-color-adjust: exact;
388384
}
385+
389386
.certificate .pg-1 {
390-
width: 95%;
387+
width: 100%;
391388
}
389+
392390
.pg-2 {
393-
width: 95%;
391+
width: 100%;
394392
}
395393
}

DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/CompetencySelfAssessmentCertificate.cshtml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
padding: 0 0;
1212
}
1313
14-
.nhsuk-width-container {
14+
.nhsuk-grid-row {
1515
margin: 0;
1616
}
1717
@@ -49,8 +49,8 @@
4949
{
5050
<li class="nhsuk-breadcrumb__item">
5151
<a class="nhsuk-breadcrumb__link trigger-loader " asp-controller="LearningPortal"
52-
asp-action="SelfAssessmentOverview" asp-route-vocabulary="@Model.VocabPlural"
53-
asp-route-selfAssessmentId="@Model.CompetencySelfAssessmentCertificates.SelfAssessmentID">
52+
asp-action="SelfAssessmentOverview" asp-route-vocabulary="@Model.VocabPlural"
53+
asp-route-selfAssessmentId="@Model.CompetencySelfAssessmentCertificates.SelfAssessmentID">
5454
&lt; Back
5555
</a>
5656
</li>
@@ -59,9 +59,9 @@
5959
{
6060
<li class="nhsuk-breadcrumb__item">
6161
<a class="nhsuk-breadcrumb__link trigger-loader" asp-controller="Supervisor"
62-
asp-action="ReviewDelegateSelfAssessment"
63-
asp-route-supervisorDelegateId="@Model.LoggedInSupervisorDelegateId"
64-
asp-route-candidateAssessmentId="@Model.CompetencySelfAssessmentCertificates.CandidateAssessmentID">
62+
asp-action="ReviewDelegateSelfAssessment"
63+
asp-route-supervisorDelegateId="@Model.LoggedInSupervisorDelegateId"
64+
asp-route-candidateAssessmentId="@Model.CompetencySelfAssessmentCertificates.CandidateAssessmentID">
6565
&lt; Back
6666
</a>
6767
</li>
@@ -76,15 +76,15 @@
7676
<h1>Certificate</h1>
7777

7878
<h2>@Model.CompetencySelfAssessmentCertificates.SelfAssessment - @Model.CompetencySelfAssessmentCertificates.LearnerName </h2>
79-
@if (Model.Vocabulary == "Proficiencies")
79+
@if (Model.Vocabulary == "Proficiencies")
8080
{
8181
<a class="nhsuk-button "
82-
asp-controller="LearningPortal"
83-
asp-route-candidateAssessmentId="@Model.CompetencySelfAssessmentCertificates.CandidateAssessmentID"
84-
asp-action="DownloadCertificate"
85-
role="button">
86-
Download certificate
87-
</a>
82+
asp-controller="LearningPortal"
83+
asp-route-candidateAssessmentId="@Model.CompetencySelfAssessmentCertificates.CandidateAssessmentID"
84+
asp-action="DownloadCertificate"
85+
role="button">
86+
Download certificate
87+
</a>
8888
}
8989
@if (Model.Vocabulary == "ProfileAssessment")
9090
{
@@ -99,9 +99,9 @@
9999
</div>
100100
<div class="certificate nhsuk-grid-column-full">
101101
<partial name="_SelfAssessmentCertificateFirstPage.cshtml" model=Model />
102-
<br /><br />
102+
<br />
103103
<partial name="_SelfAssessmentCertificateSecondPage.cshtml" model=Model />
104-
104+
105105
</div>
106106
</div>
107107
</div>

0 commit comments

Comments
 (0)