Skip to content

Commit 0a6e0b5

Browse files
Revert "Update igniteui-angular to 18.2.0-beta.2" (#3543)
* Revert "Update igniteui-angular to 18.2.0-beta.2 * fix(query-builder): revert styling in the QB sample --------- Co-authored-by: Galina Edinakova <[email protected]>
1 parent 6a4ed46 commit 0a6e0b5

File tree

28 files changed

+59
-75
lines changed

28 files changed

+59
-75
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 --legacy-peer-deps
52+
run: npm ci
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 --legacy-peer-deps
57+
run: npm ci
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 --legacy-peer-deps'
20+
customCommand: 'install'
2121
customEndpoint: 'public proget'
2222
env:
2323
AZURE_PIPELINES: "true"

package-lock.json

Lines changed: 13 additions & 13 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": "^18.2.0-beta.2",
68+
"igniteui-angular": "^18.1.7",
6969
"igniteui-angular-charts": "^18.0.0",
7070
"igniteui-angular-core": "^18.0.0",
7171
"igniteui-angular-extras": "^18.0.5",
72-
"igniteui-angular-i18n": "^18.2.0-beta.2",
72+
"igniteui-angular-i18n": "^18.1.0",
7373
"igniteui-dockmanager": "^1.14.2",
7474
"igniteui-live-editing": "^2.3.0",
7575
"igniteui-webcomponents": "^4.7.0",
@@ -111,4 +111,4 @@
111111
"typescript": "5.4.5",
112112
"webpack-bundle-analyzer": "^4.10.0"
113113
}
114-
}
114+
}

projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
.selection-area {
3434

35-
@include scrollbar(scrollbar-theme($sb-size: 6px));
35+
@include scrollbar(scrollbar-theme($scrollbar-size: 6px));
3636
width: 100%;
3737
height: 90%;
3838
display: inline-flex;
@@ -50,6 +50,7 @@
5050

5151
$custom-badge-theme: badge-theme(
5252
$border-color: contrast-color($color: 'gray', $variant: 900),
53+
$border-width: #{rem(2px)},
5354
$icon-color: contrast-color($color: 'gray', $variant: 900),
5455
$text-color: contrast-color($color: 'gray', $variant: 50),
5556
$background-color: contrast-color($color: 'gray', $variant: 500),
@@ -91,7 +92,7 @@ $custom-badge-theme: badge-theme(
9192

9293
.grid-chart-contextmenu-wrapper {
9394
igx-grid {
94-
@include scrollbar(scrollbar-theme($sb-size: 16px));
95+
@include scrollbar(scrollbar-theme($scrollbar-size: 16px));
9596
}
9697
}
9798

@@ -124,7 +125,7 @@ $custom-badge-theme: badge-theme(
124125
}
125126

126127
igx-tab-content {
127-
@include scrollbar(scrollbar-theme($sb-size: 10px));
128+
@include scrollbar(scrollbar-theme($scrollbar-size: 10px));
128129
}
129130

130131
}
@@ -146,7 +147,7 @@ $custom-badge-theme: badge-theme(
146147
$font-family: 'Titillium Web', 'Roboto', 'Helvetica Neue', sans-serif;
147148

148149
.tab-options-wrapper {
149-
@include scrollbar(scrollbar-theme($sb-size: 6px));
150+
@include scrollbar(scrollbar-theme($scrollbar-size: 6px));
150151

151152
display: flex;
152153
flex-flow: column;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
::ng-deep {
22
.custom-body {
33
color: var(--ig-surface-500-contrast);
4-
background: var(--ig-surface-500);
4+
background: hsla(var(--ig-surface-500));
55
}
66
}

src/app/data-display/badge/badge-styling-sample/badge-styling-sample.component.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
$custom-badge-theme: badge-theme(
2323
$border-color: white,
24+
$border-width: 1px,
2425
$icon-color: white,
2526
$text-color: black
2627
);

src/app/data-display/icon/icon-service-sample/icon-service-sample.component.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ igx-avatar {
1616
z-index: 1;
1717
--ig-size: var(--ig-size-medium);
1818
--background: hsla(var(--ig-secondary-500), 6%);
19-
border: 1px solid var(--ig-secondary-500);
19+
border: 1px solid hsl(var(--ig-secondary-500));
2020
border-radius: rem(4px);
2121

2222
igx-icon {
2323
--size: #{rem(48px)};
24-
color: var(--ig-secondary-500);
24+
color: hsl(var(--ig-secondary-500));
2525
}
2626
}
2727

@@ -31,5 +31,5 @@ igx-icon[backdrop] {
3131
inset-inline: calc(100% - var(--size));
3232
z-index: -1;
3333
position: absolute;
34-
color: var(--ig-gray-300);
34+
color: hsl(var(--ig-gray-300));
3535
}

src/app/grid/grid-multi-cell-selection/grid-multi-cell-selection.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class GridMultiCellSelectionComponent {
1515

1616
public transferData(source: IgxGridComponent, target: IgxGridComponent,
1717
notification: IgxToastComponent) {
18-
target.autoGenerate = true;
18+
target.shouldGenerate = true;
1919
target.clearCellSelection();
2020
this.targetData = source.getSelectedData();
2121
notification.positionSettings.verticalDirection = VerticalAlignment.Middle;

0 commit comments

Comments
 (0)