Skip to content

Commit fd9c629

Browse files
authored
Merge branch '20.1.x' into sivanova/slider-height-20.1.x
2 parents 876f234 + 0e502b9 commit fd9c629

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@
211211
min-height: 100% !important;
212212
border: none !important;
213213

214-
.igx-input-group__filler {
214+
.igx-input-group__filler,
215+
.igx-input-group__notch {
215216
border: none !important;
216217
}
217218

projects/igniteui-angular/src/lib/core/styles/components/tabs/_tabs-theme.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
display: flex;
5757
flex-direction: column;
5858
overflow: hidden;
59+
text-align: initial;
5960
}
6061

6162
%tabs-header {
@@ -322,7 +323,7 @@
322323
var-get($theme, 'item-active-hover-background') 1px,
323324
var-get($theme, 'item-active-hover-background') calc(100% - 1px),
324325
var-get($theme, 'border-color') calc(100% - 1px)
325-
);
326+
);
326327
}
327328
}
328329
}

projects/igniteui-angular/src/lib/directives/button/button-base.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ import {
99
booleanAttribute,
1010
inject,
1111
AfterViewInit,
12+
OnDestroy
1213
} from '@angular/core';
1314
import { PlatformUtil } from '../../core/utils';
15+
import { animationFrameScheduler, Subscription } from 'rxjs';
1416

1517
export const IgxBaseButtonType = {
1618
Flat: 'flat',
@@ -20,9 +22,10 @@ export const IgxBaseButtonType = {
2022

2123

2224
@Directive()
23-
export abstract class IgxButtonBaseDirective implements AfterViewInit{
25+
export abstract class IgxButtonBaseDirective implements AfterViewInit, OnDestroy {
2426
private _platformUtil = inject(PlatformUtil);
2527
private _viewInit = false;
28+
private _animationScheduler: Subscription;
2629

2730
/**
2831
* Emitted when the button is clicked.
@@ -110,12 +113,16 @@ export abstract class IgxButtonBaseDirective implements AfterViewInit{
110113
if (this._platformUtil.isBrowser && !this._viewInit) {
111114
this._viewInit = true;
112115

113-
requestAnimationFrame(() => {
116+
this._animationScheduler = animationFrameScheduler.schedule(() => {
114117
this.element.nativeElement.style.removeProperty('--_init-transition');
115118
});
116119
}
117120
}
118121

122+
public ngOnDestroy(): void {
123+
this._animationScheduler.unsubscribe();
124+
}
125+
119126
/**
120127
* @hidden
121128
* @internal

0 commit comments

Comments
 (0)