Skip to content

Commit 4cd09d5

Browse files
authored
Merge branch 'vNext' into sivanova/fix-banner-samples
2 parents 326790c + 3409bd9 commit 4cd09d5

68 files changed

Lines changed: 906 additions & 890 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.

package-lock.json

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

package.json

Lines changed: 11 additions & 11 deletions
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.0",
65+
"igniteui-angular": "^13.0.0-rc.1",
6666
"igniteui-angular-charts": "^12.1.1",
6767
"igniteui-angular-core": "^12.1.1",
6868
"igniteui-angular-i18n": "^12.2.4",
@@ -80,24 +80,24 @@
8080
},
8181
"devDependencies": {
8282
"@angular-devkit/build-angular": "^13.0.1",
83-
"@angular-eslint/builder": "^13.0.0-alpha.0",
84-
"@angular-eslint/eslint-plugin": "^12.6.1",
85-
"@angular-eslint/eslint-plugin-template": "^12.6.1",
86-
"@angular-eslint/schematics": "12.6.1",
87-
"@angular-eslint/template-parser": "^12.6.1",
83+
"@angular-eslint/builder": "^13.0.1",
84+
"@angular-eslint/eslint-plugin": "^13.0.1",
85+
"@angular-eslint/eslint-plugin-template": "^13.0.1",
86+
"@angular-eslint/schematics": "13.0.1",
87+
"@angular-eslint/template-parser": "^13.0.1",
8888
"@angular/cli": "^13.0.1",
8989
"@angular/compiler-cli": "^13.0.0",
9090
"@angular/language-service": "^13.0.0",
91-
"@igniteui/angular-schematics": "^12.2.821",
91+
"@igniteui/angular-schematics": "^13.0.900-rc.2",
9292
"@juggle/resize-observer": "^3.3.1",
9393
"@types/jasmine": "^3.10.2",
9494
"@types/jasminewd2": "^2.0.9",
9595
"@types/node": "^13.13.52",
96-
"@typescript-eslint/eslint-plugin": "4.28.2",
97-
"@typescript-eslint/parser": "4.28.2",
96+
"@typescript-eslint/eslint-plugin": "5.3.0",
97+
"@typescript-eslint/parser": "5.3.0",
9898
"codelyzer": "^6.0.2",
99-
"eslint": "^7.32.0",
100-
"eslint-plugin-import": "2.22.1",
99+
"eslint": "^8.2.0",
100+
"eslint-plugin-import": "2.25.2",
101101
"eslint-plugin-jsdoc": "30.7.6",
102102
"eslint-plugin-prefer-arrow": "1.2.2",
103103
"event-stream": "^4.0.1",

projects/app-crm/src/_variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '~igniteui-angular/lib/core/styles/themes/index' as *;
2-
@forward '~igniteui-angular/lib/core/styles/themes/index';
1+
@use 'igniteui-angular/theming' as *;
2+
@forward 'igniteui-angular/theming';
33

44

55
$legacy-support: true;

projects/app-crm/src/styles.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
@use '~igniteui-angular/lib/core/styles/themes/index' as *;
2-
@forward '~igniteui-angular/lib/core/styles/themes/index';
1+
@use 'igniteui-angular/theming' as *;
32
@use 'variables' as *;
43
@use 'app-layout';
5-
64
@include igx-core();
75
@include igx-typography();
86
@include igx-theme(

projects/app-lob/src/_variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use '~igniteui-angular/lib/core/styles/themes/index' as *;
2-
@forward '~igniteui-angular/lib/core/styles/themes/index';
1+
@use 'igniteui-angular/theming' as *;
2+
@forward 'igniteui-angular/theming';
33

44
$legacy-support: true;
55
$palette: $light-material-palette;

projects/app-lob/src/app/grid-finjs-dock-manager/grid-finjs-dock-manager.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,4 @@
156156
color: #fff;
157157
}
158158
}
159-
}
159+
}

projects/app-lob/src/app/grid-finjs/grid-finjs.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export class GridFinJSComponent implements OnInit {
9393
const type = args.targetType;
9494

9595
if (type === 'dataCell' && target.column.field === 'Chart' && evt.key.toLowerCase() === 'enter') {
96-
this.grid.selectRows([target.row.rowID], true);
96+
this.grid.selectRows([target.row.key], true);
9797
this.chartColumnAction(target);
9898
}
9999
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export class GridComponent implements OnInit, OnDestroy, AfterViewInit {
128128

129129
public cellSelection(evt) {
130130
const cell = evt.cell;
131-
this.grid1.selectRows([cell.row.rowID], true);
131+
this.grid1.selectRows([cell.row.key], true);
132132
}
133133

134134
public getIconType(cell) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
::ng-deep {
22
.custom-body {
33
color: var(--igx-surface-500-contrast);
4-
background: var(--igx-surface-500);
4+
background: hsla(var(--igx-surface-500));
55
}
66
}

projects/app-lob/src/app/treegrid-finjs/tree-grid-finjs-sample.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
[filterMode]="'excelStyleFilter'">
3939
<igx-grid-toolbar *ngIf="showToolbar">
4040
<igx-grid-toolbar-actions>
41+
<igx-grid-toolbar-pinning></igx-grid-toolbar-pinning>
4142
<igx-grid-toolbar-hiding title="Indicators"></igx-grid-toolbar-hiding>
4243
<igx-grid-toolbar-exporter [exportCSV]="false"></igx-grid-toolbar-exporter>
4344
</igx-grid-toolbar-actions>

0 commit comments

Comments
 (0)