Skip to content

Commit dc88a03

Browse files
authored
Merge pull request #7364 from IgniteUI/ibarakov/fix-7299-9.0.x
Implement support for up to 25 levels #7299
2 parents 25a2f68 + b1b9fa8 commit dc88a03

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
@@ -527,11 +527,15 @@
527527
@include e(group-row, $m: padding-level-#{$i}) {
528528
@extend %igx-grid__group-row--padding-level-#{$i} !optional;
529529
}
530+
}
531+
532+
@for $i from 1 through 25 {
530533
@include e(tree-cell, $m: padding-level-#{$i}) {
531534
@extend %igx-grid__tree-cell--padding-level-#{$i} !optional;
532535
}
533536
}
534537

538+
535539
@include m(cosy) {
536540
@extend %grid-display !optional;
537541

@@ -626,6 +630,9 @@
626630
@include e(group-row, $m: padding-level-#{$i}) {
627631
@extend %igx-grid__group-row--padding-cosy-level-#{$i} !optional;
628632
}
633+
}
634+
635+
@for $i from 1 through 25 {
629636
@include e(tree-cell, $m: padding-level-#{$i}) {
630637
@extend %igx-grid__tree-cell-cosy--padding-level-#{$i} !optional;
631638
}
@@ -726,6 +733,9 @@
726733
@include e(group-row, $m: padding-level-#{$i}) {
727734
@extend %igx-grid__group-row-compact--padding-level-#{$i} !optional;
728735
}
736+
}
737+
738+
@for $i from 1 through 25 {
729739
@include e(tree-cell, $m: padding-level-#{$i}) {
730740
@extend %igx-grid__tree-cell-compact--padding-level-#{$i} !optional;
731741
}

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
@@ -2073,10 +2073,6 @@
20732073
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'comfortable')};
20742074
}
20752075

2076-
%igx-grid__tree-cell--padding-level-#{$i} {
2077-
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'comfortable')};
2078-
}
2079-
20802076
// COSY
20812077
%igx-grid__row-indentation-cosy--level-#{$i} {
20822078
padding-#{$left}: calc(#{$i*map-get($grid-grouping-indicator-padding, 'cosy')} + #{$indicator-icon-width});
@@ -2086,10 +2082,6 @@
20862082
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'cosy')};
20872083
}
20882084

2089-
%igx-grid__tree-cell-cosy--padding-level-#{$i} {
2090-
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'cosy')};
2091-
}
2092-
20932085
// COMPACT
20942086
%igx-grid__row-indentation-compact--level-#{$i} {
20952087
padding-#{$left}: calc(#{$i*map-get($grid-grouping-indicator-padding, 'compact')} + #{$indicator-icon-width});
@@ -2098,6 +2090,16 @@
20982090
%igx-grid__group-row-compact--padding-level-#{$i} {
20992091
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'compact')};
21002092
}
2093+
}
2094+
2095+
@for $i from 1 through 25 {
2096+
%igx-grid__tree-cell--padding-level-#{$i} {
2097+
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'comfortable')};
2098+
}
2099+
2100+
%igx-grid__tree-cell-cosy--padding-level-#{$i} {
2101+
padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'cosy')};
2102+
}
21012103

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

0 commit comments

Comments
 (0)