Skip to content

Commit 931a695

Browse files
author
MPopov
committed
fix(filtering): add missing dropdown/select styles
1 parent 1a3d883 commit 931a695

File tree

6 files changed

+24
-10
lines changed

6 files changed

+24
-10
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
@@ -546,6 +546,10 @@
546546
@extend %igx-grid__filtering-dropdown-items !optional;
547547
}
548548

549+
@include e(filtering-dropdown-text) {
550+
@extend %igx-grid__filtering-dropdown-text !optional;
551+
}
552+
549553
@include e(filtering-row) {
550554
@extend %igx-grid__filtering-row !optional;
551555
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2401,6 +2401,10 @@
24012401
align-items: center;
24022402
}
24032403

2404+
%igx-grid__filtering-dropdown-text {
2405+
margin-left: rem(16px);
2406+
}
2407+
24042408
%igx-grid__filtering-row--cosy {
24052409
height: map-get($grid-header-height, 'cosy');
24062410
}

projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,12 @@ <h6 class="igx-filter-empty__title">
160160
[name]="selectedColumn.filters.condition(conditionSelect.value).iconName">
161161
</igx-icon>
162162
<igx-select-item *ngFor="let condition of getConditionList()" [value]="condition">
163-
<igx-icon fontSet="filtering-icons"
164-
[name]="selectedColumn.filters.condition(condition).iconName">
165-
</igx-icon>
166-
<span>{{getConditionFriendlyName(condition)}}</span>
163+
<div class="igx-grid__filtering-dropdown-items">
164+
<igx-icon fontSet="filtering-icons"
165+
[name]="selectedColumn.filters.condition(condition).iconName">
166+
</igx-icon>
167+
<span class="igx-grid__filtering-dropdown-text">{{getConditionFriendlyName(condition)}}</span>
168+
</div>
167169
</igx-select-item>
168170
</igx-select>
169171

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
@@ -5,7 +5,7 @@
55
[selected]="isConditionSelected(condition)">
66
<div class="igx-grid__filtering-dropdown-items">
77
<igx-icon fontSet="filtering-icons" [name]="getCondition(condition).iconName"></igx-icon>
8-
<span style="margin-left: 16px">{{ translateCondition(condition) }}</span>
8+
<span class="igx-grid__filtering-dropdown-text">{{ translateCondition(condition) }}</span>
99
</div>
1010
</igx-drop-down-item>
1111
</igx-drop-down>

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-default-expression.component.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
<igx-icon *ngIf="!expressionUI.expression.condition">filter_list</igx-icon>
1010
</igx-prefix>
1111
<igx-select-item *ngFor="let condition of conditions" [value]="condition" [selected]="isConditionSelected(condition)">
12-
<igx-icon fontSet="filtering-icons" [name]="getCondition(condition).iconName"></igx-icon>
13-
<span>{{translateCondition(condition)}}</span>
12+
<div class="igx-grid__filtering-dropdown-items">
13+
<igx-icon fontSet="filtering-icons" [name]="getCondition(condition).iconName"></igx-icon>
14+
<span class="igx-grid__filtering-dropdown-text">{{translateCondition(condition)}}</span>
15+
</div>
1416
</igx-select-item>
1517
</igx-select>
1618

projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,14 @@ <h4>{{ column.header || column.field }}</h4>
168168
[value]="condition">
169169
<div class="igx-grid__filtering-dropdown-items">
170170
<igx-icon fontSet="filtering-icons" [name]="getCondition(condition).iconName"></igx-icon>
171-
<span style="margin-left: 16px">{{ translateCondition(condition) }}</span>
171+
<span class="igx-grid__filtering-dropdown-text">{{ translateCondition(condition) }}</span>
172172
</div>
173173
</igx-drop-down-item>
174174
<igx-drop-down-item *ngIf="showCustomFilterItem()">
175-
<igx-icon>filter_list</igx-icon>
176-
<span style="margin-left: 16px">{{ grid.resourceStrings.igx_grid_excel_custom_filter }}</span>
175+
<div class="igx-grid__filtering-dropdown-items">
176+
<igx-icon>filter_list</igx-icon>
177+
<span class="igx-grid__filtering-dropdown-text">{{ grid.resourceStrings.igx_grid_excel_custom_filter }}</span>
178+
</div>
177179
</igx-drop-down-item>
178180
</div>
179181
</igx-drop-down>

0 commit comments

Comments
 (0)