Skip to content

Commit 1e48d77

Browse files
authored
Merge branch '20.1.x' into mpopov/refactoring/calendar
2 parents 06267e5 + 71f5097 commit 1e48d77

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

projects/igniteui-angular/src/lib/core/styles/components/time-picker/_time-picker-theme.scss

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,6 @@
2323
'indigo': rem(16px),
2424
), $variant);
2525

26-
.igx-input-group {
27-
display: flex;
28-
flex-direction: column;
29-
30-
@if $variant == 'indigo' or $variant == 'bootstrap' {
31-
[igxLabel] {
32-
margin-block-end: rem(4px);
33-
}
34-
} @else if $variant == 'fluent' {
35-
[igxLabel] {
36-
margin-block-end: rem(5px);
37-
}
38-
}
39-
}
40-
4126
%time-picker-display {
4227
@include sizable();
4328

projects/igniteui-angular/src/lib/grids/columns/column.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
10661066
return (this.grid as any)._columns.indexOf(this);
10671067
}
10681068

1069+
/* mustCoerceToInt */
10691070
/**
10701071
* Gets the pinning position of the column.
10711072
* ```typescript

0 commit comments

Comments
 (0)