Merge branch 'master' into sstoychev/update-to-21

Author: ChronosSF

projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss

@@ -210,12 +210,24 @@
             color: var-get($theme, 'clear-button-foreground-focus');
             background: var-get($theme, 'clear-button-background-focus');
         }
+
+        &%form-group-bundle--border {
+            %igx-combo__toggle-button {
+                background: var-get($theme, 'toggle-button-background-focus--border');
+            }
+        }
     }
 
     @if $variant == 'indigo' {
         %form-group-bundle:not(%form-group-bundle--disabled):hover {
             %igx-combo__toggle-button {
                 color: var-get($theme, 'toggle-button-foreground-focus');
+                background: var-get($theme, 'toggle-button-background-focus');
+            }
+
+            %igx-combo__clear-button {
+                color: var-get($theme, 'clear-button-foreground-focus');
+                background: var-get($theme, 'clear-button-background-focus');
             }
         }
     }
@@ -224,6 +236,14 @@
         %igx-combo__toggle-button {
             color: var-get($theme, 'toggle-button-foreground-filled');
         }
+
+        @if $variant == 'material' {
+            &.igx-input-group--focused {
+                %igx-combo__toggle-button {
+                    color: var-get($theme, 'toggle-button-foreground-filled');
+                }
+            }
+        }
     }
 
     .igx-input-group--focused {
@@ -254,14 +274,6 @@
         }
     }
 
-    //.igx-input-group:not(.igx-input-group--box) {
-    //    %igx-combo__toggle-button:focus {
-    //        @if $variant == 'material' {
-    //            background: var-get($theme, 'toggle-button-background-focus--border');
-    //        }
-    //    }
-    //}
-
     .igx-input-group--disabled {
         %igx-combo__toggle-button {
             background: var-get($theme, 'toggle-button-background-disabled') !important;
@@ -274,12 +286,4 @@
             }
         }
     }
-
-    %form-group-bundle {
-        &:hover {
-            %igx-combo__clear-button {
-                color: inherit;
-            }
-        }
-    }
 }

projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss

@@ -229,7 +229,8 @@
             display: none;
         }
 
-        > * {
+        > *,
+        [class^='igx'] {
             --component-size: #{if($variant == 'indigo', 2, var(--list-size))};
         }
 

projects/igniteui-angular/src/lib/core/styles/components/navbar/_navbar-theme.scss

@@ -38,6 +38,11 @@
             igx-input-group {
                 --ig-size: 1;
             }
+
+            .igx-icon-button,
+            igc-icon-button {
+                --ig-size: 2;
+            }
         }
 
         @if $variant == 'bootstrap' {
@@ -114,30 +119,27 @@
 
         igx-icon,
         igc-icon {
-            --component-size: 3;
+            --component-size: #{if($variant == 'indigo', 2, 3)};
 
             cursor: pointer;
             user-select: none;
             transition: color .15s $out-quad;
+
+            @if $variant == 'indigo' {
+                width: auto;
+                height: auto;
+                padding: rem(6px);
+            }
         }
 
-        >igx-icon,
-        >igc-icon {
+        > igx-icon,
+        > igc-icon {
             color: var-get($theme, 'idle-icon-color');
 
             &:hover {
                 color: var-get($theme, 'hover-icon-color');
             }
         }
-
-        @if $variant == 'indigo' {
-            igx-icon,
-            igc-icon {
-                --component-size: 2;
-
-                margin-inline: rem(6px);
-            }
-        }
     }
 
     igx-navbar-action,

projects/igniteui-angular/src/lib/core/styles/components/select/_select-theme.scss

@@ -55,7 +55,7 @@
 
     .igx-input-group.igx-input-group--disabled.igx-input-group--filled,
     .igx-input-group.igx-input-group--disabled {
-        %igx-select__toggle-button {
+        %form-group-bundle %igx-select__toggle-button {
             background: var-get($theme, 'toggle-button-background-disabled');
             color: var-get($theme, 'toggle-button-foreground-disabled');
         }

projects/igniteui-angular/src/lib/core/styles/components/time-picker/_time-picker-theme.scss

@@ -23,21 +23,6 @@
         'indigo': rem(16px),
     ), $variant);
 
-    .igx-input-group {
-        display: flex;
-        flex-direction: column;
-
-        @if $variant == 'indigo' or $variant == 'bootstrap' {
-            [igxLabel] {
-                margin-block-end: rem(4px);
-            }
-        } @else if $variant == 'fluent' {
-            [igxLabel] {
-                margin-block-end: rem(5px);
-            }
-        }
-    }
-
     %time-picker-display {
         @include sizable();
 

projects/igniteui-angular/src/lib/grids/columns/column.component.ts

@@ -1066,6 +1066,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
         return (this.grid as any)._columns.indexOf(this);
     }
 
+    /* mustCoerceToInt */
     /**
      * Gets the pinning position of the column.
      * ```typescript