Skip to content

Commit 25f69de

Browse files
author
MPopov
committed
feat(filterin): fix icon margin and color
1 parent 23aafdf commit 25f69de

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,10 @@
558558
@extend %igx-grid__filtering-row-editing-buttons !optional;
559559
}
560560

561+
@include e(filtering-row-editing-buttons, $m: small) {
562+
@extend %igx-grid__filtering-row-editing-buttons--small !optional;
563+
}
564+
561565
@include e(filtering-row-main) {
562566
@extend %igx-grid__filtering-row-main !optional;
563567
}

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2636,16 +2636,29 @@
26362636
@include _excel-filtering($theme, $palette);
26372637
@include _advanced-filtering($theme, $palette);
26382638

2639-
2639+
%igx-grid__filtering-row-editing-buttons--small,
26402640
%igx-grid__filtering-row-editing-buttons {
26412641
display: flex;
26422642
align-items: center;
2643+
}
2644+
2645+
%igx-grid__filtering-row-editing-buttons {
2646+
button {
2647+
igx-icon {
2648+
margin-#{$right}: 8px;
2649+
}
2650+
}
2651+
}
26432652

2644-
[igxButton='icon'] {
2653+
%igx-grid__filtering-row-editing-buttons--small {
2654+
button {
26452655
&:not([disabled]) {
2646-
color: --var($theme, 'sorted-header-icon-color');
2656+
igx-icon {
2657+
color: --var($theme, 'sorted-header-icon-color');
2658+
}
26472659
}
26482660
}
26492661
}
26502662
}
26512663

2664+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<igx-icon>navigate_next</igx-icon>
122122
</button>
123123

124-
<div #buttonsContainer class="igx-grid__filtering-row-editing-buttons">
124+
<div #buttonsContainer [ngClass]="isNarrowWidth ? 'igx-grid__filtering-row-editing-buttons--small' : 'igx-grid__filtering-row-editing-buttons'">
125125
<button [igxButton]="isNarrowWidth ? 'icon' : 'flat'" igxRipple (click)="clearFiltering()" [disabled]="disabled" [tabindex]="disabled">
126126
<igx-icon>refresh</igx-icon>
127127
{{isNarrowWidth ? '' : filteringService.grid.resourceStrings.igx_grid_filter_row_reset}}

0 commit comments

Comments
 (0)