Merge branch 'master' into simeonoff/fix-17234

Author: simeonoff

projects/igniteui-angular/core/src/core/styles/components/button-group/_button-group-theme.scss

@@ -245,7 +245,7 @@
 
         &[igxButton].igx-button--focused {
             background: var-get($theme, 'item-selected-focus-background');
-            border-color: var-get($theme, 'item-selected-hover-border-color');
+            border-color: var-get($theme, 'item-selected-border-color');
             color: var-get($theme, 'item-selected-text-color');
 
             igx-icon {
@@ -261,7 +261,6 @@
             }
 
             @if $variant == 'indigo' {
-                border-color: var-get($theme, 'item-selected-border-color');
                 box-shadow: 0 0 0 rem(3px) var-get($theme, 'selected-shadow-color');
             }
 
@@ -276,15 +275,11 @@
                 igx-icon {
                     color: var-get($theme, 'item-selected-hover-icon-color');
                 }
-
-                @if $variant == 'indigo' {
-                    border-color: var-get($theme, 'item-selected-hover-border-color');
-                }
             }
 
             &:hover {
                 background: var-get($theme, 'item-selected-focus-hover-background');
-                border-color: var-get($theme, 'item-selected-border-color');
+                border-color: var-get($theme, 'item-selected-hover-border-color');
             }
 
             &:active {

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

@@ -23,7 +23,7 @@
         '#{$theme-variant}-#{$variant}'
     );
 
-    igx-grid,
+    :where(igx-grid,
     igc-grid,
     igx-tree-grid,
     igc-tree-grid,
@@ -32,7 +32,7 @@
     igx-pivot-grid,
     igc-pivot-grid,
     igx-grid-lite,
-    igc-grid-lite {
+    igc-grid-lite) {
         --_grid-background: var(--background, var(--ig-grid-background));
         --_grid-foreground: var(--foreground, var(--ig-grid-foreground));
         --_grid-accent-color: var(--accent-color, var(--ig-grid-accent-color));