Skip to content

Commit dfad459

Browse files
authored
Merge branch 'master' into mdragnev/zoneless-sticky-tooltip
2 parents dd7e690 + 69383bd commit dfad459

5 files changed

Lines changed: 28 additions & 12 deletions

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,10 @@
464464
@extend %igx-grid__outlet !optional;
465465
}
466466

467+
@include e(loading-outlet) {
468+
@extend %igx-grid__loading-outlet !optional;
469+
}
470+
467471
@include e(addrow-snackbar) {
468472
@extend %igx-grid__addrow-snackbar !optional;
469473
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2374,6 +2374,12 @@
23742374
--ig-size: var(--grid-size);
23752375
}
23762376

2377+
%igx-grid__loading-outlet {
2378+
%overlay-wrapper--modal {
2379+
background: none;
2380+
}
2381+
}
2382+
23772383
%igx-grid__addrow-snackbar {
23782384
position: absolute;
23792385
z-index: 5;

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,12 @@
129129
<igc-trial-watermark></igc-trial-watermark>
130130
}
131131
</div>
132-
<div igxToggle #loadingOverlay>
133-
@if (shouldOverlayLoading) {
134-
<igx-circular-bar [indeterminate]="true"></igx-circular-bar>
135-
}
132+
<div class="igx-grid__loading-outlet">
133+
<div igxToggle #loadingOverlay>
134+
@if (shouldOverlayLoading) {
135+
<igx-circular-bar [indeterminate]="true"></igx-circular-bar>
136+
}
137+
</div>
136138
</div>
137139
@if (moving && columnInDrag) {
138140
<span [igxColumnMovingDrop]="headerContainer" [attr.droppable]="true"

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,12 @@
6363
<ng-container #bodyViewContainerRef></ng-container>
6464
<igc-trial-watermark></igc-trial-watermark>
6565
</div>
66-
<div igxToggle #loadingOverlay>
67-
@if (shouldOverlayLoading) {
68-
<igx-circular-bar [indeterminate]="true"></igx-circular-bar>
69-
}
66+
<div class="igx-grid__loading-outlet">
67+
<div igxToggle #loadingOverlay>
68+
@if (shouldOverlayLoading) {
69+
<igx-circular-bar [indeterminate]="true"></igx-circular-bar>
70+
}
71+
</div>
7072
</div>
7173
@if (hasMovableColumns && columnInDrag) {
7274
<span [igxColumnMovingDrop]="headerContainer" [attr.droppable]="true"

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,12 @@
330330
<ng-container #bodyViewContainerRef></ng-container>
331331
<igc-trial-watermark></igc-trial-watermark>
332332
</div>
333-
<div igxToggle #loadingOverlay>
334-
@if (shouldOverlayLoading) {
335-
<igx-circular-bar [indeterminate]="true"></igx-circular-bar>
336-
}
333+
<div class="igx-grid__loading-outlet">
334+
<div igxToggle #loadingOverlay>
335+
@if (shouldOverlayLoading) {
336+
<igx-circular-bar [indeterminate]="true"></igx-circular-bar>
337+
}
338+
</div>
337339
</div>
338340
@if (moving && columnInDrag) {
339341
<span

0 commit comments

Comments
 (0)