Skip to content

Commit bb41dca

Browse files
authored
Merge branch 'master' into nrobakova/refactor-keyboardNav-tests
2 parents 3551243 + 2516834 commit bb41dca

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<igx-grid-toolbar [style.flex-basis.px]="outerWidth" role="rowgroup" *ngIf="showToolbar" [gridID]="id"
1+
<igx-grid-toolbar [style.max-width.px]='outerWidth' [style.flex-basis.px]="outerWidth" role="rowgroup" *ngIf="showToolbar" [gridID]="id"
22
[displayDensity]="displayDensity" #toolbar>
33
</igx-grid-toolbar>
44

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
@@ -1,4 +1,4 @@
1-
<igx-grid-toolbar role="rowgroup" [style.flex-basis.px]="outerWidth" *ngIf="showToolbar" [gridID]="id"
1+
<igx-grid-toolbar role="rowgroup" [style.max-width.px]='outerWidth' [style.flex-basis.px]="outerWidth" *ngIf="showToolbar" [gridID]="id"
22
[displayDensity]="displayDensity" #toolbar>
33
</igx-grid-toolbar>
44

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
@@ -1,4 +1,4 @@
1-
<igx-grid-toolbar role="rowgroup" [style.flex-basis.px]='outerWidth' *ngIf="showToolbar" [gridID]="id"
1+
<igx-grid-toolbar role="rowgroup" [style.max-width.px]='outerWidth' [style.flex-basis.px]='outerWidth' *ngIf="showToolbar" [gridID]="id"
22
[displayDensity]="displayDensity" #toolbar>
33
</igx-grid-toolbar>
44

0 commit comments

Comments
 (0)