Merge pull request #774 from tolkamps1/EPICSYSTEM-7-2-activity-page-f…

…ilter-badge [EPICSYSTEM-7] Activity page fix clearing project badge, add colours
bcgov · Apr 9, 2024 · 709864d · 709864d
2 parents a13f831 + 2e4635a
commit 709864d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/src/app/activity/activity.component.html b/src/app/activity/activity.component.html
@@ -38,7 +38,7 @@
                                         </div>
                                         <button *ngFor="let filter of filterForUI.project" class="btn filter-badge project">
                                             <span class="ng-value-label">{{filter.name}} </span>
-                                            <span class="ng-value-icon left" (click)="clearSelectedItem('projects', filter)"
+                                            <span class="ng-value-icon left" (click)="clearSelectedItem('project', filter)"
                                                 aria-hidden="true">&nbsp;<i class="material-symbols-outlined size-20">
                                                     clear
                                                 </i></span>

diff --git a/src/app/activity/activity.component.scss b/src/app/activity/activity.component.scss
@@ -199,7 +199,7 @@ form {
   gap: 0px 4px;
   margin-top: 0px;
 
-  .project, .cAndE
+  .project
   {
     background: #FEEBAB;
     color: #553402;
@@ -211,8 +211,13 @@ form {
   }
 
   .dateAddedRange {
-    background: #e9ecef;
-    color: #495057;
+    background: #FFF8E8;
+    color: #593F00;
+  }
+
+  .cAndE {
+    background: #F1F8FF;
+    color: #323130;
   }
 
   .filter-badge {

diff --git a/src/app/projects/project-list/project-list.component.scss b/src/app/projects/project-list/project-list.component.scss
@@ -394,24 +394,29 @@
       flex-wrap: wrap;
       gap: 0px 4px;
       margin-top: 0px;
-  
+
       .type,
-      .proponent,
-      .region {
+      .proponent {
         background: #FEEBAB;
         color: #553402;
       }
-  
+
       .pcp,
       .projectPhase {
         background: #E3EBFF;
         color: #022170;
       }
-  
-      .eacDecision, .eacDecisionDate,
+
+      .eacDecision,
       .CEAAInvolvement {
-        background: #e9ecef;
-        color: #495057;
+        background: #FFF8E8;
+        color: #593F00;
+      }
+
+      .eacDecisionDate,
+      .region {
+        background: #F1F8FF;
+        color: #323130;
       }
     }