Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/primefaces/primeng
Browse files Browse the repository at this point in the history
  • Loading branch information
cetincakiroglu committed Oct 11, 2023
2 parents 3efec66 + d21d550 commit e4afa61
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 105 deletions.
1 change: 1 addition & 0 deletions src/app/components/menu/menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,7 @@ export class Menu implements OnDestroy {
DomHandler.focus(this.target);
this.hide();
}
break;

case 'Tab':
this.overlayVisible && this.hide();
Expand Down
6 changes: 3 additions & 3 deletions src/app/showcase/doc/button/badgedoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Code } from '../../domain/code';
</app-docsectiontext>
<div class="card flex justify-content-center">
<p-button label="Emails" badge="8"></p-button>
<p-button label="Messages" icon="pi pi-users" styleClass="p-button-warning" badge="8" badgeClass="p-badge-danger"></p-button>
<p-button label="Messages" icon="pi pi-users" severity="warning" badge="8" badgeClass="p-badge-danger"></p-button>
</div>
<app-code [code]="code" selector="button-badge-demo"></app-code>
</section>`
Expand All @@ -22,12 +22,12 @@ export class BadgeDoc {
code: Code = {
basic: `
<p-button label="Emails" badge="8"></p-button>
<p-button label="Messages" icon="pi pi-users" styleClass="p-button-warning" badge="8" badgeClass="p-badge-danger"></p-button>`,
<p-button label="Messages" icon="pi pi-users" severity="warning" badge="8" badgeClass="p-badge-danger"></p-button>`,

html: `
<div class="card flex justify-content-center">
<p-button label="Emails" badge="8"></p-button>
<p-button label="Messages" icon="pi pi-users" styleClass="p-button-warning" badge="8" badgeClass="p-badge-danger"></p-button>
<p-button label="Messages" icon="pi pi-users" severity="warning" badge="8" badgeClass="p-badge-danger"></p-button>
</div>`,

typescript: `
Expand Down
Loading

0 comments on commit e4afa61

Please sign in to comment.