Skip to content

Commit 272826a

Browse files
authored
Merge branch 'master' into tests-refactor
2 parents a67e121 + 01141c9 commit 272826a

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ All notable changes for each version of this project will be documented in this
1313
- A column's `minWidth` and `maxWidth` constrain the user-specified `width` so that it cannot go outside their bounds.
1414
- In SSR mode grid with height 100% or with no height will render on the server with % size and with no data. The grid will show either the empty grid template or the loading indicator (if isLoading is true).
1515
- In SSR mode grid with width 100% or with no width will render on the server with % size and with all columns.
16+
- The `pagingMode` property can now be set as simple strings `'local'` and `'remote'` and does not require importing the `GridPagingMode` enum.
1617
- `IgxHierarchicalGrid`
1718
- Introduced a new advanced filtering capability that enables top-level records to be dynamically refined based on the attributes or data of their associated child records.
1819
- Added a new `schema` input property that can be used to pass collection of `EntityType` objects. This property is required for remote data scenarios.

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -913,6 +913,14 @@
913913
background: var-get($theme, 'search-disabled-background');
914914
box-shadow: var-get($theme, 'search-disabled-shadow');
915915
border-color: var-get($theme, 'disabled-border-color');
916+
917+
igx-prefix,
918+
[igxPrefix],
919+
igx-suffix,
920+
[igxSuffix] {
921+
background: inherit;
922+
color: var-get($theme, 'disabled-text-color');
923+
}
916924
}
917925

918926
%form-group-bundle-main--border {
@@ -1667,6 +1675,11 @@
16671675
[igxPrefix] {
16681676
display: none;
16691677
}
1678+
1679+
igx-suffix,
1680+
[igxSuffix] {
1681+
color: var(--igx-input-group-input-suffix-color--focused, var(--ig-gray-900));
1682+
}
16701683
}
16711684

16721685
// Bundle
@@ -1831,9 +1844,14 @@
18311844
transform-origin: top left;
18321845
margin-top: 0 !important;
18331846
height: auto;
1834-
margin-block-end: rem(4px);
18351847
color: var-get($theme, 'idle-secondary-color');
18361848

1849+
@if $variant == 'fluent' {
1850+
margin-block-end: rem(5px);
1851+
} @else {
1852+
margin-block-end: rem(4px);
1853+
}
1854+
18371855
[dir='rtl'] & {
18381856
transform-origin: top right;
18391857
}

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)