Skip to content

Commit 6107d68

Browse files
Merge branch '10.2.x' into ibarakov/fix-8853-10.2.x
2 parents cc762ba + b9cdd97 commit 6107d68

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@
6767
@extend %form-group-helper !optional;
6868
}
6969

70-
@include e(hint-item) {
71-
@extend %form-group-helper-item !optional;
72-
}
73-
7470
@include e(hint-item, $m: start) {
7571
@extend %form-group-helper-item !optional;
7672
@extend %form-group-helper-item--start !optional;

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1345,8 +1345,16 @@
13451345
%form-group-helper {
13461346
position: relative;
13471347
display: flex;
1348-
justify-content: space-between;
13491348
padding-top: rem(6px, map-get($base-scale-size, 'comfortable'));
1349+
justify-content: space-between;
1350+
1351+
> * {
1352+
margin-#{$right}: rem(8px);
1353+
1354+
&:last-child {
1355+
margin-#{$right}: 0;
1356+
}
1357+
}
13501358

13511359
&:empty {
13521360
display: none;
@@ -1375,18 +1383,22 @@
13751383
}
13761384

13771385
%form-group-helper-item {
1378-
@include ellipsis();
1386+
display: flex;
1387+
align-items: center;
13791388
position: relative;
1380-
min-width: 0;
1381-
max-width: 100%;
13821389
}
13831390

13841391
%form-group-helper-item--start {
1385-
order: 0;
1392+
justify-content: flex-start;
13861393
}
13871394

13881395
%form-group-helper-item--end {
1389-
order: 1;
1396+
justify-content: flex-end;
1397+
}
1398+
1399+
%form-group-helper-item--start,
1400+
%form-group-helper-item--end {
1401+
width: 100%;
13901402
}
13911403

13921404
%form-group-prefix--disabled,

projects/igniteui-angular/src/lib/directives/radio/radio-group.directive.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,10 @@ export class IgxRadioGroupDirective implements AfterContentInit, ControlValueAcc
235235
*/
236236
private destroy$ = new Subject<boolean>();
237237

238+
/**
239+
* @hidden
240+
* @internal
241+
*/
238242
ngAfterContentInit() {
239243
// The initial value can possibly be set by NgModel and it is possible that
240244
// the OnInit of the NgModel occurs after the OnInit of this class.

0 commit comments

Comments
 (0)