Skip to content

Commit b911ded

Browse files
authored
Merge branch '15.0.x' into tree-grid-tests
2 parents 43e0081 + 4b87bc7 commit b911ded

File tree

5 files changed

+11
-17
lines changed

5 files changed

+11
-17
lines changed

package-lock.json

Lines changed: 4 additions & 12 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
@@ -67,6 +67,7 @@
6767
"core-js": "^3.26.1",
6868
"fflate": "^0.7.3",
6969
"hammerjs": "^2.0.8",
70+
"igniteui-theming": "^1.2.0",
7071
"igniteui-trial-watermark": "^1.0.3",
7172
"karma-junit-reporter": "^2.0.1",
7273
"lodash-es": "^4.17.21",
@@ -115,7 +116,6 @@
115116
"hammer-simulator": "0.0.1",
116117
"ig-typedoc-theme": "^4.2.0",
117118
"igniteui-sassdoc-theme": "^1.1.4",
118-
"igniteui-theming": "^1.2.0",
119119
"igniteui-webcomponents": "^4.0.0",
120120
"jasmine": "^4.5.0",
121121
"jasmine-core": "~4.5.0",

projects/igniteui-angular/ng-package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"igniteui-trial-watermark",
1313
"lodash-es",
1414
"uuid",
15-
"@igniteui/material-icons-extended"
15+
"@igniteui/material-icons-extended",
16+
"igniteui-theming"
1617
]
1718
}

projects/igniteui-angular/ng-package.prod.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"igniteui-trial-watermark",
1212
"lodash-es",
1313
"uuid",
14-
"@igniteui/material-icons-extended"
14+
"@igniteui/material-icons-extended",
15+
"igniteui-theming"
1516
]
1617
}

projects/igniteui-angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@
7676
"igniteui-trial-watermark": "^1.0.3",
7777
"lodash-es": "^4.17.21",
7878
"uuid": "^8.3.0",
79+
"igniteui-theming": "^1.2.0",
7980
"@igniteui/material-icons-extended": "^2.10.0"
8081
},
8182
"peerDependencies": {
8283
"@angular/common": "^15.0.0",
8384
"@angular/core": "^15.0.0",
8485
"@angular/animations": "^15.0.0",
85-
"@angular/forms": "^15.0.0",
86-
"igniteui-theming": "^1.2.0"
86+
"@angular/forms": "^15.0.0"
8787
},
8888
"igxDevDependencies": {
8989
"@igniteui/angular-schematics": "~15.0.1100"

0 commit comments

Comments
 (0)