Skip to content

Commit c23a74c

Browse files
dobromirtsdobromirts
committed
Merge branch 'dTsvetkov/fix-9349' of https://github.com/IgniteUI/igniteui-angular into dTsvetkov/fix-9349
2 parents 8797d0f + 071aa54 commit c23a74c

File tree

8 files changed

+100
-26
lines changed

8 files changed

+100
-26
lines changed

‎projects/igniteui-angular/src/lib/core/styles/components/grid/_advanced-filtering-theme.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,10 @@
190190
margin: 0 rem(8px);
191191
align-items: center;
192192

193+
[igxButton] {
194+
transition: none;
195+
}
196+
193197
[igxButton] + [igxButton] {
194198
margin-#{$left}: rem(8px);
195199
}

‎projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-component.scss‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,18 @@
141141
@extend %grid-excel-menu__add-filter !optional;
142142
}
143143

144+
@include e(clear) {
145+
@extend %grid-excel-filter__clear !optional;
146+
}
147+
148+
@include e(cancel) {
149+
@extend %grid-excel-filter__cancel !optional;
150+
}
151+
152+
@include e(apply) {
153+
@extend %grid-excel-filter__apply !optional;
154+
}
155+
144156
@include m(inline) {
145157
@extend %grid-excel-filter--inline !optional;
146158
}

‎projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-theme.scss‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,24 @@
114114
justify-content: space-between;
115115
padding: rem(8px) rem(16px);
116116

117-
[igxButton] {
117+
%grid-excel-filter__apply,
118+
%grid-excel-filter__cancel {
118119
flex-grow: 1;
119120

120-
+ [igxButton] {
121-
margin-#{$left}: rem(16px);
121+
[igxButton] {
122+
width: 100%;
122123
}
123124
}
124125
}
125126

127+
%grid-excel-filter__clear {
128+
flex-grow: 1;
129+
}
130+
131+
%grid-excel-filter__cancel + %grid-excel-filter__apply {
132+
margin-#{$left}: rem(16px);
133+
}
134+
126135
%grid-excel-sort {
127136
display: block;
128137
padding: rem(8px) rem(16px);
@@ -371,7 +380,8 @@
371380
%grid-excel-menu__secondary-footer {
372381
border-top: 1px dashed igx-color($palette, 'grays', 300);
373382

374-
[igxButton] {
383+
%grid-excel-filter__apply,
384+
%grid-excel-filter__cancel {
375385
flex-grow: 0;
376386
}
377387
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
$cell-selected-within-text-color: null,
228228
) {
229229
$name: 'igx-grid';
230-
$selector: 'igx-grid, igx-hierarchical-grid, igx-tree-grid, igx-advanced-filtering-dialog';
230+
$selector: 'igx-grid, igx-hierarchical-grid, igx-tree-grid, igx-advanced-filtering-dialog, igx-grid-excel-style-filtering, .igx-excel-filter__secondary';
231231
$grid-schema: ();
232232

233233
@if map-has-key($schema, $name) {

‎projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_button.scss‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ $_material-flat-button: extend(
5151
$_flat-elevation-button,
5252
$_material-shape-button,
5353
(
54-
selector: '[igxButton="flat"]',
54+
selector: '[igxButton="flat"], .igx-button--flat',
5555

5656
background: transparent,
5757

@@ -88,7 +88,7 @@ $_material-flat-button: extend(
8888
$_material-outlined-button: extend(
8989
$_material-flat-button,
9090
(
91-
selector: '[igxButton="outlined"]',
91+
selector: '[igxButton="outlined"], .igx-button--outlined',
9292

9393
border-color: (
9494
igx-color: ('grays', 300)
@@ -124,7 +124,7 @@ $_material-raised-button: extend(
124124
$_material-raised-elevation,
125125
$_material-shape-button,
126126
(
127-
selector: '[igxButton="raised"]',
127+
selector: '[igxButton="raised"], .igx-button--raised',
128128

129129
background: (
130130
igx-color: ('secondary', 500)
@@ -166,7 +166,7 @@ $_material-fab-button: extend(
166166
$_material-fab-elevation,
167167
$_round-shape-button,
168168
(
169-
selector: '[igxButton="fab"]',
169+
selector: '[igxButton="fab"], .igx-button--fab',
170170
)
171171
);
172172

@@ -190,7 +190,7 @@ $_material-icon-button: extend(
190190
$_material-ib-elevation,
191191
$_round-shape-button,
192192
(
193-
selector: '[igxButton="icon"]',
193+
selector: '[igxButton="icon"], .igx-button--icon',
194194

195195
background: transparent,
196196

@@ -377,7 +377,7 @@ $_fluent-fab-button: extend(
377377
$_round-shape-button,
378378
$_fluent-raised-button,
379379
(
380-
selector: '[igxButton="fab"]',
380+
selector: '[igxButton="fab"], .igx-button--fab',
381381
)
382382
);
383383

@@ -577,7 +577,7 @@ $_bootstrap-fab-button: extend(
577577
$_bootstrap-base-button,
578578
$_bootstrap-raised-button,
579579
(
580-
selector: '[igxButton="fab"]',
580+
selector: '[igxButton="fab"], .igx-button--fab',
581581

582582
hover-foreground: #fff,
583583

@@ -793,7 +793,7 @@ $_indigo-fab-button: extend(
793793
$_indigo-base-button,
794794
$_indigo-raised-button,
795795
(
796-
selector: '[igxButton="fab"]',
796+
selector: '[igxButton="fab"], .igx-button--fab',
797797
)
798798
);
799799

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

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ <h6 class="igx-filter-empty__title">
177177
[displayDensity]="'compact'">
178178
<input #searchValueInput
179179
igxInput
180-
[disabled]="!selectedColumn || !selectedCondition
180+
[disabled]="!selectedColumn || !selectedCondition
181181
|| (selectedColumn && selectedColumn.filters.condition(selectedCondition).isUnary)"
182182
[type]="selectedColumn && selectedColumn.dataType === 'number' ? 'number' : 'text'"
183183
[placeholder]="grid.resourceStrings.igx_grid_advanced_filter_value_placeholder"
@@ -370,11 +370,27 @@ <h6 class="igx-filter-empty__title">
370370
</article>
371371

372372
<footer class="igx-excel-filter__secondary-footer">
373-
<button igxButton [displayDensity]="displayDensity" (click)="onClearButtonClick($event)">{{ grid.resourceStrings.igx_grid_excel_custom_dialog_clear }}</button>
374-
375-
<div>
376-
<button igxButton [displayDensity]="displayDensity" (click)="cancelChanges()">{{ grid.resourceStrings.igx_grid_excel_cancel }}</button>
377-
<button igxButton="raised" [displayDensity]="displayDensity" (click)="onApplyButtonClick($event)">
373+
<div class="igx-excel-filter__clear">
374+
<button
375+
igxButton="flat"
376+
[displayDensity]="displayDensity"
377+
(click)="onClearButtonClick($event)">
378+
{{ grid.resourceStrings.igx_grid_excel_custom_dialog_clear }}
379+
</button>
380+
</div>
381+
<div class="igx-excel-filter__cancel">
382+
<button
383+
igxButton="flat"
384+
[displayDensity]="displayDensity"
385+
(click)="cancelChanges()">
386+
{{ grid.resourceStrings.igx_grid_excel_cancel }}
387+
</button>
388+
</div>
389+
<div class="igx-excel-filter__apply">
390+
<button
391+
igxButton="raised"
392+
[displayDensity]="displayDensity"
393+
(click)="onApplyButtonClick($event)">
378394
{{ grid.resourceStrings.igx_grid_excel_apply }}
379395
</button>
380396
</div>

‎projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-custom-dialog.component.html‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,28 @@ <h4 class="igx-typography__h6">
4949
</article>
5050

5151
<footer class="igx-excel-filter__secondary-footer">
52-
<button igxButton [displayDensity]="displayDensity" (click)="onClearButtonClick()">{{ grid.resourceStrings.igx_grid_excel_custom_dialog_clear }}</button>
53-
54-
<div>
55-
<button igxButton [displayDensity]="displayDensity" (click)="closeDialog()">{{ grid.resourceStrings.igx_grid_excel_cancel }}</button>
56-
<button igxButton="raised" [displayDensity]="displayDensity" (click)="onApplyButtonClick()" (keydown)="onApplyButtonKeyDown($event)">
52+
<div class="igx-excel-filter__clear">
53+
<button
54+
igxButton="flat"
55+
[displayDensity]="displayDensity"
56+
(click)="onClearButtonClick()">
57+
{{ grid.resourceStrings.igx_grid_excel_custom_dialog_clear }}
58+
</button>
59+
</div>
60+
<div class="igx-excel-filter__cancel">
61+
<button
62+
igxButton="flat"
63+
[displayDensity]="displayDensity"
64+
(click)="closeDialog()">
65+
{{ grid.resourceStrings.igx_grid_excel_cancel }}
66+
</button>
67+
</div>
68+
<div class="igx-excel-filter__apply">
69+
<button
70+
igxButton="raised"
71+
[displayDensity]="displayDensity"
72+
(click)="onApplyButtonClick()"
73+
(keydown)="onApplyButtonKeyDown($event)">
5774
{{ grid.resourceStrings.igx_grid_excel_apply }}
5875
</button>
5976
</div>

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,21 @@
5252
</ng-template>
5353

5454
<footer class="igx-excel-filter__menu-footer">
55-
<button igxButton [displayDensity]="esf.displayDensity" (click)="esf.cancel()">{{ esf.grid?.resourceStrings.igx_grid_excel_cancel }}</button>
56-
<button igxButton="raised" [displayDensity]="esf.displayDensity" [disabled]="applyButtonDisabled" (click)="applyFilter()">{{ esf.grid?.resourceStrings.igx_grid_excel_apply }}</button>
55+
<div class="igx-excel-filter__cancel">
56+
<button
57+
igxButton="flat"
58+
[displayDensity]="esf.displayDensity"
59+
(click)="esf.cancel()">
60+
{{ esf.grid?.resourceStrings.igx_grid_excel_cancel }}
61+
</button>
62+
</div>
63+
<div class="igx-excel-filter__apply">
64+
<button
65+
igxButton="raised"
66+
[displayDensity]="esf.displayDensity"
67+
[disabled]="applyButtonDisabled"
68+
(click)="applyFilter()">
69+
{{ esf.grid?.resourceStrings.igx_grid_excel_apply }}
70+
</button>
71+
</div>
5772
</footer>

0 commit comments

Comments
 (0)