bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-11 13:53:34 +00:00
Code Issues Releases Wiki Activity

[PM-1913] Add base styling to dialog footer component (#5254)

Browse Source
This commit is contained in:
Oscar Hinton
2023-05-01 11:11:39 +02:00
committed by GitHub
parent 9a41d5dc6f
commit 01c1bd0710
7 changed files with 61 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/components/src/dialog/dialog.service.stories.ts
View File

@@ -44,10 +44,10 @@ class StoryDialogComponent {
<br /> <br />
Animal: {{ animal }} Animal: {{ animal }}
</span> </span>
<div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2"> <ng-container bitDialogFooter>
<button bitButton buttonType="primary" (click)="dialogRef.close()">Save</button> <button bitButton buttonType="primary" (click)="dialogRef.close()">Save</button>
<button bitButton buttonType="secondary" bitDialogClose>Cancel</button> <button bitButton buttonType="secondary" bitDialogClose>Cancel</button>
</div> </ng-container>
</bit-dialog> </bit-dialog>
`, `,
}) })

2
libs/components/src/dialog/dialog/dialog.component.html
View File

@@ -25,7 +25,7 @@
</div> </div>
<div <div
class="tw-border-0 tw-border-t tw-border-solid tw-border-secondary-300 tw-bg-background-alt tw-p-4" class="tw-flex tw-flex-row tw-items-center tw-gap-2 tw-border-0 tw-border-t tw-border-solid tw-border-secondary-300 tw-bg-background-alt tw-p-4"
> >
<ng-content select="[bitDialogFooter]"></ng-content> <ng-content select="[bitDialogFooter]"></ng-content>
</div> </div>

12
libs/components/src/dialog/dialog/dialog.stories.ts
View File

@@ -55,7 +55,7 @@ const Template: Story<DialogComponent> = (args: DialogComponent) => ({
<bit-dialog [dialogSize]="dialogSize" [disablePadding]="disablePadding"> <bit-dialog [dialogSize]="dialogSize" [disablePadding]="disablePadding">
<span bitDialogTitle>{{title}}</span> <span bitDialogTitle>{{title}}</span>
<span bitDialogContent>Dialog body text goes here.</span> <span bitDialogContent>Dialog body text goes here.</span>
<div bitDialogFooter class="tw-flex tw-items-center tw-flex-row tw-gap-2"> <ng-container bitDialogFooter>
<button bitButton buttonType="primary">Save</button> <button bitButton buttonType="primary">Save</button>
<button bitButton buttonType="secondary">Cancel</button> <button bitButton buttonType="secondary">Cancel</button>
<button <button
@@ -65,7 +65,7 @@ const Template: Story<DialogComponent> = (args: DialogComponent) => ({
size="default" size="default"
title="Delete" title="Delete"
aria-label="Delete"></button> aria-label="Delete"></button>
</div> </ng-container>
</bit-dialog> </bit-dialog>
`, `,
}); });
@@ -106,10 +106,10 @@ const TemplateScrolling: Story<DialogComponent> = (args: DialogComponent) => ({
</ng-container> </ng-container>
end of sequence! end of sequence!
</span> </span>
<div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2"> <ng-container bitDialogFooter>
<button bitButton buttonType="primary">Save</button> <button bitButton buttonType="primary">Save</button>
<button bitButton buttonType="secondary">Cancel</button> <button bitButton buttonType="secondary">Cancel</button>
</div> </ng-container>
</bit-dialog> </bit-dialog>
`, `,
}); });
@@ -131,10 +131,10 @@ const TemplateTabbed: Story<DialogComponent> = (args: DialogComponent) => ({
<bit-tab label="Third Tab">Third Tab Content</bit-tab> <bit-tab label="Third Tab">Third Tab Content</bit-tab>
</bit-tab-group> </bit-tab-group>
</span> </span>
<div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2"> <ng-container bitDialogFooter>
<button bitButton buttonType="primary">Save</button> <button bitButton buttonType="primary">Save</button>
<button bitButton buttonType="secondary">Cancel</button> <button bitButton buttonType="secondary">Cancel</button>
</div> </ng-container>
</bit-dialog> </bit-dialog>
`, `,
}); });

4
libs/components/src/dialog/simple-configurable-dialog/simple-configurable-dialog.component.html
View File

@@ -5,7 +5,7 @@
<div bitDialogContent>{{ content }}</div> <div bitDialogContent>{{ content }}</div>
<div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2"> <ng-container bitDialogFooter>
<button <button
type="button" type="button"
bitButton bitButton
@@ -24,5 +24,5 @@
> >
{{ cancelButtonText }} {{ cancelButtonText }}
</button> </button>
</div> </ng-container>
</bit-simple-dialog> </bit-simple-dialog>

4
libs/components/src/dialog/simple-dialog.service.stories.ts
View File

@@ -44,10 +44,10 @@ class StoryDialogComponent {
<br /> <br />
Animal: {{ animal }} Animal: {{ animal }}
</span> </span>
<div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2"> <ng-container bitDialogFooter>
<button bitButton buttonType="primary" (click)="dialogRef.close()">Save</button> <button bitButton buttonType="primary" (click)="dialogRef.close()">Save</button>
<button bitButton buttonType="secondary" bitDialogClose>Cancel</button> <button bitButton buttonType="secondary" bitDialogClose>Cancel</button>
</div> </ng-container>
</bit-simple-dialog> </bit-simple-dialog>
`, `,
}) })

4
libs/components/src/dialog/simple-dialog/simple-dialog.component.html
View File

@@ -16,7 +16,9 @@
<div class="tw-overflow-y-auto tw-px-4 tw-pt-2 tw-pb-4 tw-text-center tw-text-base"> <div class="tw-overflow-y-auto tw-px-4 tw-pt-2 tw-pb-4 tw-text-center tw-text-base">
<ng-content select="[bitDialogContent]"></ng-content> <ng-content select="[bitDialogContent]"></ng-content>
</div> </div>
<div class="tw-border-0 tw-border-t tw-border-solid tw-border-secondary-300 tw-p-4"> <div
class="tw-flex tw-flex-row tw-gap-2 tw-border-0 tw-border-t tw-border-solid tw-border-secondary-300 tw-p-4"
>
<ng-content select="[bitDialogFooter]"></ng-content> <ng-content select="[bitDialogFooter]"></ng-content>
</div> </div>
</div> </div>

12
libs/components/src/dialog/simple-dialog/simple-dialog.stories.ts
View File

@@ -28,10 +28,10 @@ const Template: Story<SimpleDialogComponent> = (args: SimpleDialogComponent) =>
<bit-simple-dialog> <bit-simple-dialog>
<span bitDialogTitle>Alert Dialog</span> <span bitDialogTitle>Alert Dialog</span>
<span bitDialogContent>Message Content</span> <span bitDialogContent>Message Content</span>
<div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2"> <ng-container bitDialogFooter>
<button bitButton buttonType="primary">Yes</button> <button bitButton buttonType="primary">Yes</button>
<button bitButton buttonType="secondary">No</button> <button bitButton buttonType="secondary">No</button>
</div> </ng-container>
</bit-simple-dialog> </bit-simple-dialog>
`, `,
}); });
@@ -45,10 +45,10 @@ const TemplateWithIcon: Story<SimpleDialogComponent> = (args: SimpleDialogCompon
<i bitDialogIcon class="bwi bwi-star tw-text-3xl tw-text-success" aria-hidden="true"></i> <i bitDialogIcon class="bwi bwi-star tw-text-3xl tw-text-success" aria-hidden="true"></i>
<span bitDialogTitle>Premium Subscription Available</span> <span bitDialogTitle>Premium Subscription Available</span>
<span bitDialogContent> Message Content</span> <span bitDialogContent> Message Content</span>
<div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2"> <ng-container bitDialogFooter>
<button bitButton buttonType="primary">Yes</button> <button bitButton buttonType="primary">Yes</button>
<button bitButton buttonType="secondary">No</button> <button bitButton buttonType="secondary">No</button>
</div> </ng-container>
</bit-simple-dialog> </bit-simple-dialog>
`, `,
}); });
@@ -68,10 +68,10 @@ const TemplateScroll: Story<SimpleDialogComponent> = (args: SimpleDialogComponen
</ng-container> </ng-container>
end of sequence! end of sequence!
</span> </span>
<div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2"> <ng-container bitDialogFooter>
<button bitButton buttonType="primary">Yes</button> <button bitButton buttonType="primary">Yes</button>
<button bitButton buttonType="secondary">No</button> <button bitButton buttonType="secondary">No</button>
</div> </ng-container>
</bit-simple-dialog> </bit-simple-dialog>
`, `,
}); });