Skip to content

Commit

Permalink
Revert "Update igniteui-angular to 18.2.0-beta.2 (#3535)"
Browse files Browse the repository at this point in the history
This reverts commit 0a1d717.
  • Loading branch information
gedinakova authored Oct 10, 2024
1 parent 0a1d717 commit 09dedb5
Show file tree
Hide file tree
Showing 27 changed files with 56 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-app-crm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}

- name: Install dependencies
run: npm ci --legacy-peer-deps
run: npm ci

- name: Run lint
run: npm run lint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-app-lob.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}

- name: Install dependencies
run: npm ci --legacy-peer-deps
run: npm ci

- name: Run lint
run: npm run lint
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
- task: Npm@1
inputs:
command: 'custom'
customCommand: 'install --legacy-peer-deps'
customCommand: 'install'
customEndpoint: 'public proget'
env:
AZURE_PIPELINES: "true"
Expand Down
26 changes: 13 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
"bootstrap": "5.3.2",
"file-saver": "^2.0.2",
"hammerjs": "^2.0.8",
"igniteui-angular": "^18.2.0-beta.2",
"igniteui-angular": "^18.1.7",
"igniteui-angular-charts": "^18.0.0",
"igniteui-angular-core": "^18.0.0",
"igniteui-angular-extras": "^18.0.5",
"igniteui-angular-i18n": "^18.2.0-beta.2",
"igniteui-angular-i18n": "^18.1.0",
"igniteui-dockmanager": "^1.14.2",
"igniteui-live-editing": "^2.3.0",
"igniteui-webcomponents": "^4.7.0",
Expand Down Expand Up @@ -111,4 +111,4 @@
"typescript": "5.4.5",
"webpack-bundle-analyzer": "^4.10.0"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

.selection-area {

@include scrollbar(scrollbar-theme($sb-size: 6px));
@include scrollbar(scrollbar-theme($scrollbar-size: 6px));
width: 100%;
height: 90%;
display: inline-flex;
Expand All @@ -50,6 +50,7 @@

$custom-badge-theme: badge-theme(
$border-color: contrast-color($color: 'gray', $variant: 900),
$border-width: #{rem(2px)},
$icon-color: contrast-color($color: 'gray', $variant: 900),
$text-color: contrast-color($color: 'gray', $variant: 50),
$background-color: contrast-color($color: 'gray', $variant: 500),
Expand Down Expand Up @@ -91,7 +92,7 @@ $custom-badge-theme: badge-theme(

.grid-chart-contextmenu-wrapper {
igx-grid {
@include scrollbar(scrollbar-theme($sb-size: 16px));
@include scrollbar(scrollbar-theme($scrollbar-size: 16px));
}
}

Expand Down Expand Up @@ -124,7 +125,7 @@ $custom-badge-theme: badge-theme(
}

igx-tab-content {
@include scrollbar(scrollbar-theme($sb-size: 10px));
@include scrollbar(scrollbar-theme($scrollbar-size: 10px));
}

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

.tab-options-wrapper {
@include scrollbar(scrollbar-theme($sb-size: 6px));
@include scrollbar(scrollbar-theme($scrollbar-size: 6px));

display: flex;
flex-flow: column;
Expand Down
2 changes: 1 addition & 1 deletion projects/app-lob/src/app/index/docs-layout.component.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
::ng-deep {
.custom-body {
color: var(--ig-surface-500-contrast);
background: var(--ig-surface-500);
background: hsla(var(--ig-surface-500));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

$custom-badge-theme: badge-theme(
$border-color: white,
$border-width: 1px,
$icon-color: white,
$text-color: black
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ igx-avatar {
z-index: 1;
--ig-size: var(--ig-size-medium);
--background: hsla(var(--ig-secondary-500), 6%);
border: 1px solid var(--ig-secondary-500);
border: 1px solid hsl(var(--ig-secondary-500));
border-radius: rem(4px);

igx-icon {
--size: #{rem(48px)};
color: var(--ig-secondary-500);
color: hsl(var(--ig-secondary-500));
}
}

Expand All @@ -31,5 +31,5 @@ igx-icon[backdrop] {
inset-inline: calc(100% - var(--size));
z-index: -1;
position: absolute;
color: var(--ig-gray-300);
color: hsl(var(--ig-gray-300));
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class GridMultiCellSelectionComponent {

public transferData(source: IgxGridComponent, target: IgxGridComponent,
notification: IgxToastComponent) {
target.autoGenerate = true;
target.shouldGenerate = true;
target.clearCellSelection();
this.targetData = source.getSelectedData();
notification.positionSettings.verticalDirection = VerticalAlignment.Middle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ igx-buttongroup {
min-width: 70px;
justify-self: flex-start;
text-align: left;
color: var(--ig-secondary-600);
color: hsla(var(--ig-secondary-600));
user-select: none;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ igx-buttongroup {
align-items: center;
gap: 4px;
justify-content: space-between;
color: var(--ig-gray-900);
color: hsla(var(--ig-gray-900));

span {
user-select: all;
Expand All @@ -42,15 +42,15 @@ igx-buttongroup {
min-width: 70px;
justify-self: flex-start;
text-align: left;
color: var(--ig-secondary-600);
color: hsla(var(--ig-secondary-600));
user-select: none;
}
}

> * {
padding: 8px 0;
line-height: 18px;
border-bottom: 1px dashed var(--ig-gray-400);
border-bottom: 1px dashed hsla(var(--ig-gray-400));

&:last-child {
border-bottom: none;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ igx-buttongroup {
min-width: 70px;
justify-self: flex-start;
text-align: left;
color: var(--ig-secondary-600);
color: hsla(var(--ig-secondary-600));
user-select: none;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/index/docs-layout.component.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
::ng-deep {
.custom-body {
color: var(--ig-surface-500-contrast);
background: var(--ig-surface-500);
background: hsla(var(--ig-surface-500));
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="wrapper">
<igx-query-builder #queryBuilder
[entities]="[{ name: '', fields: fields}]"
[fields]="fields"
[expressionTree]="expressionTree">
<igx-query-builder-header [title]="'Query Builder Overview'" [showLegend]="true">
</igx-query-builder-header>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<igx-query-builder #queryBuilder
[entities]="[{ name: '', fields: fields}]">
[fields]="fields">
</igx-query-builder>
2 changes: 1 addition & 1 deletion src/app/interactions/toggle/toggle-samples.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

.custom-body & {
color: var(--ig-surface-500-contrast);
background-color: var(--ig-surface-500);
background-color: hsla(var(--ig-surface-500));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
padding: 16px;

.selected {
background-color: var(--ig-secondary-500)
background-color: hsla(var(--ig-secondary-500))
}

.list-sample {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

::ng-deep {
.upFontValue {
color: var(--ig-success-500);
color: hsla(var(--ig-success-500));
}

.downFontValue {
color: var(--ig-error-500);
color: hsla(var(--ig-error-500));
}

igx-pivot-data-selector {
Expand Down
4 changes: 2 additions & 2 deletions src/app/pivot-grid/pivot-layout/pivot-layout.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

::ng-deep {
.upFontValue {
color: var(--ig-success-500);
color: hsla(var(--ig-success-500));
}

.downFontValue {
color: var(--ig-error-500);
color: hsla(var(--ig-error-500));
}

igx-pivot-data-selector {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

::ng-deep {
.upFontValue {
color: var(--ig-success-500);
color: hsla(var(--ig-success-500));
}

.downFontValue {
color: var(--ig-error-500);
color: hsla(var(--ig-error-500));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
.info {
display: flex;
justify-content: center;
background: var(--ig-surface-500);
background: hsla(var(--ig-surface-500));
}

.info > span {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ small {
flex-direction: column;
gap: 8px;
background: hsla(var(--ig-gray-50));
border-left: 1px solid var(--ig-gray-300);
border-left: 1px solid hsla(var(--ig-gray-300));
padding: $padding;
overflow-x: auto;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
.stay__info {
display: flex;
justify-content: center;
background: var(--ig-surface-500);
background: hsla(var(--ig-surface-500));
}

.stay__info > span {
Expand Down
10 changes: 5 additions & 5 deletions src/app/theming/angular/angular-sample.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -202,24 +202,24 @@ igx-expansion-panel-body {
.warning {
color: color($igx-light-palette, "warn");
}
}
}

::ng-deep {
@include theme($igx-light-palette);
@include mat.all-component-themes($custom-mat-light-theme);

.mat-mdc-slider.secondary .mdc-slider__track--inactive,
.mat-mdc-slider.secondary .mdc-slider__thumb-knob {
background-color: color($igx-light-palette, 'secondary');
background-color: color($custom-mat-light-theme, 'secondary');
}

.mat-mdc-slider.secondary .mdc-slider__track--active_fill,
.mat-mdc-slider.secondary .mdc-slider__thumb-knob {
border-color: color($igx-light-palette, 'secondary');
border-color: color($custom-mat-light-theme, 'secondary');
}

.mat-mdc-slider.secondary .mat-mdc-slider-visual-thumb .mat-ripple > * {
background-color: color($igx-light-palette, 'secondary');
background-color: color($custom-mat-light-theme, 'secondary');
opacity: .12;
}

Expand All @@ -229,7 +229,7 @@ igx-expansion-panel-body {

.mat-mdc-form-field-focus-overlay,
.mdc-text-field--filled:not(.mdc-text-field--disabled) {
background-color: color($igx-light-palette, 'surface');
background-color: color($custom-mat-light-theme, 'surface');
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class TreeGridMultiCellSelectionComponent {

public transferData(source: IgxTreeGridComponent, target: IgxGridComponent,
notification: IgxToastComponent) {
target.autoGenerate = true;
target.shouldGenerate = true;
target.clearCellSelection();
this.targetData = source.getSelectedData();
notification.positionSettings.verticalDirection = VerticalAlignment.Middle;
Expand Down
Loading

0 comments on commit 09dedb5

Please sign in to comment.