Skip to content

Commit a4f81eb

Browse files
authored
Merge branch 'master' into nrobakova/hgrid-rowSelection-tests
2 parents 6817fcc + 18e984b commit a4f81eb

File tree

7 files changed

+7
-11
lines changed

7 files changed

+7
-11
lines changed

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@
603603
overflow: hidden;
604604
box-shadow: $grid-shadow;
605605
outline-style: none;
606-
z-index: 0;
606+
z-index: 1;
607607
border: $grid-border-width solid --var($theme, 'grid-border-color');
608608

609609
%cbx-display {

projects/igniteui-angular/src/lib/grids/hierarchical-grid/child-grid-row.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
} from '@angular/core';
1414
import { GridBaseAPIService } from '.././api.service';
1515
import { IgxRowIslandComponent } from './row-island.component';
16-
import { IgxGridComponent } from '../grid';
16+
import { IgxGridComponent } from '../grid/grid.component';
1717
import { takeUntil } from 'rxjs/operators';
1818

1919
@Component({

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { CommonModule } from '@angular/common';
22
import { NgModule } from '@angular/core';
33
import { FormsModule } from '@angular/forms';
44
import { IgxChipsModule } from '../../chips/chips.module';
5-
import { IgxGridCommonModule } from '../grid-common.module';
65
import { IgxGridModule } from '../grid/grid.module';
76
import { IgxHierarchicalGridComponent } from './hierarchical-grid.component';
87
import { IgxHierarchicalRowComponent } from './hierarchical-row.component';
@@ -13,7 +12,7 @@ import { IgxHierarchicalGridCellComponent } from './hierarchical-cell.component'
1312
import { IgxHierarchicalSelectionAPIService } from './selection';
1413
import { IgxRowIslandAPIService } from './row-island-api.service';
1514
import { IgxSelectModule } from '../../select/index';
16-
import { IgxGridComponent } from '../grid';
15+
import { IgxGridComponent } from '../grid/grid.component';
1716

1817
/**
1918
* @hidden

src/app/grid-auto-size/grid-auto-size.sample.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
[filterMode]="'excelStyleFilter'"
3333
[paging]="false"
3434
[width]="'800px'"
35-
[height]="height"
36-
[style.zIndex]="'1'">
35+
[height]="height">
3736
<igx-column *ngFor="let c of columns" [field]="c.field"
3837
[header]="c.field"
3938
[movable]="c.movable"

src/app/grid-column-moving/grid-column-moving.sample.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
[filterMode]="'excelStyleFilter'"
2222
[paging]="false"
2323
[width]="'900px'"
24-
[height]="'800px'"
25-
[style.zIndex]="'1'">
24+
[height]="'800px'">
2625
<igx-column *ngFor="let c of columns" [field]="c.field"
2726
[header]="c.field"
2827
[movable]="c.movable"

src/app/grid-filter-template/grid-filter-template.sample.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
[rowSelectable]="true"
1313
[paging]="false"
1414
[width]="'900px'"
15-
[height]="'800px'"
16-
[style.zIndex]="'1'">
15+
[height]="'800px'">
1716
<igx-column *ngFor="let c of columns" [field]="c.field"
1817
[header]="c.field"
1918
[movable]="c.movable"

src/app/tree-grid/tree-grid.sample.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
rowSelectable="true" [paging]="false" [displayDensity]="density" [width]="'900px'" [height]="'500px'"
1717
[showToolbar]="true" [columnHiding]="true" [columnPinning]="true" [exportExcel]="true" [exportCsv]="true"
1818
exportText="Export" exportExcelText="Export to Excel" exportCsvText="Export to CSV" [allowFiltering]="true"
19-
[filterMode]="'excelStyleFilter'" [style.zIndex]="'1'">
19+
[filterMode]="'excelStyleFilter'">
2020
<igx-column *ngFor="let c of columns" [field]="c.field" [header]="c.field" [pinned]="c.pinned"
2121
[movable]="c.movable" [groupable]="false" [resizable]="c.resizable" [width]="c.width"
2222
[sortable]="true" [filterable]="true" [editable]="true" [hidden]="c.hidden" [hasSummary]="c.summary"

0 commit comments

Comments
 (0)