Skip to content

Commit f97e514

Browse files
authored
Merge pull request #3924 from IgniteUI/vnext
Updating prod for cell merging issue
2 parents b964bb4 + 9ba0146 commit f97e514

4 files changed

Lines changed: 43 additions & 11 deletions

File tree

.github/workflows/cd-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ jobs:
203203
await github.rest.repos.createDispatchEvent({
204204
owner: 'IgniteUI',
205205
repo: 'igniteui-actions',
206-
event_type: 'igniteui-angular-samples-cd',
206+
event_type: 'igniteui-samples-cd',
207207
client_payload: {
208208
calling_branch: "${{ env.BRANCH_REF }}",
209209
repository: "${{ github.repository }}",

package-lock.json

Lines changed: 38 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"file-saver": "^2.0.2",
7474
"fuse.js": "^7.1.0",
7575
"hammerjs": "^2.0.8",
76-
"igniteui-angular": "^21.1.0",
76+
"igniteui-angular": "^21.1.1",
7777
"igniteui-angular-charts": "^20.2.0",
7878
"igniteui-angular-core": "^20.2.0",
7979
"igniteui-angular-extras": "^21.0.0",
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<div class="pivot-container">
2-
<div style="flex-grow: 1;">
3-
<igx-pivot-grid #grid1 [data]="data" [pivotConfiguration]="pivotConfigHierarchy" [height]="'850px'"
4-
[superCompactMode]="true" [defaultExpandState]='true'>
5-
</igx-pivot-grid>
6-
</div>
2+
<igx-pivot-grid #grid1 [data]="data" [pivotConfiguration]="pivotConfigHierarchy" [height]="'850px'"
3+
[superCompactMode]="true" [defaultExpandState]='true'>
4+
</igx-pivot-grid>
75
<igx-pivot-data-selector [grid]="grid1"></igx-pivot-data-selector>
86
</div>

0 commit comments

Comments
 (0)