Skip to content

Commit 548e3b4

Browse files
authored
fix(input): label color issue (#15741)
1 parent 0c0b698 commit 548e3b4

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,10 @@
686686
position: relative;
687687

688688
grid-area: 1 / 2;
689+
690+
%form-group-label {
691+
color: var-get($theme, 'idle-secondary-color');
692+
}
689693
}
690694

691695
%igx-input-group__notch--border {
@@ -913,6 +917,14 @@
913917
background: var-get($theme, 'search-disabled-background');
914918
box-shadow: var-get($theme, 'search-disabled-shadow');
915919
border-color: var-get($theme, 'disabled-border-color');
920+
921+
igx-prefix,
922+
[igxPrefix],
923+
igx-suffix,
924+
[igxSuffix] {
925+
background: inherit;
926+
color: var-get($theme, 'disabled-text-color');
927+
}
916928
}
917929

918930
%form-group-bundle-main--border {
@@ -1667,6 +1679,11 @@
16671679
[igxPrefix] {
16681680
display: none;
16691681
}
1682+
1683+
igx-suffix,
1684+
[igxSuffix] {
1685+
color: var(--igx-input-group-input-suffix-color--focused, var(--ig-gray-900));
1686+
}
16701687
}
16711688

16721689
// Bundle
@@ -1831,9 +1848,14 @@
18311848
transform-origin: top left;
18321849
margin-top: 0 !important;
18331850
height: auto;
1834-
margin-block-end: rem(4px);
18351851
color: var-get($theme, 'idle-secondary-color');
18361852

1853+
@if $variant == 'fluent' {
1854+
margin-block-end: rem(5px);
1855+
} @else {
1856+
margin-block-end: rem(4px);
1857+
}
1858+
18371859
[dir='rtl'] & {
18381860
transform-origin: top right;
18391861
}

projects/igniteui-angular/src/lib/data-operations/filtering-strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ export abstract class BaseFilteringStrategy implements IFilteringStrategy {
194194
item.value = key ? new Date(key) : key;
195195
} else if (column.dataType === GridColumnDataType.Time) {
196196
const date = key ? new Date(key) : key;
197-
key = date ? new Date().setHours(date.getHours(), date.getMinutes(), date.getSeconds()) : key;
197+
key = date ? new Date().setHours(date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds()) : key;
198198
item.value = key ? new Date(key) : key;
199199
} else if (column.dataType === GridColumnDataType.Date) {
200200
const date = key ? new Date(key) : key;

0 commit comments

Comments
 (0)