Skip to content

Commit 701a247

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Additional small styling changes and fix build.
1 parent 3a62f4b commit 701a247

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,8 @@
577577
@extend %igx-grid__tr-pivot-group !optional
578578
}
579579

580-
@include e(tr-pivot, $m: 'columnLeaf') {
581-
@extend %igx-grid__tr-pivot--columnLeaf !optional
580+
@include e(tr-pivot, $m: 'columnDimensionLeaf') {
581+
@extend %igx-grid__tr-pivot--columnDimensionLeaf !optional
582582
}
583583

584584
@include e(tr-pivot, $m: 'columnMultiRowSpan') {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2978,8 +2978,11 @@
29782978
display: inline-flex !important;
29792979
}
29802980

2981-
%igx-grid__tr-pivot--columnLeaf {
2982-
box-shadow: none !important;
2981+
%igx-grid__tr-pivot--columnDimensionLeaf {
2982+
box-shadow: none;
2983+
igx-grid-header {
2984+
border: none;
2985+
}
29832986
}
29842987
%igx-grid__tr-pivot--columnMultiRowSpan {
29852988
igx-grid-header {

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,13 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
984984
super.setupColumns();
985985
}
986986

987+
/**
988+
* @hidden
989+
*/
990+
public get hasMultipleValues() {
991+
return this.values.length > 1;
992+
}
993+
987994
protected resolveToggle(groupColumn: IgxColumnComponent, state: boolean) {
988995
groupColumn.hidden = state;
989996
this.columnGroupStates.set(groupColumn.field, state);
@@ -1026,10 +1033,6 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
10261033
return dvl < this._defaultTargetRecordNumber ? 0 : this.defaultTargetBodyHeight;
10271034
}
10281035

1029-
protected get hasMultipleValues() {
1030-
return this.values.length > 1;
1031-
}
1032-
10331036
protected horizontalScrollHandler(event) {
10341037
const scrollLeft = event.target.scrollLeft;
10351038
this.theadRow.headerContainers.forEach(headerForOf => {

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
[ngStyle]="column.headerGroupStyles |igxHeaderGroupStyle:column:grid.pipeTrigger" [column]="column"
174174
[style.min-width]="column.calcWidth | igxHeaderGroupWidth:grid.defaultHeaderGroupMinWidth:hasMRL"
175175
[style.flex-basis]="column.calcWidth | igxHeaderGroupWidth:grid.defaultHeaderGroupMinWidth:hasMRL"
176-
[class.igx-grid__tr-pivot--columnLeaf] = 'isDuplicateOfExistingParent(column, i)'
176+
[class.igx-grid__tr-pivot--columnDimensionLeaf] = 'isDuplicateOfExistingParent(column, i)'
177177
[class.igx-grid__tr-pivot--columnMultiRowSpan] = 'isMultiRow(column, i)'
178178
>
179179
</igx-grid-header-group>

0 commit comments

Comments
 (0)