Merge branch 'vnext' into package-update

IgniteUI · Aug 14, 2023 · 95e4bfd · 95e4bfd
2 parents 4a2037c + 175b783
commit 95e4bfd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 62 deletions.
diff --git a/src/app/data-display/icon/icon-sample-2/icon-sample-2.component.scss b/src/app/data-display/icon/icon-sample-2/icon-sample-2.component.scss
@@ -1,7 +1,5 @@
-.custom-size{
-    font-size: 56px;
-    width: 56px;
-    height: 56px;
+.custom-size {
+    --size: 56px;
 }
 
 .wrapper {

diff --git a/src/app/grid/grid-advanced-filtering-style/grid-advanced-filtering-style.component.scss b/src/app/grid/grid-advanced-filtering-style/grid-advanced-filtering-style.component.scss
@@ -4,10 +4,6 @@ $yellow: #ffcd0f;
 $black: #292826;
 $muted-yellow: #ffe482;
 
-$custom-grid: grid-theme(
-    $filtering-row-background: $black
-);
-
 $custom-button: button-theme(
     $schema: $dark-material-schema,
     $background: $black,
@@ -16,15 +12,12 @@ $custom-button: button-theme(
     $hover-background: $yellow,
     $focus-foreground: $yellow,
     $focus-background: $black,
-    $border-color: $yellow
-);
-
-$custom-raised-button: button-theme(
-    $schema: $dark-material-schema,
-    $background: $yellow,
-    $foreground: $black,
-    $hover-background: $yellow,
-    $hover-foreground: $black
+    $active-background: $yellow,
+    $active-foreground: $black,
+    $border-color: $yellow,
+    $hover-border-color: $yellow,
+    $focus-border-color: $yellow,
+    $active-border-color: $yellow
 );
 
 $custom-button-group: button-group-theme(
@@ -34,7 +27,9 @@ $custom-button-group: button-group-theme(
     $item-border-color: $yellow,
     $item-selected-background: $yellow,
     $item-hover-background: $yellow,
-    $item-selected-hover-background: $yellow
+    $item-selected-hover-background: $yellow,
+    $item-disabled-border: $yellow,
+    $item-selected-border-color: $yellow
 );
 
 $custom-input-group: input-group-theme(
@@ -74,49 +69,17 @@ $custom-drop-down: drop-down-theme(
     margin: 16px;
 
 	::ng-deep {
-		@include css-vars($custom-grid);
 
         igx-advanced-filtering-dialog {
-			@include css-vars($custom-button);
+            @include theme(
+            $palette: $dark-material-palette
+            );
+
+            @include css-vars($custom-button);
 			@include css-vars($custom-button-group);
 			@include css-vars($custom-input-group);
 			@include css-vars($custom-chip);
 			@include css-vars($custom-drop-down);
-
-			.igx-excel-filter__apply {
-				@include css-vars($custom-raised-button);
-			}
-
-            .igx-filter-empty__title {
-                color: $yellow
-            }
-
-            .igx-advanced-filter__header {
-                color: $yellow;
-                background-color: $black;
-            }
-
-            .igx-filter-tree__expression-actions igx-icon {
-                color: $yellow
-            }
-
-            .igx-filter-tree__expression-actions igx-icon:hover {
-                color: $muted-yellow
-            }
-
-            .igx-filter-tree__expression-actions igx-icon:focus {
-                color: $muted-yellow
-            }
-
-            .igx-filter-contextual-menu {
-                border: 1px solid $yellow
-            }
-
-            .igx-filter-contextual-menu__close-btn {
-                position: absolute !important;
-                background: $black !important;
-                border-color: $yellow !important;
-            }
         }
     }
 }
diff --git a/src/app/menus/navdrawer/nav-drawer-styling/nav-drawer-styling.component.scss b/src/app/menus/navdrawer/nav-drawer-styling/nav-drawer-styling.component.scss
@@ -14,16 +14,18 @@ main {
     }
 }
 
+$custom-theme: navdrawer-theme(
+    $background: #2d313a,
+    $item-active-background: #ecc256,
+    $item-header-text-color: #f3c03e
+);
+
 :host {
     display: block;
     height: 100%;
 
-    $custom-theme: navdrawer-theme(
-        $background: #2d313a,
-        $item-active-background: #ecc256,
-        $item-header-text-color: #f3c03e
-    );
-
-	@include css-vars($custom-theme);
+    ::ng-deep{
+        @include css-vars($custom-theme);
+    }
 }