Skip to content

Commit

Permalink
Merge 652059a into 4f9eda9
Browse files Browse the repository at this point in the history
  • Loading branch information
JKMarkowski committed Dec 18, 2020
2 parents 4f9eda9 + 652059a commit a8b6571
Show file tree
Hide file tree
Showing 71 changed files with 563 additions and 752 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<div fd-bar>
<div fd-bar-left>
<fd-bar-element>
<button fd-button [fdType]="'transparent'" [glyph]="navigationArrow$ | async" [compact]="true"></button>
</fd-bar-element>
<fd-button-bar [glyph]="navigationArrow$ | async"></fd-button-bar>
<fd-bar-element>
Left Section
</fd-bar-element>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<div fd-bar [barDesign]="'floating-footer'">
<div fd-bar-right>
<fd-bar-element>
<button fd-button label="Save" [fdType]="'transparent'" [compact]="true"></button>
</fd-bar-element>
<fd-bar-element>
<button fd-button label="Cancel" [fdType]="'transparent'" [compact]="true"></button>
</fd-bar-element>
<fd-button-bar label="Save"></fd-button-bar>
<fd-button-bar label="Cancel"></fd-button-bar>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<div fd-bar [barDesign]="'footer'">
<div fd-bar-right>
<fd-bar-element>
<button fd-button label="Save" [fdType]="'transparent'" [compact]="true"></button>
</fd-bar-element>
<fd-bar-element>
<button fd-button label="Cancel" [fdType]="'transparent'" [compact]="true"></button>
</fd-bar-element>
<fd-button-bar label="Save"></fd-button-bar>
<fd-button-bar label="Cancel"></fd-button-bar>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<div fd-bar [barDesign]="'header'">
<div fd-bar-left>
<fd-bar-element>
<button fd-button [fdType]="'transparent'" [glyph]="navigationArrow$ | async" [compact]="true"></button>
</fd-bar-element>
<fd-button-bar [glyph]="navigationArrow$ | async"></fd-button-bar>
<fd-bar-element>
Left Section
</fd-bar-element>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<div fd-bar [inPage]="true">
<div fd-bar-left>
<fd-bar-element>
<button fd-button [fdType]="'transparent'" [glyph]="navigationArrow$ | async" [compact]="true"></button>
</fd-bar-element>
<fd-button-bar [glyph]="navigationArrow$ | async"></fd-button-bar>
<fd-bar-element>
Left Section
</fd-bar-element>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<div fd-bar [inPage]="true" [size]="'m_l'">
<div fd-bar-left>
<fd-bar-element>
<button fd-button [fdType]="'transparent'" [glyph]="navigationArrow$ | async" [compact]="true"></button>
</fd-bar-element>
<fd-button-bar [glyph]="navigationArrow$ | async"></fd-button-bar>
<fd-bar-element>
Left Section
</fd-bar-element>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,11 @@
</fd-dialog-body>

<fd-dialog-footer>
<fd-dialog-footer-button>
<button
fd-button
fd-dialog-decisive-button
<fd-button-bar
fdType="emphasized"
label="Ok"
(click)="dialog.close('Continue'); dateChanged(landscapeCalendar.selectedDate)"
>
</button>
</fd-dialog-footer-button>
(click)="dialog.close('Continue'); dateChanged(landscapeCalendar.selectedDate)">
</fd-button-bar>
</fd-dialog-footer>
</fd-dialog>
</ng-template>
Expand Down Expand Up @@ -67,16 +62,11 @@ <h3 fd-title>Pick a date</h3>
</fd-dialog-body>

<fd-dialog-footer>
<fd-dialog-footer-button>
<button
fd-button
fd-dialog-decisive-button
<fd-button-bar
fdType="emphasized"
label="Ok"
(click)="dialog.close('Continue'); dateChanged(portraitCalendar.selectedDate)"
>
</button>
</fd-dialog-footer-button>
(click)="dialog.close('Continue'); dateChanged(portraitCalendar.selectedDate)">
</fd-button-bar>
</fd-dialog-footer>
</fd-dialog>
</ng-template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,16 +211,11 @@ <h1 fd-title>Playground Dialog</h1>
</fd-dialog-body>

<fd-dialog-footer>
<fd-dialog-footer-button>
<button
fd-button
fd-dialog-decisive-button
<fd-button-bar
fdType="emphasized"
label="Close"
[compact]="true"
(click)="dialog.close()">
</button>
</fd-dialog-footer-button>
</fd-button-bar>
</fd-dialog-footer>
</fd-dialog>
</ng-template>
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
FirstDialogExampleComponent,
SecondDialogExampleComponent
} from './examples';
import { A11yModule } from '@angular/cdk/a11y';

const routes: Routes = [
{
Expand All @@ -32,7 +33,8 @@ const routes: Routes = [
FormModule,
ListModule,
DialogModule,
InputGroupModule
InputGroupModule,
A11yModule
],
exports: [RouterModule],
declarations: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,17 @@ import { DialogRef } from '@fundamental-ngx/core';
</fd-dialog-body>
<fd-dialog-footer>
<fd-dialog-footer-button>
<button
fd-button
fdType="emphasized"
fd-dialog-decisive-button
<fd-button-bar
label="Interesting"
[compact]="true"
fdType="emphasized"
(click)="this.dialogRef.close('Continue')">
</button>
</fd-dialog-footer-button>
<fd-dialog-footer-button>
<button
fd-button
fdType="transparent"
fd-dialog-decisive-button
fd-initial-focus
</fd-button-bar>
<fd-button-bar
label="Cancel"
[compact]="true"
fdInitialFocus
fdType="transparent"
(click)="this.dialogRef.dismiss('Cancel')">
</button>
</fd-dialog-footer-button>
</fd-button-bar>
</fd-dialog-footer>
</fd-dialog>
`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,12 @@ <h1 fd-title>Backdrop Configuration</h1>
</fd-dialog-body>

<fd-dialog-footer>
<fd-dialog-footer-button>
<button
fd-button
<fd-button-bar
fd-initial-focus
fd-dialog-decisive-button
fdType="emphasized"
label="Close"
[compact]="true"
(click)="dialog.close()">
</button>
</fd-dialog-footer-button>
</fd-button-bar>
</fd-dialog-footer>
</fd-dialog>
</ng-template>
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ <h1 fd-title>Fresh Market</h1>
</fd-bar-element>
</div>
<div fd-bar-right>
<fd-bar-element>
<button fd-button fdType="transparent" compact="true" label="Clear" (click)="clear()"></button>
</fd-bar-element>
<fd-button-bar label="Clear" (click)="clear()"></fd-button-bar>
</div>
</ng-template>

Expand Down Expand Up @@ -52,17 +50,13 @@ <h1 fd-title>Fresh Market</h1>
<fd-bar-element> Total price: {{ totalPrice }}€ </fd-bar-element>
</div>
<div fd-bar-right>
<fd-bar-element>
<button
fd-button
fd-dialog-decisive-button
<fd-button-bar
fd-initial-focus
glyph="cart"
fdType="emphasized"
label="Checkout"
[compact]="true"
(click)="checkout()">
</button>
</fd-bar-element>
</fd-button-bar>
</div>
</ng-template>
</fd-dialog-footer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,12 @@ <h1 fd-title>Origin of the Pineapple Word</h1>
</fd-dialog-body>

<fd-dialog-footer>
<fd-dialog-footer-button>
<button
fd-button
fdType="emphasized"
<fd-button-bar
fd-initial-focus
fd-dialog-decisive-button
fdType="emphasized"
label="Interesting"
[compact]="true"
(click)="dialog.close()">
</button>
</fd-dialog-footer-button>
</fd-button-bar>
</fd-dialog-footer>
</fd-dialog>
</ng-template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@ <h1 fd-title>Wild pineapples</h1>
</fd-dialog-body>

<fd-dialog-footer>
<fd-dialog-footer-button>
<button fd-button
fd-initial-focus
fd-dialog-decisive-button
fdType="emphasized"
label="Interesting"
(click)="dialog.close()">
</button>
</fd-dialog-footer-button>
<fd-button-bar
fd-initial-focus
fdType="emphasized"
label="Interesting"
(click)="dialog.close()">
</fd-button-bar>
</fd-dialog-footer>
</fd-dialog>
</ng-template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,11 @@ <h1 fd-title>More Facts about the Pineapple</h1>
</fd-dialog-body>

<fd-dialog-footer>
<fd-dialog-footer-button>
<button
fd-button
<fd-button-bar
fdType="emphasized"
fd-initial-focus
fd-dialog-decisive-button
label="Interesting"
[compact]="true"
(click)="dialog.close()">
</button>
</fd-dialog-footer-button>
</fd-button-bar>
</fd-dialog-footer>
</fd-dialog>
</ng-template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,12 @@ <h1 fd-title>Dialog states</h1>
</fd-dialog-body>

<fd-dialog-footer>
<fd-dialog-footer-button>
<button
fd-button
<fd-button-bar
fd-initial-focus
fdType="emphasized"
label="Ok"
fd-initial-focus
fd-dialog-decisive-button
[compact]="true"
(click)="dialog.close()">
</button>
</fd-dialog-footer-button>
</fd-button-bar>
</fd-dialog-footer>
</fd-dialog>
</ng-template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,12 @@ import { SecondDialogExampleComponent } from './second-dialog-example.component'
</fd-dialog-body>
<fd-dialog-footer>
<fd-dialog-footer-button>
<button
fd-button
fdType="emphasized"
<fd-button-bar
fd-initial-focus
fd-dialog-decisive-button
fdType="emphasized"
label="Open Second Dialog"
[compact]="true"
(click)="openDialog()">
</button>
</fd-dialog-footer-button>
</fd-button-bar>
</fd-dialog-footer>
</fd-dialog>
`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,12 @@ import { DialogRef } from '@fundamental-ngx/core';
</fd-dialog-body>
<fd-dialog-footer>
<fd-dialog-footer-button>
<button
fd-button
fdType="emphasized"
<fd-button-bar
fd-initial-focus
fd-dialog-decisive-button
fdType="emphasized"
label="Close"
[compact]="true"
(click)="dialogRef.close()">
</button>
</fd-dialog-footer-button>
</fd-button-bar>
</fd-dialog-footer>
</fd-dialog>
`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,16 @@ <h1 fd-title>The History of Pineapple</h1>
</fd-dialog-body>

<fd-dialog-footer>
<fd-dialog-footer-button>
<button
fd-button
fd-dialog-decisive-button
<fd-button-bar
fdType="emphasized"
label="Interested"
[compact]="true"
(click)="dialog.close('Continue')">
</button>
</fd-dialog-footer-button>

<fd-dialog-footer-button>
<button
fd-button
</fd-button-bar>
<fd-button-bar
fd-initial-focus
fd-dialog-decisive-button
fdType="transparent"
label="Cancel"
[compact]="true"
(click)="dialog.dismiss('Cancel')">
</button>
</fd-dialog-footer-button>
</fd-button-bar>
</fd-dialog-footer>
</fd-dialog>
</ng-template>
Expand Down

0 comments on commit a8b6571

Please sign in to comment.