Skip to content

Commit 3021837

Browse files
randywoods1randywoods1
committed
Merge branch 'develop' into feature/CSET-3487
2 parents b7a4219 + b073adc commit 3021837

File tree

8 files changed

+40
-53
lines changed

8 files changed

+40
-53
lines changed

‎CSETWebNg/src/app/assessment/questions/question-block-maturity/question-block-maturity.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131

3232
<div class="d-flex justify-content-end align-items-center flex-00a" *ngIf="!layoutSvc.hp">
3333
<span [class.display-hidden]="!myGrouping.hasReviewItems"
34-
class="d-flex justify-content-center align-items-center flex-00a"
34+
class="d-flex mfr justify-content-center align-items-center flex-00a"
3535
matTooltip="{{ t('tooltip.category requires review') }}">
36-
<span class="me-1 cset-icons-flag-dark fs-small"></span>
37-
<span class="mb-1 fs-small">{{ t('requires review') }}</span>
36+
<span class="me-1 mfr cset-icons-flag-dark fs-small"></span>
37+
<span class="mb-1 mfr fs-small">{{ t('requires review') }}</span>
3838
</span>
3939
<app-progress [value]="percentAnswered" class="me-2 ms-2"></app-progress>
4040
<i class="cset-icons-chevron-down q-expand" [class.expand-flip]="myGrouping.expanded"></i>

‎CSETWebNg/src/app/assessment/questions/question-block-vadr/question-block-vadr.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<span [class.display-hidden]="!myGrouping.hasReviewItems"
3636
class="d-flex justify-content-center align-items-center flex-00a"
3737
matTooltip="{{ t('tooltip.category requires review') }}">
38-
<span class="me-1 cset-icons-flag-dark fs-small"></span>
39-
<span class="mb-1 fs-small">{{ t('requires review') }}</span>
38+
<span class="me-1 mfr cset-icons-flag-dark fs-small"></span>
39+
<span class="mb-1 mfr fs-small">{{ t('requires review') }}</span>
4040
</span>
4141
<app-progress [value]="percentAnswered" class="me-2 ms-2"></app-progress>
4242
<i class="cset-icons-chevron-down q-expand" [class.expand-flip]="myGrouping.expanded"></i>

‎CSETWebNg/src/app/assessment/questions/question-block/question-block.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
</div>
3636
<div class="d-flex justify-content-end align-items-center flex-00a" *ngIf="!layoutSvc.hp">
3737
<span [class.display-hidden]="!mySubCategory.hasReviewItems"
38-
class="d-flex justify-content-center align-items-center flex-00a"
38+
class="d-flex justify-content-center align-items-center mfr flex-00a"
3939
matTooltip="{{ t('tooltip.category requires review') }}">
40-
<span class="me-1 cset-icons-flag-dark fs-small"></span>
41-
<span class="mb-1 fs-small">{{ t('requires review') }}</span>
40+
<span class="me-1 mfr cset-icons-flag-dark fs-small"></span>
41+
<span class="mb-1 mfr fs-small">{{ t('requires review') }}</span>
4242
</span>
4343
<app-progress [value]="percentAnswered" class="me-2 ms-2"></app-progress>
4444
<i class="cset-icons-chevron-down q-expand" [class.expand-flip]="mySubCategory.expanded"></i>

‎CSETWebNg/src/app/import/import.component.ts‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,6 @@ export class ImportComponent implements OnInit, OnDestroy {
346346
if (this.uploader === undefined) {
347347
this.initializeUploader();
348348
}
349-
this.configureMonacoEnvironment();
350-
351349
// Subscribe to theme changes to update Monaco editor theme
352350
this.subscriptions.push(
353351
this.themeSvc.theme$.subscribe(() => {
@@ -367,26 +365,6 @@ export class ImportComponent implements OnInit, OnDestroy {
367365
}
368366
}
369367

370-
private configureMonacoEnvironment() {
371-
// Configure Monaco Editor environment to load assets from correct path
372-
(window as any).MonacoEnvironment = {
373-
getWorkerUrl: function (moduleId: string, label: string) {
374-
if (label === 'json') {
375-
return './assets/monaco/vs/language/json/jsonWorker.js';
376-
}
377-
if (label === 'css' || label === 'scss' || label === 'less') {
378-
return './assets/monaco/vs/language/css/cssWorker.js';
379-
}
380-
if (label === 'html' || label === 'handlebars' || label === 'razor') {
381-
return './assets/monaco/vs/language/html/htmlWorker.js';
382-
}
383-
if (label === 'typescript' || label === 'javascript') {
384-
return './assets/monaco/vs/language/typescript/tsWorker.js';
385-
}
386-
return './assets/monaco/vs/base/worker/workerMain.js';
387-
}
388-
};
389-
}
390368

391369
private initializeUploader() {
392370
this.referenceUrl = this.configSvc.refDocUrl;

‎CSETWebNg/src/app/layout/iod-layout/iod-layout.component.scss‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ $primary-900: map.get($primary, 900); // Main Dark Primary
7979

8080
$primary-color: $primary-900;
8181
$secondary-color: map.get($primary, 450);
82+
$orange-500: #f97316;
8283

8384
$link-color-dark: #1a53ff; //$primary-350;
8485
$link-color-light: $primary-350;
@@ -1136,22 +1137,24 @@ table.td-align-top td {
11361137
}
11371138

11381139

1139-
1140+
.mfr {
1141+
color: $orange-500 !important;
1142+
}
11401143
.btn-mfr {
1141-
background-color: $primary-50;
1142-
border-color: $gray-800;
1143-
color: $primary-color;
1144+
background-color: $white;
1145+
border-color: $orange-500;
1146+
color: $orange-500;
11441147
}
11451148

11461149
.btn-mfr:hover,
11471150
.btn-mfr.answer-selected:hover {
1148-
background-color: $primary-700;
1151+
background-color: $orange-500;
11491152
color: $white;
11501153
}
11511154

11521155
.btn-mfr.answer-selected {
1153-
background-color: $warn-color;
1154-
color: $gray-900;
1156+
background-color: $orange-500;;
1157+
color: $white;
11551158
}
11561159

11571160
.alt-text-required {
@@ -4472,11 +4475,11 @@ h6.dropdown-header {
44724475
}
44734476

44744477
.btn-mfr {
4475-
border-color: var(--border-color);
4478+
border-color: $orange-500;
44764479

44774480
&:hover,
44784481
&.answer-selected {
4479-
background-color: #2c5c6d !important;
4482+
background-color: $orange-500 !important;
44804483
color: white;
44814484
}
44824485
}

‎CSETWebNg/src/app/layout/layout-main/layout-main.component.scss‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ $primary-900: map.get($primary, 900); // Main Dark Primary
7878

7979
$primary-color: $primary-900;
8080
$secondary-color: map.get($primary, 450);
81+
$orange-500:#f97316;
8182

8283
$link-color-dark: #1a53ff; //$primary-350;
8384
$link-color-light: $primary-350;
@@ -1193,22 +1194,25 @@ table.td-align-top td {
11931194
}
11941195

11951196

1197+
.mfr {
1198+
color: $orange-500 !important;
1199+
}
11961200

11971201
.btn-mfr {
1198-
background-color: $primary-50;
1199-
border-color: $gray-800;
1200-
color: $primary-color;
1202+
background-color: $white;
1203+
border-color: $orange-500;
1204+
color: $orange-500;
12011205
}
12021206

12031207
.btn-mfr:hover,
12041208
.btn-mfr.answer-selected:hover {
1205-
background-color: $primary-700;
1209+
background-color: $orange-500;
12061210
color: $white;
12071211
}
12081212

12091213
.btn-mfr.answer-selected {
1210-
background-color: $warn-color;
1211-
color: $gray-900;
1214+
background-color: $orange-500;;
1215+
color: $white;
12121216
}
12131217

12141218
.alt-text-required {
@@ -4502,11 +4506,11 @@ h6.dropdown-header {
45024506
}
45034507

45044508
.btn-mfr {
4505-
border-color: var(--border-color);
4509+
border-color: $orange-500;
45064510

45074511
&:hover,
45084512
&.answer-selected {
4509-
background-color: #2c5c6d !important;
4513+
background-color: $orange-500 !important;
45104514
color: white;
45114515
}
45124516
}

‎CSETWebNg/src/app/layout/styles-base.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ table.td-align-top td {
844844
}
845845

846846
.btn-mfr.answer-selected {
847-
background-color: $warn-color;
847+
background-color: $orange-500;
848848
color: $gray-900;
849849
}
850850

‎CSETWebNg/src/sass/styles.scss‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ SOFTWARE.
2727
@use "cset-font-styles.css";
2828
@use "cset2-font-styles.css";
2929

30+
$orange-500:#f97316;
31+
3032
*:not(font) {
3133
font-family: "Roboto", sans-serif;
3234
}
@@ -624,19 +626,19 @@ table.td-align-top td {
624626

625627
.btn-mfr {
626628
background-color: $primary-50;
627-
border-color: $gray-800;
628-
color: $primary-color;
629+
border-color: $orange-500;
630+
color: $orange-500;
629631
}
630632

631633
.btn-mfr:hover,
632634
.btn-mfr.answer-selected:hover {
633-
background-color: $primary-700;
635+
background-color: $orange-500;
634636
color: $white;
635637
}
636638

637639
.btn-mfr.answer-selected {
638-
background-color: $warn-color;
639-
color: $gray-900;
640+
background-color: $orange-500;;
641+
color: $white;
640642
}
641643

642644
.alt-text-required {

0 commit comments

Comments
 (0)