Skip to content

Commit a825b7d

Browse files
authored
Merge branch 'master' into mpopov/sorting-indicator
2 parents d9313b5 + 370d2d0 commit a825b7d

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,14 @@
234234
flex-wrap: wrap;
235235
flex-grow: 1;
236236
justify-content: flex-end;
237+
margin-#{$right}: map.get($grid-toolbar-spacer, 'comfortable');
237238
}
238239

239240
%igx-grid-toolbar__actions {
240241
display: flex;
241242
align-items: center;
242243
flex-flow: row wrap;
243-
margin-#{$left}: map.get($grid-toolbar-spacer, 'comfortable');
244+
margin-#{$left}: auto;
244245

245246
> * {
246247
display: flex;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
</ng-template>
1010
<igx-grid-toolbar-actions *ngIf="!hasActions">
1111
<igx-grid-toolbar-advanced-filtering *ngIf="grid.allowAdvancedFiltering"></igx-grid-toolbar-advanced-filtering>
12-
<igx-grid-toolbar-hiding></igx-grid-toolbar-hiding>
13-
<igx-grid-toolbar-pinning></igx-grid-toolbar-pinning>
14-
<igx-grid-toolbar-exporter (exportStarted)="showProgress = true" (exportEnded)="showProgress = false">
15-
</igx-grid-toolbar-exporter>
1612
</igx-grid-toolbar-actions>
1713
<ng-container *ngTemplateOutlet="actions"></ng-container>
1814

0 commit comments

Comments
 (0)