Skip to content

Commit ff599c4

Browse files
authored
Merge branch 'vNext' into vkombov/update-batch-editing-remote-paging-sample-15
2 parents d8b27e0 + e15d032 commit ff599c4

46 files changed

Lines changed: 62 additions & 62 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

projects/app-crm/src/app/grid-crm/grid-crm.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<igx-column field="avatar" header="Photo" width="88" [pinned]="true" [resizable]="true" [searchable]="false" [filterable]="false">
6161
<ng-template igxCell let-cell="cell">
6262
<div class="cell__inner avatar-cell">
63-
<igx-avatar [src]="getPhoto(cell)" [roundShape]="true" size="small"></igx-avatar>
63+
<igx-avatar [src]="getPhoto(cell)" shape="circle" size="small"></igx-avatar>
6464
</div>
6565
</ng-template>
6666
</igx-column>

projects/app-lob/src/app/grid/grid-boston-marathon/grid.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h5 class="switch-sample__title">Boston Marathon 2020</h5>
3434
<igx-column field="Name" header="Athlete" [width]="athleteColumnWidth" [hasSummary]="true">
3535
<ng-template igxCell let-cell="cell">
3636
<div class="cell__inner">
37-
<igx-avatar [src]="cell.row.data.Avatar" [roundShape]="true" size="small"> </igx-avatar><span class="athlete_name">{{ cell.value }}</span>
37+
<igx-avatar [src]="cell.row.data.Avatar" shape="circle" size="small"> </igx-avatar><span class="athlete_name">{{ cell.value }}</span>
3838
<igx-badge *ngIf="live" [type]="getBadgeType(cell)" [icon]="getIconType(cell)"></igx-badge>
3939
</div>
4040

@@ -92,7 +92,7 @@ <h5 class="switch-sample__title">Boston Marathon 2020</h5>
9292
</div>
9393
<div class="s-overlay__players">
9494
<div class="s-overlay__player" [ngClass]="hasWinner ? 's-overlay__player--winner' : ''">
95-
<igx-avatar size="large" [roundShape]="true" [src]="winner.Avatar"></igx-avatar>
95+
<igx-avatar size="large" shape="circle" [src]="winner.Avatar"></igx-avatar>
9696
<p class="s-overlay__player-name">{{ winner.Name }}</p>
9797
</div>
9898
</div>
@@ -112,7 +112,7 @@ <h5 class="switch-sample__title">Boston Marathon 2020</h5>
112112
<span>{{i + 1}}</span>
113113
<img [src]="getTrophyUrl(i)" alt="First place Trophy image" />
114114
</div>
115-
<igx-avatar [size]="i === 0 ? 'large': 'medium'" [roundShape]="true" [src]="player.Avatar"></igx-avatar>
115+
<igx-avatar [size]="i === 0 ? 'large': 'medium'" shape="circle" [src]="player.Avatar"></igx-avatar>
116116
<p class="s-overlay__player-name">{{ player.Name }}</p>
117117
</div>
118118
</ng-container>

projects/app-lob/src/app/grid/grid-master-detail/grid-master-detail.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<div class="tabContent">
1717
<div class="avatarContainer">
1818
<igx-avatar src="{{dataItem.avatar}}"
19-
[roundShape]="false" size="large"></igx-avatar>
19+
shape="square" size="large"></igx-avatar>
2020
<h6>{{dataItem.name}}</h6>
2121
</div>
2222
<igx-divider [vertical]="true"></igx-divider>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<div class="wrapper">
2-
<igx-avatar icon="person" [roundShape]="true" size="small"></igx-avatar>
3-
<igx-badge icon="check" type="success"></igx-badge>
2+
<igx-avatar icon="person" shape="circle" size="small"></igx-avatar>
3+
<igx-badge icon="check" type="success" shape="square"></igx-badge>
44
</div>

src/app/data-display/badge/badge-sample-3/badge-sample-3.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<igx-list-item *ngFor="let member of members">
66
<div class="wrapper">
77
<div>
8-
<igx-avatar icon="person" [roundShape]="true" size="small"></igx-avatar>
8+
<igx-avatar icon="person" shape="circle" size="small"></igx-avatar>
99
<igx-badge [icon]="member.icon" [type]="member.type" class="badge-style"></igx-badge>
1010
</div>
1111
<div class="contact-container">

src/app/data-display/badge/badge-styling-sample/badge-styling-sample.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<igx-list-item *ngFor="let member of members">
66
<div class="wrapper">
77
<div>
8-
<igx-avatar icon="person" [roundShape]="true" size="small"></igx-avatar>
8+
<igx-avatar icon="person" shape="circle" size="small"></igx-avatar>
99
<igx-badge [icon]="member.icon" [type]="member.type" class="badge-style"></igx-badge>
1010
</div>
1111
<div class="contact-container">

src/app/data-display/chip/chip-area-sample/chip-area-sample.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
class="chip-avatar-resized"
1414
igxPrefix
1515
[src]="chip.photo"
16-
[roundShape]="true"
16+
shape="circle"
1717
></igx-avatar>
1818
{{chip.name}}
1919
</igx-chip>

src/app/data-display/igxFor/igxFor-horizontal-sample/igxFor-horizontal.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*igxFor="let item of data | igxFilter: fo; scrollOrientation : 'horizontal'; containerSize: '880px'; itemSize: '220px'">
2323
<div class="item-container">
2424
<div class="contact">
25-
<igx-avatar [src]="item.avatar" [roundShape]="true"></igx-avatar>
25+
<igx-avatar [src]="item.avatar" shape="circle"></igx-avatar>
2626
<div class="contact__info">
2727
<span class="name">{{item.name}}</span>
2828
</div>

src/app/data-display/igxFor/igxFor.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
igxRipple="pink"
1919
igxRippleTarget=".igx-list__item"
2020
*igxFor="let item of data | igxFilter: fo; scrollOrientation : 'vertical'; containerSize: '500px'; itemSize: '50px'">
21-
<igx-avatar igxListThumbnail [src]="item.avatar" [roundShape]="true"></igx-avatar>
21+
<igx-avatar igxListThumbnail [src]="item.avatar" shape="circle"></igx-avatar>
2222
<span igxListLineTitle>{{ item.name }}</span>
2323
<igx-icon igxListAction [style.color]="item.favorite ? 'orange' : 'lightgray'" (click)="toggleFavorite(item)">star</igx-icon>
2424
</igx-list-item>

src/app/grid/grid-sample-right-pinning/grid-right-pinning.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<igx-column field="Avatar" header="Photo" dataType="string" width="80" [disablePinning]="true">
2020
<ng-template igxCell let-cell="cell">
2121
<div class="cell__inner avatar-cell">
22-
<igx-avatar [src]="cell.row.data.Avatar" [roundShape]="true" size="small"></igx-avatar>
22+
<igx-avatar [src]="cell.row.data.Avatar" shape="circle" size="small"></igx-avatar>
2323
</div>
2424
</ng-template>
2525
</igx-column>

0 commit comments

Comments
 (0)