Skip to content

Commit acb229d

Browse files
authored
Merge pull request #7367 from IgniteUI/ibarakov/fix-7299-9.1.x
Implement support for up to 25 levels #7299
2 parents cfe159d + 2900c6d commit acb229d

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,11 +610,15 @@
610610
@include e(group-row, $m: padding-level-#{$i}) {
611611
@extend %igx-grid__group-row--padding-level-#{$i} !optional;
612612
}
613+
}
614+
615+
@for $i from 1 through 25 {
613616
@include e(tree-cell, $m: padding-level-#{$i}) {
614617
@extend %igx-grid__tree-cell--padding-level-#{$i} !optional;
615618
}
616619
}
617620

621+
618622
@include m(cosy) {
619623
@extend %grid-display !optional;
620624

@@ -714,6 +718,9 @@
714718
@include e(group-row, $m: padding-level-#{$i}) {
715719
@extend %igx-grid__group-row--padding-cosy-level-#{$i} !optional;
716720
}
721+
}
722+
723+
@for $i from 1 through 25 {
717724
@include e(tree-cell, $m: padding-level-#{$i}) {
718725
@extend %igx-grid__tree-cell-cosy--padding-level-#{$i} !optional;
719726
}
@@ -823,6 +830,9 @@
823830
@include e(group-row, $m: padding-level-#{$i}) {
824831
@extend %igx-grid__group-row-compact--padding-level-#{$i} !optional;
825832
}
833+
}
834+
835+
@for $i from 1 through 25 {
826836
@include e(tree-cell, $m: padding-level-#{$i}) {
827837
@extend %igx-grid__tree-cell-compact--padding-level-#{$i} !optional;
828838
}

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2200,10 +2200,6 @@
22002200
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'comfortable')};
22012201
}
22022202

2203-
%igx-grid__tree-cell--padding-level-#{$i} {
2204-
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'comfortable')};
2205-
}
2206-
22072203
// COSY
22082204
%igx-grid__row-indentation-cosy--level-#{$i} {
22092205
padding-#{$left}: calc(#{$i*map-get($grid-grouping-indicator-padding, 'cosy')} + #{$indicator-icon-width});
@@ -2213,10 +2209,6 @@
22132209
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'cosy')};
22142210
}
22152211

2216-
%igx-grid__tree-cell-cosy--padding-level-#{$i} {
2217-
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'cosy')};
2218-
}
2219-
22202212
// COMPACT
22212213
%igx-grid__row-indentation-compact--level-#{$i} {
22222214
padding-#{$left}: calc(#{$i*map-get($grid-grouping-indicator-padding, 'compact')} + #{$indicator-icon-width});
@@ -2225,6 +2217,16 @@
22252217
%igx-grid__group-row-compact--padding-level-#{$i} {
22262218
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'compact')};
22272219
}
2220+
}
2221+
2222+
@for $i from 1 through 25 {
2223+
%igx-grid__tree-cell--padding-level-#{$i} {
2224+
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'comfortable')};
2225+
}
2226+
2227+
%igx-grid__tree-cell-cosy--padding-level-#{$i} {
2228+
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'cosy')};
2229+
}
22282230

22292231
%igx-grid__tree-cell-compact--padding-level-#{$i} {
22302232
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'compact')};

0 commit comments

Comments
 (0)