Skip to content

Commit 755289a

Browse files
fix(grid): filtering row buttons outline problem (#12308)
Co-authored-by: Simeon Simeonoff <[email protected]>
1 parent c3022a5 commit 755289a

File tree

2 files changed

+37
-3
lines changed

2 files changed

+37
-3
lines changed

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,12 @@
387387
compact: rem(36px)
388388
);
389389

390+
$filtering-row-button-size: (
391+
comfortable: rem(40px),
392+
cosy: rem(30px),
393+
compact: rem(21px)
394+
);
395+
390396
$icon-in-button-margin: (
391397
comfortable: rem(12px),
392398
cosy: rem(8px),
@@ -481,6 +487,11 @@
481487
white-space: nowrap;
482488
transition: $button-transition;
483489

490+
@if ($variant == 'bootstrap') {
491+
// important is needed to override the typography margins
492+
margin: rem(4px) !important;
493+
}
494+
484495
igx-icon {
485496
display: flex;
486497
justify-content: center;
@@ -513,6 +524,29 @@
513524
}
514525
}
515526

527+
igx-grid-filtering-row {
528+
@if ($variant == 'bootstrap') {
529+
%igx-button-display {
530+
min-height: map.get($filtering-row-button-size, 'comfortable');
531+
padding-block: 0;
532+
533+
> * {
534+
display: flex;
535+
align-items: center;
536+
height: rem(18px);
537+
}
538+
}
539+
540+
%igx-button-display--cosy {
541+
min-height: map.get($filtering-row-button-size, 'cosy');
542+
}
543+
544+
%igx-button-display--compact {
545+
min-height: map.get($filtering-row-button-size, 'compact');
546+
}
547+
}
548+
}
549+
516550
%igx-button--flat {
517551
background: var-get($flat-theme, 'background');
518552
color: var-get($flat-theme, 'foreground');

projects/igniteui-angular/src/lib/grids/filtering/base/grid-filtering-row.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
</igx-chip>
163163

164164
<span id='operand' *ngIf="!last">
165-
<button igxButton (click)="toggleOperatorsDropDown($event, i)" [igxDropDownItemNavigation]="operators" [displayDensity]="column.grid.displayDensity">
165+
<button igxButton (click)="toggleOperatorsDropDown($event, i)" [igxDropDownItemNavigation]="operators" [displayDensity]="displayDensity">
166166
<igx-icon>expand_more</igx-icon>
167167
<span>{{filteringService.getOperatorAsString(item.afterOperator)}}</span>
168168
</button>
@@ -181,11 +181,11 @@
181181
</button>
182182

183183
<div #buttonsContainer [ngClass]="isNarrowWidth ? 'igx-grid__filtering-row-editing-buttons--small' : 'igx-grid__filtering-row-editing-buttons'">
184-
<button [displayDensity]="column.grid.displayDensity" [igxButton]="isNarrowWidth ? 'icon' : 'flat'" igxRipple (click)="clearFiltering()" [disabled]="disabled" [tabindex]="disabled">
184+
<button [displayDensity]="displayDensity" [igxButton]="isNarrowWidth ? 'icon' : 'flat'" igxRipple (click)="clearFiltering()" [disabled]="disabled" [tabindex]="disabled">
185185
<igx-icon>refresh</igx-icon>
186186
<span>{{isNarrowWidth ? '' : filteringService.grid.resourceStrings.igx_grid_filter_row_reset}}</span>
187187
</button>
188-
<button #closeButton [displayDensity]="column.grid.displayDensity" [igxButton]="isNarrowWidth ? 'icon' : 'flat'" igxRipple (click)="close()">
188+
<button #closeButton [displayDensity]="displayDensity" [igxButton]="isNarrowWidth ? 'icon' : 'flat'" igxRipple (click)="close()">
189189
<igx-icon>close</igx-icon>
190190
<span>{{isNarrowWidth ? '' : filteringService.grid.resourceStrings.igx_grid_filter_row_close}}</span>
191191
</button>

0 commit comments

Comments
 (0)