Skip to content

Commit b691a44

Browse files
authored
Merge branch '15.0.x' into vkombov/fix-12391-15.0.x
2 parents 79c2746 + 8976310 commit b691a44

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

package-lock.json

Lines changed: 7 additions & 7 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
@@ -114,7 +114,7 @@
114114
"hammer-simulator": "0.0.1",
115115
"ig-typedoc-theme": "^4.2.0",
116116
"igniteui-sassdoc-theme": "^1.1.4",
117-
"igniteui-theming": "^1.1.4",
117+
"igniteui-theming": "^1.2.0",
118118
"igniteui-webcomponents": "^4.0.0",
119119
"jasmine": "^4.5.0",
120120
"jasmine-core": "~4.5.0",

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"@angular/core": "^15.0.0",
8484
"@angular/animations": "^15.0.0",
8585
"@angular/forms": "^15.0.0",
86-
"igniteui-theming": "^1.1.2"
86+
"igniteui-theming": "^1.2.0"
8787
},
8888
"igxDevDependencies": {
8989
"@igniteui/angular-schematics": "~15.0.1100"

projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,8 @@
640640
igx-years-view,
641641
igx-month-picker,
642642
igx-months-view {
643+
color: var-get($theme, 'content-text-color');
644+
643645
%cal-body-display {
644646
@if $bootstrap-theme {
645647
padding-bottom: 0;

projects/igniteui-angular/src/lib/core/styles/components/dock-manager/_dock-manager-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666
$theme: digest-schema($dock-manager-schema);
6767

68-
@return extend($theme, (name: $name), keywords($rest));
68+
@return extend($theme, (name: $name, prefix: 'igc'), keywords($rest));
6969
}
7070

7171
/// @param {Map} $theme - The theme used to style the component.

0 commit comments

Comments
 (0)