From 98d045c0de1f3848f60d53cd727cac5314253b62 Mon Sep 17 00:00:00 2001 From: Adrian Petrov Date: Mon, 9 Nov 2026 10:22:58 +0200 Subject: [PATCH 1/2] feat: apply the new theme-markers mixin and remove old wrapper --- src/styles/themes/base/_theme.scss | 4 ++-- src/styles/utilities/_index.scss | 2 +- src/styles/utilities/_overwrites.scss | 15 --------------- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/styles/themes/base/_theme.scss b/src/styles/themes/base/_theme.scss index 4aa497c5ae..47536e21d9 100644 --- a/src/styles/themes/base/_theme.scss +++ b/src/styles/themes/base/_theme.scss @@ -17,8 +17,8 @@ } :root { - --ig-theme: #{map.get($palette, '_meta', 'variant')}; - --ig-theme-variant: #{$variant}; + @include theme-markers(map.get($palette, '_meta', 'variant'), $variant); + --ig-scrollbar-size: #{rem(16px)}; } diff --git a/src/styles/utilities/_index.scss b/src/styles/utilities/_index.scss index fcd2b484b9..be9181077d 100644 --- a/src/styles/utilities/_index.scss +++ b/src/styles/utilities/_index.scss @@ -6,6 +6,6 @@ @forward 'igniteui-theming/sass/typography/functions'; @forward 'igniteui-theming/sass/typography/mixins'; @forward 'igniteui-theming/sass/themes/functions'; -@forward 'igniteui-theming/sass/themes/mixins' hide css-vars-from-theme; +@forward 'igniteui-theming/sass/themes/mixins'; @forward 'igniteui-theming/sass/utils'; @forward 'overwrites'; diff --git a/src/styles/utilities/_overwrites.scss b/src/styles/utilities/_overwrites.scss index a5fc4ebde9..5393248cd8 100644 --- a/src/styles/utilities/_overwrites.scss +++ b/src/styles/utilities/_overwrites.scss @@ -1,7 +1,5 @@ -@use 'sass:map'; @use 'igniteui-theming/sass/color/functions' as theming; @use 'igniteui-theming/sass/themes/config' as themes; -@use 'igniteui-theming/sass/themes/mixins' as theme-mixins; @include themes.configure-variable-prefix('ig'); @function color( @@ -24,16 +22,3 @@ $opacity: $opacity ); } - -/// Emits the CSS variables of a component theme, without the `--ig-theme` and -/// `--ig-theme-variant` markers: the library reads them from the document -/// root only, where the global theme sheet declares them. -@mixin css-vars-from-theme($theme, $name: null, $ignored: theme-mixins.$ignored-keys) { - $meta: map.get($theme, '_meta'); - - @if $meta { - $theme: map.set($theme, '_meta', map.remove($meta, 'theme', 'variant')); - } - - @include theme-mixins.css-vars-from-theme($theme, $name, $ignored); -} From 25e9d5f2da24b9e35da61189c02b9aed777f4a10 Mon Sep 17 00:00:00 2001 From: Adrian Petrov Date: Tue, 10 Nov 2026 12:17:25 +0200 Subject: [PATCH 2/2] bump: increase igniteui-theming version to 30.2.0 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a65f0cc8d5..4bac154232 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "husky": "^9.1.7", "ig-typedoc-theme": "^7.0.1", "igniteui-i18n-resources": "^2.0.0-rc.3", - "igniteui-theming": "^30.1.0", + "igniteui-theming": "^30.2.0", "keep-a-changelog": "^3.2.0", "lint-staged": "^17.6.0", "lit-analyzer": "^2.0.3", @@ -8782,9 +8782,9 @@ } }, "node_modules/igniteui-theming": { - "version": "30.1.0", - "resolved": "https://registry.npmjs.org/igniteui-theming/-/igniteui-theming-30.1.0.tgz", - "integrity": "sha512-3UEK2p4Aw5fu9v0MNlyqauapx99oBVoPmYp/A3IA71Y3FhKHnfEhnPshwxLR4qHi7XRSpAO84Nekmo4gSH1ZoA==", + "version": "30.2.0", + "resolved": "https://registry.npmjs.org/igniteui-theming/-/igniteui-theming-30.2.0.tgz", + "integrity": "sha512-nYdHKYG1FjuzB3rpz6sLlc2sYTR4HOABB3wuWokQwZj8i/cfvoBbJrsH9JESXGwcyYuq++3ZaaFG4yWBWEZG7Q==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 39a383d7dd..e756b2a00c 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "husky": "^9.1.7", "ig-typedoc-theme": "^7.0.1", "igniteui-i18n-resources": "^2.0.0-rc.3", - "igniteui-theming": "^30.1.0", + "igniteui-theming": "^30.2.0", "keep-a-changelog": "^3.2.0", "lint-staged": "^17.6.0", "lit-analyzer": "^2.0.3",