Skip to content

Commit da49889

Browse files
simeonoffsimeonoff
committed
Merge branch 'master' into didimmova/add-tailwind-sample-vnext
2 parents 5c77899 + fb2d501 commit da49889

23 files changed

Lines changed: 547 additions & 292 deletions

‎live-editing/configs/HierarchicalGridConfigGenerator.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,15 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
654654
]
655655
}));
656656

657+
configs.push(new Config({
658+
component: 'HGridCellMergeCustomComponent',
659+
appConfig: BaseAppConfig,
660+
additionalFiles: [
661+
'/src/app/directives/prevent-scroll.directive.ts',
662+
'/src/app/data/hierarchical-data.ts'
663+
]
664+
}));
665+
657666
configs.push(new Config({
658667
component: 'HierarchicalGridBothSidePinningSampleComponent',
659668
appConfig: BaseAppConfig,

‎live-editing/configs/TreeGridConfigGenerator.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,15 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
800800
]
801801
}));
802802

803+
configs.push(new Config({
804+
component: 'TreeGridCellMergeCustomComponent',
805+
appConfig: BaseAppConfig,
806+
additionalFiles: [
807+
'/src/app/directives/prevent-scroll.directive.ts',
808+
'/src/app/tree-grid/data/employees-flat-detailed.ts'
809+
]
810+
}));
811+
803812
configs.push(new Config({
804813
component: 'TreeGridBothSidesPinningSampleComponent',
805814
additionalFiles: [

‎package-lock.json‎

Lines changed: 14 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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"@angular/ssr": "^20.3.1",
6363
"@igniteui/material-icons-extended": "^3.1.0",
6464
"@microsoft/signalr": "^8.0.7",
65-
"@ng-bootstrap/ng-bootstrap": "^19.0.0-rc.0",
65+
"@ng-bootstrap/ng-bootstrap": "^19.0.1",
6666
"@popperjs/core": "2.11.8",
6767
"@tailwindcss/postcss": "^4.1.10",
6868
"@types/file-saver": "^2.0.2",
@@ -72,13 +72,13 @@
7272
"express": "^4.18.2",
7373
"file-saver": "^2.0.2",
7474
"hammerjs": "^2.0.8",
75-
"igniteui-angular": "^20.1.0-rc.2",
75+
"igniteui-angular": "^20.1.0",
7676
"igniteui-angular-charts": "^19.0.1",
7777
"igniteui-angular-core": "^19.0.1",
7878
"igniteui-angular-extras": "^20.0.0",
79-
"igniteui-angular-i18n": "^20.1.0-rc.0",
79+
"igniteui-angular-i18n": "^20.1.0",
8080
"igniteui-dockmanager": "^1.17.0",
81-
"igniteui-live-editing": "^3.1.0-rc.1",
81+
"igniteui-live-editing": "^3.1.0",
8282
"igniteui-webcomponents": "^6.2.0",
8383
"minireset.css": "0.0.6",
8484
"postcss": "^8.5.5",
@@ -106,7 +106,7 @@
106106
"@angular/compiler": "^20.2.2"
107107
},
108108
"igniteui-angular-extras": {
109-
"igniteui-angular": "20.1.0-rc.2"
109+
"igniteui-angular": "^20.1.0"
110110
}
111111
},
112112
"devDependencies": {

‎src/app/grid/grid-advanced-filtering-style/grid-advanced-filtering-style.component.scss‎

Lines changed: 9 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,18 @@
11
@use "igniteui-angular/theming" as *;
22

3-
$yellow: #ffcd0f;
4-
$black: #292826;
5-
$muted-yellow: #ffe482;
6-
7-
$custom-button: button-theme(
8-
$schema: $dark-material-schema,
9-
$background: $black,
10-
$foreground: $yellow,
11-
$hover-foreground: $black,
12-
$hover-background: $yellow,
13-
$focus-foreground: $yellow,
14-
$focus-background: $black,
15-
$active-background: $yellow,
16-
$active-foreground: $black,
17-
$border-color: $yellow,
18-
$hover-border-color: $yellow,
19-
$focus-border-color: $yellow,
20-
$active-border-color: $yellow
21-
);
22-
23-
$custom-button-group: button-group-theme(
24-
$schema: $dark-material-schema,
25-
$item-background: $black,
26-
$item-text-color: $yellow,
27-
$item-border-color: $yellow,
28-
$item-selected-background: $yellow,
29-
$item-hover-background: $yellow,
30-
$item-selected-hover-background: $yellow,
31-
$item-disabled-border: $yellow,
32-
$item-selected-border-color: $yellow
33-
);
34-
35-
$custom-input-group: input-group-theme(
36-
$schema: $dark-material-schema,
37-
$idle-text-color: $yellow,
38-
$focused-text-color: $yellow,
39-
$filled-text-color: $yellow,
40-
$idle-bottom-line-color: $muted-yellow,
41-
$focused-secondary-color: $yellow
3+
$custom-query-builder: query-builder-theme(
4+
$header-foreground: #512da8,
5+
$color-expression-group-and: #eb0000,
6+
$color-expression-group-or: #0000f3,
7+
$subquery-header-background: var(--ig-gray-300),
8+
$subquery-border-color: var(--ig-warn-500),
9+
$subquery-border-radius: rem(4px)
4210
);
4311

44-
$custom-chip: chip-theme(
45-
$schema: $dark-material-schema,
46-
$background: $yellow,
47-
$text-color: $black
48-
);
49-
50-
$custom-drop-down: drop-down-theme(
51-
$schema: $dark-material-schema,
52-
$background-color: $black,
53-
$item-text-color: $yellow,
54-
$hover-item-background: $yellow,
55-
$hover-item-text-color: $black,
56-
$focused-item-background: $yellow,
57-
$focused-item-text-color: $black,
58-
$selected-item-background: $yellow,
59-
$selected-item-text-color: $black,
60-
$selected-focus-item-background: $yellow,
61-
$selected-focus-item-text-color: $black,
62-
$selected-hover-item-background: $yellow,
63-
$selected-hover-item-text-color: $black
64-
);
65-
66-
6712
:host {
6813
::ng-deep {
6914
igx-advanced-filtering-dialog {
70-
@include theme(
71-
$palette: $dark-material-palette
72-
);
73-
@include css-vars($custom-button);
74-
@include css-vars($custom-button-group);
75-
@include css-vars($custom-input-group);
76-
@include css-vars($custom-chip);
77-
@include css-vars($custom-drop-down);
15+
@include css-vars($custom-query-builder);
7816
}
7917
}
80-
}
81-
18+
}

‎src/app/grid/grid-excel-style-filtering-style/grid-excel-style-filtering-style.component.scss‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,21 @@ $yellow: #ffcd0f;
55
$black: #292826;
66

77
$custom-grid: grid-theme(
8-
$filtering-row-background: $yellow
8+
$filtering-row-background: $yellow,
9+
$excel-filtering-header-foreground: $black,
10+
$excel-filtering-subheader-foreground: $black,
11+
$excel-filtering-actions-foreground: #006400,
12+
$excel-filtering-actions-hover-foreground: $yellow,
13+
$excel-filtering-actions-disabled-foreground: var(--ig-gray-500)
914
);
1015

11-
$custom-flat-button: button-theme(
12-
$background: $yellow,
13-
$foreground: $black,
14-
$hover-background: $black,
15-
$hover-foreground: $yellow
16-
);
17-
18-
$custom-contained-button: button-theme(
16+
$custom-button: button-theme(
1917
$background: $black,
2018
$foreground: $yellow,
2119
$hover-background: $black,
2220
$hover-foreground: $yellow
2321
);
2422

25-
$custom-button-group: button-group-theme(
26-
$item-background: $yellow,
27-
$item-text-color: $black,
28-
$item-hover-background: $black,
29-
$item-hover-text-color: $yellow
30-
);
31-
3223
$custom-input-group: input-group-theme(
3324
$box-background: $yellow,
3425
$idle-text-color: $black,
@@ -49,8 +40,6 @@ $custom-checkbox: checkbox-theme(
4940

5041
$custom-drop-down: drop-down-theme(
5142
$background-color: $yellow,
52-
$selected-item-background: lighten($black, 10%),
53-
$selected-focus-item-background: lighten($black, 15%),
5443
$item-text-color: $black,
5544
$hover-item-background: $black,
5645
$hover-item-text-color: $yellow
@@ -63,11 +52,9 @@ $custom-drop-down: drop-down-theme(
6352
@include css-vars($custom-input-group);
6453
@include css-vars($custom-checkbox);
6554
@include css-vars($custom-list);
66-
@include css-vars($custom-flat-button);
67-
@include css-vars($custom-button-group);
6855

69-
.igx-excel-filter__apply {
70-
@include css-vars($custom-contained-button);
56+
.igx-excel-filter__menu-footer {
57+
@include css-vars($custom-button);
7158
}
7259
}
7360
}

‎src/app/hierarchical-grid/hierarchical-grid-advanced-filtering-style/hierarchical-grid-advanced-filtering-style.component.scss‎

Lines changed: 9 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,18 @@
11
@use "igniteui-angular/theming" as *;
22

3-
$yellow: #ffcd0f;
4-
$black: #292826;
5-
$muted-yellow: #ffe482;
6-
7-
$custom-button: button-theme(
8-
$schema: $dark-material-schema,
9-
$background: $black,
10-
$foreground: $yellow,
11-
$hover-foreground: $black,
12-
$hover-background: $yellow,
13-
$focus-foreground: $yellow,
14-
$focus-background: $black,
15-
$active-background: $yellow,
16-
$active-foreground: $black,
17-
$border-color: $yellow,
18-
$hover-border-color: $yellow,
19-
$focus-border-color: $yellow,
20-
$active-border-color: $yellow
21-
);
22-
23-
$custom-button-group: button-group-theme(
24-
$schema: $dark-material-schema,
25-
$item-background: $black,
26-
$item-text-color: $yellow,
27-
$item-border-color: $yellow,
28-
$item-selected-background: $yellow,
29-
$item-hover-background: $yellow,
30-
$item-selected-hover-background: $yellow,
31-
$item-disabled-border: $yellow,
32-
$item-selected-border-color: $yellow
33-
);
34-
35-
$custom-input-group: input-group-theme(
36-
$schema: $dark-material-schema,
37-
$idle-text-color: $yellow,
38-
$focused-text-color: $yellow,
39-
$filled-text-color: $yellow,
40-
$idle-bottom-line-color: $muted-yellow,
41-
$focused-secondary-color: $yellow
3+
$custom-query-builder: query-builder-theme(
4+
$header-foreground: #512da8,
5+
$color-expression-group-and: #eb0000,
6+
$color-expression-group-or: #0000f3,
7+
$subquery-header-background: var(--ig-gray-300),
8+
$subquery-border-color: var(--ig-warn-500),
9+
$subquery-border-radius: rem(4px)
4210
);
4311

44-
$custom-chip: chip-theme(
45-
$schema: $dark-material-schema,
46-
$background: $yellow,
47-
$text-color: $black
48-
);
49-
50-
$custom-drop-down: drop-down-theme(
51-
$schema: $dark-material-schema,
52-
$background-color: $black,
53-
$item-text-color: $yellow,
54-
$hover-item-background: $yellow,
55-
$hover-item-text-color: $black,
56-
$focused-item-background: $yellow,
57-
$focused-item-text-color: $black,
58-
$selected-item-background: $yellow,
59-
$selected-item-text-color: $black,
60-
$selected-focus-item-background: $yellow,
61-
$selected-focus-item-text-color: $black,
62-
$selected-hover-item-background: $yellow,
63-
$selected-hover-item-text-color: $black
64-
);
65-
66-
6712
:host {
6813
::ng-deep {
6914
igx-advanced-filtering-dialog {
70-
@include theme(
71-
$palette: $dark-material-palette
72-
);
73-
@include css-vars($custom-button);
74-
@include css-vars($custom-button-group);
75-
@include css-vars($custom-input-group);
76-
@include css-vars($custom-chip);
77-
@include css-vars($custom-drop-down);
15+
@include css-vars($custom-query-builder);
7816
}
7917
}
80-
}
81-
18+
}

0 commit comments

Comments
 (0)