Skip to content

Commit 3865958

Browse files
author
MPopov
committed
fix(grid): Fix class name and vertical centering of the checkbox
Signed-off-by: MPopov <desig9stein@gmail.com>
1 parent 0c7bd5b commit 3865958

File tree

8 files changed

+20
-17
lines changed

8 files changed

+20
-17
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,8 @@
331331
@extend %grid-cell-text !optional;
332332
}
333333

334-
@include e(def_tmp_padding) {
335-
@extend %grid__def_tmp_padding !optional;
334+
@include e(cbx-padding) {
335+
@extend %cbx-padding !optional;
336336
}
337337

338338
@include e(cbx-selection) {
@@ -523,8 +523,8 @@
523523
@extend %igx-grid__drag-indicator--cosy !optional;
524524
}
525525

526-
@include e(def_tmp_padding) {
527-
@extend %grid__def_tmp_padding--cosy !optional;
526+
@include e(cbx-padding) {
527+
@extend %cbx-padding--cosy !optional;
528528
}
529529

530530
@include e(cbx-selection, $m: push) {
@@ -623,8 +623,8 @@
623623
@extend %igx-grid__drag-indicator--compact !optional;
624624
}
625625

626-
@include e(def_tmp_padding) {
627-
@extend %grid__def_tmp_padding--compact !optional;
626+
@include e(cbx-padding) {
627+
@extend %cbx-padding--compact !optional;
628628
}
629629

630630
@include e(cbx-selection, $m: push) {

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,15 +1386,18 @@
13861386
z-index: 4;
13871387
}
13881388

1389-
%grid__def_tmp_padding {
1389+
%cbx-padding {
1390+
display: flex;
1391+
align-items: center;
1392+
justify-content: center;
13901393
padding: map-get($grid-header-padding, 'comfortable');
13911394
}
13921395

1393-
%grid__def_tmp_padding--cosy {
1396+
%cbx-padding--cosy {
13941397
padding: map-get($grid-header-padding, 'cosy');
13951398
}
13961399

1397-
%grid__def_tmp_padding--compact {
1400+
%cbx_padding--compact {
13981401
padding: map-get($grid-header-padding, 'compact');
13991402
}
14001403

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<ng-template *ngTemplateOutlet="
1212
this.grid.rowSelectorTemplate ? this.grid.rowSelectorTemplate : rowSelectorBaseTemplate;
1313
context: { $implicit: {
14-
index: this.grid.groupingExpressions.length > 0 ? this.grid.filteredSortedData.indexOf(this.rowData) :
14+
index: this.grid.groupingExpressions.length > 0 ? this.grid.filteredSortedData.indexOf(this.rowData) :
1515
this.index + this.grid.page * this.grid.perPage,
1616
rowID: rowID, selected: selected }}">
1717
</ng-template>
@@ -112,7 +112,7 @@
112112
</ng-container>
113113

114114
<ng-template #rowSelectorBaseTemplate>
115-
<div class="igx-grid__def_tmp_padding">
115+
<div class="igx-grid__cbx-padding">
116116
<igx-checkbox
117117
[checked]="selected"
118118
[readonly]="true"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
</ng-template>
253253

254254
<ng-template #headSelectorBaseTemplate igxHeadSelector let-context>
255-
<div class="igx-grid__def_tmp_padding">
255+
<div class="igx-grid__cbx-padding">
256256
<igx-checkbox
257257
[readonly]="true"
258258
[checked]="context.selectedCount > 0 && context.totalCount === context.selectedCount"

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
</ng-template>
218218

219219
<ng-template #headSelectorBaseTemplate igxHeadSelector let-context>
220-
<div class="igx-grid__def_tmp_padding">
220+
<div class="igx-grid__cbx-padding">
221221
<igx-checkbox
222222
[readonly]="true"
223223
[checked]="context.selectedCount > 0 && context.totalCount === context.selectedCount"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ng-template #defaultCollapsedTemplate>
1010
<igx-icon [isActive]='!added' fontSet="material">chevron_right</igx-icon>
1111
</ng-template>
12-
12+
1313
<ng-template #defaultEmptyTemplate>
1414
<igx-icon fontSet="material"></igx-icon>
1515
</ng-template>
@@ -77,7 +77,7 @@
7777
</ng-template>
7878

7979
<ng-template #rowSelectorBaseTemplate>
80-
<div class="igx-grid__def_tmp_padding">
80+
<div class="igx-grid__cbx-padding">
8181
<igx-checkbox
8282
[readonly]="true"
8383
[checked]="selected"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<ng-container *ngTemplateOutlet="col.visibleIndex === 0 ? treeCellTemplate : cellTemplate"></ng-container>
111111
</ng-template>
112112
<ng-template #rowSelectorBaseTemplate>
113-
<div class="igx-grid__def_tmp_padding">
113+
<div class="igx-grid__cbx-padding">
114114
<igx-checkbox
115115
[readonly]="true"
116116
[checked]="selected"

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
</ng-template>
193193

194194
<ng-template #headSelectorBaseTemplate igxHeadSelector let-context>
195-
<div class="igx-grid__def_tmp_padding">
195+
<div class="igx-grid__cbx-padding">
196196
<igx-checkbox
197197
[checked]="context.selectedCount > 0 && context.totalCount === context.selectedCount"
198198
[ngStyle]="{'visibility': isMultiRowSelectionEnabled? 'visible' : 'hidden' }"

0 commit comments

Comments
 (0)