Merge pull request #460 from PermanentOrg/fix-merge-error

PermanentOrg · Sep 17, 2024 · 5d29ba7 · 5d29ba7
2 parents e58de3d + f3337f8
commit 5d29ba7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/app/component-library/components/button/button.component.html b/src/app/component-library/components/button/button.component.html
@@ -16,5 +16,7 @@
 >
   <img *ngIf="icon" class="icon" src="{{ 'assets/svg/' + icon + '.svg' }}" />
   <fa-icon class="icon" *ngIf="faIcon" [icon]="['fas', faIcon]"></fa-icon>
-  <p [style]="textColor" class="button-text"><ng-content></ng-content></p>
+  <p [style]="{ color: color }" class="button-text">
+    <ng-content></ng-content>
+  </p>
 </button>
diff --git a/src/app/component-library/components/button/button.component.ts b/src/app/component-library/components/button/button.component.ts
@@ -25,6 +25,7 @@ export class ButtonComponent {
   @Input() faIcon: string = '';
   @Input() buttonType: TYPE = 'button';
   @Input() style = {};
+  @Input() color = '';
 
   //Outputs
   @Output() buttonClick = new EventEmitter<MouseEvent>();

diff --git a/src/app/onboarding/components/glam/pending-archive/pending-archive.component.html b/src/app/onboarding/components/glam/pending-archive/pending-archive.component.html
@@ -18,7 +18,7 @@
       [mode]="isSelected ? 'dark' : 'light'"
       [orientation]="'right'"
       [icon]="isSelected ? '/accept-green' : ''"
-      [style]="isSelected ? { color: '#32D583' } : {}"
+      [color]="isSelected ? '#32D583' : ''"
     >
       Accept
     </pr-button>