Merge branch '9.0.x' into slider-two-way-9.0.x

Author: kdinev

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

@@ -527,11 +527,15 @@
         @include e(group-row, $m: padding-level-#{$i}) {
             @extend %igx-grid__group-row--padding-level-#{$i} !optional;
         }
+    }
+
+    @for $i from 1 through 25 {
         @include e(tree-cell, $m: padding-level-#{$i}) {
             @extend %igx-grid__tree-cell--padding-level-#{$i} !optional;
         }
     }
 
+
     @include m(cosy) {
         @extend %grid-display !optional;
 
@@ -626,6 +630,9 @@
             @include e(group-row, $m: padding-level-#{$i}) {
                 @extend %igx-grid__group-row--padding-cosy-level-#{$i} !optional;
             }
+        }
+
+        @for $i from 1 through 25 {
             @include e(tree-cell, $m: padding-level-#{$i}) {
                 @extend %igx-grid__tree-cell-cosy--padding-level-#{$i} !optional;
             }
@@ -726,6 +733,9 @@
             @include e(group-row, $m: padding-level-#{$i}) {
                 @extend %igx-grid__group-row-compact--padding-level-#{$i} !optional;
             }
+        }
+
+        @for $i from 1 through 25 {
             @include e(tree-cell, $m: padding-level-#{$i}) {
                 @extend %igx-grid__tree-cell-compact--padding-level-#{$i} !optional;
             }

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

@@ -2073,10 +2073,6 @@
             padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'comfortable')};
         }
 
-        %igx-grid__tree-cell--padding-level-#{$i} {
-            padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'comfortable')};
-        }
-
         // COSY
         %igx-grid__row-indentation-cosy--level-#{$i} {
             padding-#{$left}: calc(#{$i*map-get($grid-grouping-indicator-padding, 'cosy')} + #{$indicator-icon-width});
@@ -2086,10 +2082,6 @@
             padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'cosy')};
         }
 
-        %igx-grid__tree-cell-cosy--padding-level-#{$i} {
-            padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'cosy')};
-        }
-
         // COMPACT
         %igx-grid__row-indentation-compact--level-#{$i} {
             padding-#{$left}: calc(#{$i*map-get($grid-grouping-indicator-padding, 'compact')} + #{$indicator-icon-width});
@@ -2098,6 +2090,16 @@
         %igx-grid__group-row-compact--padding-level-#{$i} {
             padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'compact')};
         }
+    }
+
+    @for $i from 1 through 25 {
+        %igx-grid__tree-cell--padding-level-#{$i} {
+            padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'comfortable')};
+        }
+
+        %igx-grid__tree-cell-cosy--padding-level-#{$i} {
+            padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'cosy')};
+        }
 
         %igx-grid__tree-cell-compact--padding-level-#{$i} {
             padding-#{$left}: #{$i*map-get($grid-grouping-indicator-padding, 'compact')};