diff --git a/package-lock.json b/package-lock.json index a65f0cc8d..4bac15423 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 39a383d7d..e756b2a00 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", diff --git a/src/styles/themes/base/_theme.scss b/src/styles/themes/base/_theme.scss index 4aa497c5a..47536e21d 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 fcd2b484b..be9181077 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 a5fc4ebde..5393248cd 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); -}