Skip to content

Commit

Permalink
Merge branch 'master' into accessibility
Browse files Browse the repository at this point in the history
  • Loading branch information
cetincakiroglu committed Nov 20, 2023
1 parent 6988196 commit d31a7e6
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 358 deletions.
1 change: 1 addition & 0 deletions src/app/components/panel/panel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import { PanelAfterToggleEvent, PanelBeforeToggleEvent } from './panel.interface
role="region"
[attr.aria-labelledby]="id + '_header'"
[attr.aria-hidden]="collapsed"
[attr.tabindex]="collapsed ? '-1' : undefined"
[@panelContent]="
collapsed
? { value: 'hidden', params: { transitionParams: animating ? transitionOptions : '0ms', height: '0', opacity: '0' } }
Expand Down
8 changes: 4 additions & 4 deletions src/app/showcase/data/news.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"id": 58,
"content": "Sakai Free Admin Template",
"linkText": "Learn More",
"linkHref": "https://primefaces.org/sakai-ng",
"id": 59,
"content": "🎉 Black Friday Sale! Up to 50% Off",
"linkText": "Buy Now",
"linkHref": "https://www.primefaces.org/store",
"backgroundStyle": "background-color:#3B82F6",
"textStyle": "color:#ffffff;font-weight:500",
"linkStyle": "color:#ffffff;font-weight:700",
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/contextmenu/contextmenudoc.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ import { BasicDoc } from './basicdoc';
import { DocumentDoc } from './documentdoc';
import { ImportDoc } from './importdoc';
import { StyleDoc } from './styledoc';
import { TriggerEventDoc } from './triggereventdoc';

@NgModule({
imports: [CommonModule, AppCodeModule, RouterModule, ContextMenuModule, AppDocModule],
declarations: [BasicDoc, ImportDoc, DocumentDoc, StyleDoc, TriggerEventDoc, AccessibilityDoc],
declarations: [BasicDoc, ImportDoc, DocumentDoc, StyleDoc, AccessibilityDoc],
exports: [AppDocModule]
})
export class ContextMenuDocModule {}
318 changes: 0 additions & 318 deletions src/app/showcase/doc/contextmenu/triggereventdoc.ts

This file was deleted.

12 changes: 6 additions & 6 deletions src/app/showcase/doc/galleria/fullscreen/customcontentdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import { PhotoService } from '../../../service/photoservice';
<app-docsectiontext [title]="title" [id]="id" [level]="3" #docsectiontext>
<p>Using <i>activeIndex</i>, Galleria is displayed with a specific initial image.</p>
</app-docsectiontext>
<div class="card md:flex md:justify-content-center">
<div *ngIf="images" class="grid" style="max-width: 400px;">
<div *ngFor="let image of images; let index = index" class="col-4" key="index">
<div class="card">
<div *ngIf="images" class="grid" style="max-width: 800px;">
<div *ngFor="let image of images; let index = index" class="col-3" key="index">
<img [src]="image.thumbnailImageSrc" [alt]="image.alt" style="cursor: pointer" (click)="imageClick(index)" />
</div>
</div>
Expand Down Expand Up @@ -98,9 +98,9 @@ export class FullScreenTemplateDoc implements OnInit {
</p-galleria>
`,
html: `
<div class="card md:flex md:justify-content-center">
<div *ngIf="images" class="grid" style="max-width: 400px;">
<div *ngFor="let image of images; let index = index" class="col-4" key="index">
<div class="card">
<div *ngIf="images" class="grid" style="max-width: 800px;">
<div *ngFor="let image of images; let index = index" class="col-3" key="index">
<img [src]="image.thumbnailImageSrc" [alt]="image.alt" style="cursor: pointer" (click)="imageClick(index)" />
</div>
</div>
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/multiselect/basicdoc.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Component, Input, OnInit } from '@angular/core';
import { Code } from '../../domain/code';
import { FormGroup, FormControl } from '@angular/forms';

interface City {
name: string;
Expand All @@ -18,7 +17,7 @@ interface City {
</p>
</app-docsectiontext>
<div class="card flex justify-content-center">
<p-multiSelect [options]="cities" [(ngModel)]="selectedCities" optionLabel="name" placeholder="Select Cities"></p-multiSelect>
<p-multiSelect [options]="cities" [(ngModel)]="selectedCities" optionLabel="name" [showClear]="true" placeholder="Select Cities"></p-multiSelect>
</div>
<app-code [code]="code" selector="multi-select-basic-demo"></app-code>
</section>`
Expand Down
Loading

0 comments on commit d31a7e6

Please sign in to comment.