Misc formatting and hide new feedback template picker

cmu-sei · Dec 2, 2024 · 5fc0e7e · 5fc0e7e
1 parent e042089
commit 5fc0e7e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/...app/admin/components/game-center/game-center-settings/game-center-settings.component.html b/...app/admin/components/game-center/game-center-settings/game-center-settings.component.html
@@ -148,7 +148,7 @@
             </div>
 
             <div class="col-12 mt-5">
-                <app-feedback-template-picker></app-feedback-template-picker>
+                <!-- <app-feedback-template-picker></app-feedback-template-picker> -->
                 <app-feedback-editor [feedbackTemplate]="game.feedbackTemplate"
                     (templateChange)="handleFeedbackTemplateChange($event || undefined)"></app-feedback-editor>
             </div>

diff --git a/...-ui/src/app/admin/components/game-center/game-center-teams/game-center-teams.component.ts b/...-ui/src/app/admin/components/game-center/game-center-teams/game-center-teams.component.ts
@@ -138,7 +138,6 @@ export class GameCenterTeamsComponent implements OnInit {
       return;
     }
 
-
     await this.handleDeployGameResources(eligibleTeams);
   }
 

diff --git a/...ore/components/gameboard-performance-summary/gameboard-performance-summary.component.html b/...ore/components/gameboard-performance-summary/gameboard-performance-summary.component.html
@@ -1,11 +1,13 @@
 <div class="gameboard-performance-summary-component" *ngIf="ctx; else loading">
-    <div class="text-info card-text mb-2">
+    <div class="card-text mb-2">
         <span
-            *ngIf="ctx.player.session && !ctx.player.session.isBefore && (ctx.player.session.isAfter || isCountdownOver)">
+            *ngIf="ctx.player.session && !ctx.player.session.isBefore && (ctx.player.session.isAfter || isCountdownOver)"
+            class="text-danger">
             Game Over
         </span>
-        <span *ngIf="ctx.player.session?.isDuring && !isCountdownOver">Time Remaining:
-            <span class="font-weight-bold" [class]="(countdown$ | async) || 0 | countdowncolor">
+        <span class="text-muted" *ngIf="ctx.player.session?.isDuring && !isCountdownOver">
+            Time Remaining:
+            <span class="fw-bold" [class]="(countdown$ | async) || 0 | countdowncolor">
                 {{ (countdown$ | async) || 0 | countdown }}
             </span>
         </span>

diff --git a/projects/gameboard-ui/src/app/game/pages/game-page/game-page.component.ts b/projects/gameboard-ui/src/app/game/pages/game-page/game-page.component.ts
@@ -246,7 +246,7 @@ export class GamePageComponent implements OnDestroy {
   }
 
   private showModal(resettingPlayerName?: string): void {
-    const resetInitiator = resettingPlayerName ? `your teammate "${resettingPlayerName}"` : "an administrator";
+    const resetInitiator = resettingPlayerName ? `your teammate **${resettingPlayerName}**` : "an **administrator**";
 
     this.modalService.openConfirm({
       title: "Session reset",

diff --git a/projects/gameboard-ui/src/app/game/pages/gameboard-page/gameboard-page.component.scss b/projects/gameboard-ui/src/app/game/pages/gameboard-page/gameboard-page.component.scss
@@ -1,3 +1,5 @@
+@import "../../../../scss/variables";
+
 .jumbotron {
   img {
     max-height: 150px;
@@ -37,15 +39,15 @@
 }
 
 .countdown-green {
-  color: rgb(0, 191, 0);
+  color: $success;
 }
 
 .countdown-yellow {
-  color: rgb(236, 236, 130);
+  color: $warning;
 }
 
 .countdown-red {
-  color: rgb(255, 53, 53);
+  color: $danger;
 }
 
 // Uses a 16 : 10 ratio, but can be changed here
-Original file line number
+Diff line change
@@ Expand Up / @@ -138,7 +138,6 @@ export class GameCenterTeamsComponent implements OnInit { @@
           return;
         }
         await this.handleDeployGameResources(eligibleTeams);
       }
@@ Expand Down @@