Skip to content

Commit 7016765

Browse files
authored
Merge branch 'master' into 12.0.x
2 parents fdfff3a + fe76f08 commit 7016765

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

projects/igniteui-angular/src/lib/core/styles/components/column-actions/_column-actions-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
}
9494

9595
%column-actions-item {
96-
padding: rem(16px);
97-
min-height: rem(52px);
96+
padding: rem(4px) rem(16px);
97+
min-height: rem(32px);
9898
}
9999

100100
%column-actions-buttons {

projects/igniteui-angular/src/lib/grids/grid/column-hiding.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ describe('Column Hiding UI #grid', () => {
653653

654654
it('height can be controlled via columnsAreaMaxHeight input.', () => {
655655
expect(columnChooser.columnsAreaMaxHeight).toBe('100%');
656-
expect(columnChooserElement.nativeElement.offsetHeight >= 310).toBe(true);
656+
expect(columnChooserElement.nativeElement.offsetHeight >= 230).toBe(true);
657657

658658
columnChooser.columnsAreaMaxHeight = '150px';
659659
fix.detectChanges();

0 commit comments

Comments
 (0)