Skip to content

Commit 061206f

Browse files
author
Konstantin Dinev
committed
Merge branch 'sstoychev/update-to-20' of https://github.com/IgniteUI/igniteui-angular into sstoychev/update-to-20
2 parents 8d22793 + 1fbdf80 commit 061206f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

angular.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@
192192
"hammerjs"
193193
],
194194
"styles": [
195-
"src/styles/styles.scss"
195+
"src/styles/styles.scss",
196+
"projects/igniteui-angular/test.css"
196197
],
197198
"assets": [
198199
"projects/igniteui-angular/src/assets"
@@ -401,7 +402,8 @@
401402
"tsConfig": "projects/bundle-test/tsconfig.app.json",
402403
"inlineStyleLanguage": "scss",
403404
"styles": [
404-
"projects/bundle-test/src/styles.scss"
405+
"projects/bundle-test/src/styles.scss",
406+
"projects/igniteui-angular/test.css"
405407
],
406408
"scripts": [],
407409
"stylePreprocessorOptions": {

projects/igniteui-angular/src/lib/grids/grid/cell.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ describe('IgxGrid - Cell component #grid', () => {
151151
});
152152
});
153153

154-
describe('Cells in virtualized grid ', () => {
154+
xdescribe('Cells in virtualized grid ', () => {
155155
let fix;
156156
let grid: IgxGridComponent;
157157

0 commit comments

Comments
 (0)