Merge branch '15.0.x' into tree-grid-tests

kdinev · web-flow · commit 3da1605e7ea7 · 2022-12-09T17:13:48.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -114,7 +114,7 @@
     "hammer-simulator": "0.0.1",
     "ig-typedoc-theme": "^4.2.0",
     "igniteui-sassdoc-theme": "^1.1.4",
-    "igniteui-theming": "^1.1.4",
+    "igniteui-theming": "^1.2.0",
     "igniteui-webcomponents": "^4.0.0",
     "jasmine": "^4.5.0",
     "jasmine-core": "~4.5.0",
diff --git a/projects/igniteui-angular/package.json b/projects/igniteui-angular/package.json
@@ -83,7 +83,7 @@
         "@angular/core": "^15.0.0",
         "@angular/animations": "^15.0.0",
         "@angular/forms": "^15.0.0",
-        "igniteui-theming": "^1.1.2"
+        "igniteui-theming": "^1.2.0"
     },
     "igxDevDependencies": {
         "@igniteui/angular-schematics": "~15.0.1100"
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/dock-manager/_dock-manager-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/dock-manager/_dock-manager-theme.scss
@@ -65,7 +65,7 @@
 
     $theme: digest-schema($dock-manager-schema);
 
-    @return extend($theme, (name: $name), keywords($rest));
+    @return extend($theme, (name: $name, prefix: 'igc'), keywords($rest));
 }
 
 /// @param {Map} $theme - The theme used to style the component.

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`
`66`	`66`	`$theme: digest-schema($dock-manager-schema);`
`67`	`67`
`68`		`- @return extend($theme, (name: $name), keywords($rest));`
	`68`	`+ @return extend($theme, (name: $name, prefix: 'igc'), keywords($rest));`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/// @param {Map} $theme - The theme used to style the component.`