Skip to content

Commit 2c77614

Browse files
authored
Merge branch '20.1.x' into simeonoff/fix-element-styles
2 parents cddb9a8 + 0a7c7e3 commit 2c77614

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

projects/igniteui-angular-elements/src/app/custom-strategy.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ describe('Elements: ', () => {
4949
gridEl.appendChild(columnEl);
5050

5151
// TODO: Better way to wait - potentially expose the queue or observable for update on the strategy
52-
await firstValueFrom(timer(10 /* SCHEDULE_DELAY */ * 2));
52+
await firstValueFrom(timer(10 /* SCHEDULE_DELAY */ * 4));
5353

5454
const gridComponent = (await gridEl.ngElementStrategy[ComponentRefKey]).instance as IgxGridComponent;
5555
const columnComponent = (await columnEl.ngElementStrategy[ComponentRefKey]).instance as IgxColumnComponent;
5656
expect(gridComponent.columnList.toArray()).toContain(columnComponent);
5757

5858
columnEl.remove();
59-
await firstValueFrom(timer(10 /* SCHEDULE_DELAY: DESTROY + QUERY */ * 3));
59+
await firstValueFrom(timer(10 /* SCHEDULE_DELAY: DESTROY + QUERY */ * 4));
6060
expect(gridComponent.columnList.toArray()).toEqual([]);
6161
});
6262

projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@
6565
&[igxButton] {
6666
border-radius: 0;
6767
border-color: var-get($theme, 'item-border-color');
68-
69-
@if $bootstrap-theme {
70-
margin: 0 !important;
71-
border: none;
72-
}
7368
}
7469

7570
igx-icon {

0 commit comments

Comments
 (0)