Skip to content

Commit 426eb2f

Browse files
authored
Merge pull request #3455 from IgniteUI/17.2.0-update
17.2.0 update
2 parents 1b6bc0c + 44539aa commit 426eb2f

File tree

27 files changed

+103
-121
lines changed

27 files changed

+103
-121
lines changed

.github/workflows/build-app-crm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}
5050

5151
- name: Install dependencies
52-
run: npm ci
52+
run: npm ci --legacy-peer-deps
5353

5454
- name: Run lint
5555
run: npm run lint

.github/workflows/build-app-lob.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}
5555

5656
- name: Install dependencies
57-
run: npm ci
57+
run: npm ci --legacy-peer-deps
5858

5959
- name: Run lint
6060
run: npm run lint

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ steps:
1717
- task: Npm@1
1818
inputs:
1919
command: 'custom'
20-
customCommand: 'install'
20+
customCommand: 'install --legacy-peer-deps'
2121
customEndpoint: 'public proget'
2222
env:
2323
AZURE_PIPELINES: "true"

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
"bootstrap": "5.3.2",
6666
"file-saver": "^2.0.2",
6767
"hammerjs": "^2.0.8",
68-
"igniteui-angular": "^17.1.0-rc.0",
68+
"igniteui-angular": "^17.2.0-beta.2",
6969
"igniteui-angular-charts": "^17.2.1",
7070
"igniteui-angular-core": "^17.2.1",
7171
"igniteui-angular-extras": "^17.1.5",
72-
"igniteui-angular-i18n": "^17.1.0",
72+
"igniteui-angular-i18n": "^17.2.0-beta.2",
7373
"igniteui-dockmanager": "^1.14.2",
7474
"igniteui-live-editing": "^2.1.0",
7575
"igniteui-webcomponents": "^4.7.0",
@@ -111,4 +111,4 @@
111111
"typescript": "5.3.3",
112112
"webpack-bundle-analyzer": "^4.10.0"
113113
}
114-
}
114+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<span class="btn" igxButton="contained" igxButtonColor="black" igxButtonBackground="#72da67" igxRipple="white">Span</span>
1+
<span class="btn" igxButton="contained" igxRipple="white">Span</span>

src/app/grid/grid-editing-style-sample/grid-editing-style-sample.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $checkbox-theme: checkbox-theme(
1919
);
2020

2121
$datepicker-theme: calendar-theme(
22-
$date-selected-text-color: $white,
22+
$date-selected-foreground: $white,
2323
$date-selected-background: $blue
2424
);
2525

src/app/grid/grid-multi-row-layout-configuration/grid-multi-row-layout-configuration.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@
115115
</igx-chips-area>
116116
</div>
117117
<div style="width: 100%; text-align: center; margin: 10px;">
118-
<span igxButton="contained" class="bottomButton" (click)="resetCollections()" [igxButtonBackground]="'#ff134a'" [igxButtonColor]="'white'">Clear Layout</span>
119-
<span igxButton="contained" class="bottomButton" (click)="getColumnLayoutTemplate()" [igxButtonBackground]="'#1377d5'" [igxButtonColor]="'white'">Template</span>
120-
<span igxButton="contained" class="bottomButton" (click)="renderJson()" [igxButtonBackground]="'#1377d5'" [igxButtonColor]="'white'">JSON</span>
118+
<span igxButton="contained" class="bottomButton" (click)="resetCollections()">Clear Layout</span>
119+
<span igxButton="contained" class="bottomButton" (click)="getColumnLayoutTemplate()">Template</span>
120+
<span igxButton="contained" class="bottomButton" (click)="renderJson()">JSON</span>
121121
</div>
122122

123123
<igx-dialog #resultDialog title="Result"

src/app/grid/grid-save-state/about.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<span>Navigating to the previous page, components will reinitialize as per their initial configuration, therefore the igxGrid will lose its state.</span>
44
<br />
55
<span>What our GridSaveStateComponent does is reading the state from the window.localStorage object and applying the corresponding state in the AfterViewInit lifecycle.</span><br />
6-
<span igxButton="contained" igxButtonColor="white" igxButtonBackground="#e41c77" [routerLink]="['../grid-state']">Go Back</span>
6+
<span igxButton="contained" [routerLink]="['../grid-state']">Go Back</span>
77
</div>

src/app/hierarchical-grid/hierarchical-grid-editing-style/hierarchical-grid-editing-style.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ $checkbox-theme: checkbox-theme(
3030
);
3131

3232
$datepicker-theme: calendar-theme(
33-
$date-selected-text-color: $white,
33+
$date-selected-foreground: $white,
3434
$date-selected-background: $blue
3535
);
3636

0 commit comments

Comments
 (0)