Merge branch 'develop' into 3551-enhancement-make-kirby-list-work-out…

…-of-the-box-when-within-kirby-accordion-item
kirbydesign · Sep 24, 2024 · 8211ca4 · 8211ca4
2 parents 715bb35 + b4304aa
commit 8211ca4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/libs/designsystem/button/src/button.component.scss b/libs/designsystem/button/src/button.component.scss
@@ -310,11 +310,6 @@ $button-margin: utils.size('xxxs');
   margin-inline-start: utils.size('s');
 }
 
-:host-context(kirby-alert).ok-btn {
-  --kirby-button-background-color: #{utils.get-color('success')};
-  --kirby-button-color: #{utils.get-color('success-contrast')};
-}
-
 :host-context(kirby-dropdown) {
   // place arrow-icon in dropdown correctly
   justify-content: space-between;

diff --git a/libs/designsystem/modal/src/modal/alert/alert.component.spec.ts b/libs/designsystem/modal/src/modal/alert/alert.component.spec.ts
@@ -1,10 +1,7 @@
 import { createHostFactory, SpectatorHost } from '@ngneat/spectator';
-
-import { DesignTokenHelper } from '@kirbydesign/designsystem/helpers';
-
 import { IconModule } from '@kirbydesign/designsystem/icon';
+
 import { AlertComponent } from './alert.component';
-const getColor = DesignTokenHelper.getColor;
 
 describe('AlertComponent', () => {
   let spectator: SpectatorHost<AlertComponent>;
@@ -59,13 +56,6 @@ describe('AlertComponent', () => {
       expect(okButton).toHaveClass('lg');
     });
 
-    it('should have success colors on button', () => {
-      expect(okButton).toHaveComputedStyle({
-        'background-color': getColor('success'),
-        color: getColor('success', 'contrast'),
-      });
-    });
-
     it('should have default size when cancel button', () => {
       expect(okButton.attributes['ng-reflect-size']).toBeUndefined();
     });