Skip to content

Commit 15ac5f3

Browse files
authored
Merge branch 'master' into pmoleri/memory-leak-fixing
2 parents 279c829 + 7605893 commit 15ac5f3

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
export { type LabelPosition, IChangeCheckboxEventArgs } from "./checkbox-base.directive";
1+
export { LabelPosition, IChangeCheckboxEventArgs } from "./checkbox-base.directive";
22
export * from "./checkbox.component";

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,4 +310,12 @@
310310
}
311311
}
312312
}
313+
314+
%form-group-bundle {
315+
&:hover {
316+
%igx-combo__clear-button {
317+
color: inherit;
318+
}
319+
}
320+
}
313321
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1791,8 +1791,8 @@
17911791
%grid-cell--active {
17921792
box-shadow: inset 0 0 0 rem(1px) var-get($theme, 'cell-active-border-color');
17931793

1794-
%igx-grid__filtering-cell,
1795-
%grid-cell-header {
1794+
> %igx-grid__filtering-cell,
1795+
> %grid-cell-header {
17961796
border-inline-end-color: var-get($theme, 'cell-active-border-color');
17971797
border-bottom-color: var-get($theme, 'cell-active-border-color');
17981798
}

0 commit comments

Comments
 (0)