diff --git a/src/app/dars/audit/audit.component.html b/src/app/dars/audit/audit.component.html index a8d3644672a4f78f30673f17c22dc1de6796a5bd..adae643a0ecdd3c9d1bde44b4462b4fffa222ad1 100644 --- a/src/app/dars/audit/audit.component.html +++ b/src/app/dars/audit/audit.component.html @@ -6,6 +6,13 @@ <span *ngFor="let line of audit.errorText">{{ line }}</span> </div> </div> + <h1 class="text-align-center"> + {{audit.header.clientDefinedMessage}} + <br /> + {{audit.header.degreeProgramTitle1}} + <br /> + {{audit.header.degreeProgramTitle2}} + </h1> <div class="audit-metadata"> <div> <p>{{audit.header.preparedLabel}}: {{audit.header.preparedDate}}</p> @@ -21,15 +28,6 @@ </p> </div> </div> - - <h1 class="text-align-center"> - {{audit.header.clientDefinedMessage}} - <br /> - {{audit.header.degreeProgramTitle1}} - <br /> - {{audit.header.degreeProgramTitle2}} - </h1> - </header> <section class="audit-section" class="audit-top-section"> diff --git a/src/app/dars/metadata-table/metadata-table.component.scss b/src/app/dars/metadata-table/metadata-table.component.scss index af40b10f2bdf7bc8850e7fa144dee42a0c155dac..d8c4a94d8204f8da3627ab8258e709ffbc8c0253 100644 --- a/src/app/dars/metadata-table/metadata-table.component.scss +++ b/src/app/dars/metadata-table/metadata-table.component.scss @@ -24,7 +24,7 @@ $black: #000000; display: block; box-sizing: border-box; width: 100%; - color: #7d7a7a; + color: #494949; text-align-last: left; > div { diff --git a/src/app/dars/new-degree-audit-dialog/new-degree-audit-dialog.component.html b/src/app/dars/new-degree-audit-dialog/new-degree-audit-dialog.component.html index 99fc3030d6db9e266b468d00c3972fad4272fcec..262bf9ec501739e6430dd505050ab2c6ce7734d6 100644 --- a/src/app/dars/new-degree-audit-dialog/new-degree-audit-dialog.component.html +++ b/src/app/dars/new-degree-audit-dialog/new-degree-audit-dialog.component.html @@ -133,7 +133,7 @@ <small>{{ course.title }}</small> </label> <mat-form-field> - <mat-label>{{ course.creditMin }}-{{ course.creditMax }} cr</mat-label> + <mat-label>{{ course.creditMin }}-{{ course.creditMax }} credits</mat-label> <mat-select formControlName="creditsDropdown" attr.aria-label="{{ credit }} credits" @@ -142,7 +142,7 @@ attr.aria-label="{{ credit }} credits" *ngFor="let credit of course.range" [value]="credit"> - {{ credit }} cr + {{ credit }} credits </mat-option> </mat-select> </mat-form-field> diff --git a/src/app/dars/new-degree-audit-dialog/new-degree-audit-dialog.component.scss b/src/app/dars/new-degree-audit-dialog/new-degree-audit-dialog.component.scss index 9342d9dbfa3b9358f0e68a00404af17fefe8800a..522d10bbb7309566df637b8bd48342da80a6881d 100644 --- a/src/app/dars/new-degree-audit-dialog/new-degree-audit-dialog.component.scss +++ b/src/app/dars/new-degree-audit-dialog/new-degree-audit-dialog.component.scss @@ -43,7 +43,7 @@ } mat-form-field { - width: 72px; + width: 90px; display: block; flex-grow: 0; text-align: right; diff --git a/src/app/dars/new-what-if-audit-dialog/new-what-if-audit-dialog.component.html b/src/app/dars/new-what-if-audit-dialog/new-what-if-audit-dialog.component.html index 7bcec85d250fd21a5d33e58d804372565ca5ea5b..5f63281de8e3996aa9065f25facd2ecc90942765 100644 --- a/src/app/dars/new-what-if-audit-dialog/new-what-if-audit-dialog.component.html +++ b/src/app/dars/new-what-if-audit-dialog/new-what-if-audit-dialog.component.html @@ -155,13 +155,13 @@ <small>{{ course.title }}</small> </label> <mat-form-field> - <mat-label>{{ course.creditMin }}-{{ course.creditMax }} cr</mat-label> + <mat-label>{{ course.creditMin }}-{{ course.creditMax }} credits</mat-label> <mat-select formControlName="creditsDropdown" aria-labelledby="credits-range-{{ course.id }}"> <mat-option attr.aria-label="{{ credit }} credits" *ngFor="let credit of course.range" [value]="credit"> - {{ credit }} cr + {{ credit }} credits </mat-option> </mat-select> </mat-form-field> diff --git a/src/app/dars/new-what-if-audit-dialog/new-what-if-audit-dialog.component.scss b/src/app/dars/new-what-if-audit-dialog/new-what-if-audit-dialog.component.scss index ab73ead1f197c45ae3f482426da48be641df5212..3b3eb0348dd9389659a05ab72ec046f0b90260d7 100644 --- a/src/app/dars/new-what-if-audit-dialog/new-what-if-audit-dialog.component.scss +++ b/src/app/dars/new-what-if-audit-dialog/new-what-if-audit-dialog.component.scss @@ -44,7 +44,7 @@ } mat-form-field { - width: 72px; + width: 90px; display: block; flex-grow: 0; text-align: right; diff --git a/src/assets/sass/general.scss b/src/assets/sass/general.scss index 4ef91283a3aae90e027a7538d70b75cc2a69d6e3..97d69813f45e8620774f83ea2accb9e19507146f 100644 --- a/src/assets/sass/general.scss +++ b/src/assets/sass/general.scss @@ -150,6 +150,7 @@ main { .mat-form-field-appearance-legacy.mat-form-field-can-float.mat-form-field-should-float .mat-form-field-label { font-size: 16px; + color: #494949; } .mat-warn .mat-input-element, @@ -311,6 +312,10 @@ main { // Form fields styles +.mat-paginator-range-actions { + color: #494949; +} + .includeCoursesFrom { .mat-radio-label { white-space: normal !important;