Merge pull request #332 from FiestaRuless/master

Update flyoutbutton class
digipolisantwerp · Jan 25, 2024 · ef79805 · ef79805
2 parents 629781a + d033080
commit ef79805
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [6.0.7] - 2024-01-24
+
+### Fixed
+
+- Fixed flyout button outlined class
+
 ## [6.0.6] - 2024-01-19
 
 ### Fixed

diff --git a/packages/ngx-flyout/src/lib/flyout-button/CHANGELOG.md b/packages/ngx-flyout/src/lib/flyout-button/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [6.0.7] - 2024-01-24
+
+### Fixed
+
+- Fixed flyout button outlined class
+
 ## [5.0.1] - 2018-04-27
 ### Changed
 - Fixed flyout content always rendered

diff --git a/...es/ngx-flyout/src/lib/flyout-button/components/flyout-button/flyout-button.component.html b/...es/ngx-flyout/src/lib/flyout-button/components/flyout-button/flyout-button.component.html
@@ -11,7 +11,7 @@
       buttonClassNames[buttonSize],
       icon && label ? 'has-icon-left' : '',
       icon && !label ? 'has-icon' : '',
-      outline ? 'a-button--outline' : 'a-button'
+      outline ? 'a-button a-button--outlined' : 'a-button'
     ]"
     auiFlyoutAction
     title="{{ title }}"

diff --git a/...ngx-flyout/src/lib/flyout-button/components/flyout-button/flyout-button.component.spec.ts b/...ngx-flyout/src/lib/flyout-button/components/flyout-button/flyout-button.component.spec.ts
@@ -71,7 +71,7 @@ describe('The FlyoutButton Component', () => {
     comp.outline = true;
 
     fixture.detectChanges();
-    expect(el.getElementsByTagName('button')[0].getAttribute('class')).toContain('a-button--outline');
+    expect(el.getElementsByTagName('button')[0].getAttribute('class')).toContain('a-button a-button--outlined');
   });
 
   it('should apply the `has-icon` class when no label is present', () => {

diff --git a/packages/styleguide/src/examples/pages/aui-layout/modal/modal.page.ts b/packages/styleguide/src/examples/pages/aui-layout/modal/modal.page.ts
@@ -25,7 +25,7 @@ import { ModalAbstract, ModalService } from '@acpaas-ui/ngx-layout';
       </div>
       <div class="m-modal__footer">
         <button type="button" class="a-button" (click)="submitAndCloseModal()">Close Modal</button>
-        <button type="button" class="a-button a-button--outline" (click)="closeModal()">Cancel</button>
+        <button type="button" class="a-button a-button a-button--outlined" (click)="closeModal()">Cancel</button>
       </div>
     </div>
   </div>\`,