Skip to content

Commit 8dd56fc

Browse files
zdrawkuzdrawku
authored
Merge pull request #2881 from IgniteUI/update-to-1300
Upgrade to version 13
2 parents 607ca76 + 085c506 commit 8dd56fc

12 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"domino": "^2.1.4",
6363
"file-saver": "^2.0.2",
6464
"hammerjs": "^2.0.8",
65-
"igniteui-angular": "^13.0.0-rc.1",
65+
"igniteui-angular": "^13.0.0",
6666
"igniteui-angular-charts": "^12.1.1",
6767
"igniteui-angular-core": "^12.1.1",
6868
"igniteui-angular-i18n": "^12.2.4",

‎src/app/data-display/icon/icon-sample-3/icon-sample-3.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<igx-icon color="#e41c77">home</igx-icon>
1+
<igx-icon>home</igx-icon>

‎src/app/grid/grid-sample-3/grid-sample-3.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</ng-template>
1010
<ng-template igxHeader let-col>
1111
<div class="header-text">{{col.field}}</div>
12-
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#e41c77' : '' }}" (click)="toggleSummary(col)">functions</igx-icon>
12+
<igx-icon class="header-icon" (click)="toggleSummary(col)">functions</igx-icon>
1313
</ng-template>
1414
</igx-column>
1515
<igx-column #col field="UnitPrice" header="Price" [filterable]="false" width="17%" editable="true" dataType="number"
@@ -19,7 +19,7 @@
1919
</ng-template>
2020
<ng-template igxHeader let-col>
2121
<div class="header-text">{{col.field}}</div>
22-
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#e41c77' : '' }}" (click)="toggleSummary(col)">functions</igx-icon>
22+
<igx-icon class="header-icon" (click)="toggleSummary(col)">functions</igx-icon>
2323
</ng-template>
2424
</igx-column>
2525
<igx-column #col field="UnitsInStock" header="Units In Stock" width="17%" dataType="number" editable="true"
@@ -29,7 +29,7 @@
2929
</ng-template>
3030
<ng-template igxHeader let-col>
3131
<div class="header-text">{{col.field}}</div>
32-
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#e41c77' : '' }}" (click)="toggleSummary(col)">functions</igx-icon>
32+
<igx-icon class="header-icon" (click)="toggleSummary(col)">functions</igx-icon>
3333
</ng-template>
3434
</igx-column>
3535
<igx-column #col field="Discontinued" header="Discontinued" width="17%" [hasSummary]="true" [dataType]="'boolean'">
@@ -39,7 +39,7 @@
3939
</ng-template>
4040
<ng-template igxHeader let-col>
4141
<div class="header-text">{{col.field}}</div>
42-
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#e41c77' : '' }}" (click)="toggleSummary(col)">functions</igx-icon>
42+
<igx-icon class="header-icon" (click)="toggleSummary(col)">functions</igx-icon>
4343
</ng-template>
4444
</igx-column>
4545
<igx-column #col field="OrderDate" width="15%" [dataType]="'date'" [hasSummary]="true">
@@ -48,7 +48,7 @@
4848
</ng-template>
4949
<ng-template igxHeader let-col>
5050
<div class="header-text">{{col.field}}</div>
51-
<igx-icon class="header-icon" color="{{ col.hasSummary ? '#e41c77' : '' }}" (click)="toggleSummary(col)">functions</igx-icon>
51+
<igx-icon class="header-icon" (click)="toggleSummary(col)">functions</igx-icon>
5252
</ng-template>
5353
</igx-column>
5454
</igx-grid>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@
4646
<ng-template igxHeader>
4747
<div class="title-inner">
4848
<span style="float:left">{{ goldColumn.header }}</span>
49-
<igx-icon color="#d2c206">emoji_events</igx-icon>
49+
<igx-icon>emoji_events</igx-icon>
5050
</div>
5151
</ng-template>
5252
</igx-column>
5353
<igx-column #silverColumn field="SecondPlaces" header="Silver" width="110" [pinned]="true">
5454
<ng-template igxHeader>
5555
<div class="title-inner">
5656
<span style="float:left">{{ silverColumn.header }}</span>
57-
<igx-icon color="#c5c5c5">emoji_events</igx-icon>
57+
<igx-icon>emoji_events</igx-icon>
5858
</div>
5959
</ng-template>
6060
</igx-column>
6161
<igx-column #bronzeColumn field="ThirdPlaces" header="Bronze" width="110" [pinned]="true">
6262
<ng-template igxHeader>
6363
<div class="title-inner">
6464
<span style="float:left">{{ bronzeColumn.header }}</span>
65-
<igx-icon color="#bb8b1d">emoji_events</igx-icon>
65+
<igx-icon>emoji_events</igx-icon>
6666
</div>
6767
</ng-template>
6868
</igx-column>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,23 @@
4343
<ng-template igxHeader>
4444
<div class="title-inner">
4545
<span style="float:left">{{ goldColumn.header }}</span>
46-
<igx-icon color="#d2c206">emoji_events</igx-icon>
46+
<igx-icon>emoji_events</igx-icon>
4747
</div>
4848
</ng-template>
4949
</igx-column>
5050
<igx-column #silverColumn field="SecondPlaces" header="Silver" width="110" [pinned]="true">
5151
<ng-template igxHeader>
5252
<div class="title-inner">
5353
<span style="float:left">{{ silverColumn.header }}</span>
54-
<igx-icon color="#c5c5c5">emoji_events</igx-icon>
54+
<igx-icon>emoji_events</igx-icon>
5555
</div>
5656
</ng-template>
5757
</igx-column>
5858
<igx-column #bronzeColumn field="ThirdPlaces" header="Bronze" width="110" [pinned]="true">
5959
<ng-template igxHeader>
6060
<div class="title-inner">
6161
<span style="float:left">{{ bronzeColumn.header }}</span>
62-
<igx-icon color="#bb8b1d">emoji_events</igx-icon>
62+
<igx-icon>emoji_events</igx-icon>
6363
</div>
6464
</ng-template>
6565
</igx-column>

‎src/app/interactions/tooltip/tooltip-rich/tooltip-rich.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="map">
2-
<igx-icon class="location" color="blue" family="material" [igxTooltipTarget]="locationTooltip">location_on</igx-icon>
2+
<igx-icon class="location" family="material" [igxTooltipTarget]="locationTooltip">location_on</igx-icon>
33

44
<div class="locationTooltip" #locationTooltip="tooltip" igxTooltip>
55
<div class="locationTooltipContent">

‎src/app/layouts/card/card-styling-sample/card-styling-sample.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h5 igxCardHeaderSubtitle>{{ card.subtitle }}</h5>
1818
igxRipple
1919
igxRippleCentered="true"
2020
*ngFor="let icon of card.icons">
21-
<igx-icon color="#ECAA53">{{icon}}</igx-icon>
21+
<igx-icon>{{icon}}</igx-icon>
2222
</button>
2323
</igx-card-actions>
2424

‎src/app/notifications/snackbar/snackbar-sample-4/snackbar-sample-4.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<igx-avatar igxListThumbnail [src]="item.avatar" roundShape="true"></igx-avatar>
77
<span igxListLineTitle class="name">{{item.text}}</span>
88
<span igxListAction igxButton="icon" igxRipple igxRippleCentered="true" (click)="delete(item)">
9-
<igx-icon color="#ff5252">delete</igx-icon>
9+
<igx-icon>delete</igx-icon>
1010
</span>
1111
</igx-list-item>
1212

‎src/app/pagination/paginator/pagination-sample.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h5 igxCardHeaderSubtitle>Price: {{ product.UnitPrice | currency:'USD' }}</h5>
2020
igxRipple
2121
igxRippleCentered="true"
2222
*ngFor="let icon of product.icons">
23-
<igx-icon color="#ECAA53">{{icon}}</igx-icon>
23+
<igx-icon>{{icon}}</igx-icon>
2424
</button>
2525
</igx-card-actions>
2626
</igx-card>

0 commit comments

Comments
 (0)