Skip to content

Commit 4ab3807

Browse files
authored
Merge branch 'master' into bpenkov/date-parsing
2 parents 8581607 + 75222f2 commit 4ab3807

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
$this: bem--selector-to-string(&);
1010
@include register-component(str-slice($this, 2, -1));
1111

12-
@extend %animation !optional;
12+
@extend %navdrawer-display !optional;
1313

1414
// Main aside element
1515
@include e(aside) {

projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,11 @@
166166
$variant: map-get($theme, variant);
167167

168168

169-
%animation {
169+
%navdrawer-display {
170170
transition: flex-basis;
171171
transition-duration: .3s;
172172
transition-timing-function: $ease-out-quad;
173+
flex-shrink: 0;
173174
}
174175

175176
%aside {

projects/igniteui-angular/src/lib/input-group/input-group.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<div class="igx-input-group__border" *ngIf="hasBorder"></div>
66

7-
<div class="igx-input-group__hint">
7+
<div class="igx-input-group__hint" (click)="hintClickHandler($event)">
88
<ng-content select="igx-hint, [igxHint]"></ng-content>
99
</div>
1010

projects/igniteui-angular/src/lib/input-group/input-group.component.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,10 @@ export class IgxInputGroupComponent extends DisplayDensityBase
184184
}
185185
}
186186

187+
hintClickHandler(event) {
188+
event.stopPropagation();
189+
}
190+
187191
/**
188192
* An @Input property that sets how the input will be styled.
189193
* Allowed values of type IgxInputGroupType.

0 commit comments

Comments
 (0)