From: Jeremy Thomas <bbxdesign@gmail.com>
Date: Sat, 19 Apr 2025 13:39:25 +0000 (+0200)
Subject: Fixes #3895
X-Git-Tag: 1.0.4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e133d45b7a829b278d2613cd0591b793f2f69f13;p=thirdparty%2Fbulma.git

Fixes #3895
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f56e209..7a5e5bff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,8 @@
 ### New Features
 
 - #3937: Add .has-text-weight-extrabold as a typography class.
-
+- #3906 fixes #3895: Make variables root configurable
+- 
 ### Bug Fixes
 
 - #3963: Improve colour loading versions of outlined buttons
diff --git a/sass/base/generic.scss b/sass/base/generic.scss
index b2229307..b0042461 100644
--- a/sass/base/generic.scss
+++ b/sass/base/generic.scss
@@ -1,3 +1,4 @@
+@use "../utilities/initial-variables" as iv;
 @use "../utilities/css-variables.scss" as cv;
 @use "../utilities/mixins" as mx;
 
@@ -32,7 +33,7 @@ $pre-font-size: 0.875em !default;
 $pre-padding: 1.25rem 1.5rem !default;
 $pre-code-font-size: 1em !default;
 
-#{cv.$variables-host} {
+#{iv.$variables-host} {
   @include cv.register-vars(
     (
       "body-background-color": #{$body-background-color},
diff --git a/sass/base/skeleton.scss b/sass/base/skeleton.scss
index 3ae23c64..f5c1d043 100644
--- a/sass/base/skeleton.scss
+++ b/sass/base/skeleton.scss
@@ -9,7 +9,7 @@ $skeleton-block-min-height: 4.5em !default;
 $skeleton-lines-gap: 0.75em !default;
 $skeleton-line-height: 0.75em !default;
 
-#{cv.$variables-host} {
+#{iv.$variables-host} {
   @include cv.register-vars(
     (
       "skeleton-background": #{$skeleton-background},
diff --git a/sass/components/navbar.scss b/sass/components/navbar.scss
index d4d6e38a..7ae7e35b 100644
--- a/sass/components/navbar.scss
+++ b/sass/components/navbar.scss
@@ -101,7 +101,7 @@ $navbar-colors: dv.$colors !default;
   z-index: cv.getVar("navbar-fixed-z");
 }
 
-#{cv.$variables-host} {
+#{iv.$variables-host} {
   @include cv.register-vars(
     (
       "navbar-height": #{$navbar-height},
diff --git a/sass/form/tools.scss b/sass/form/tools.scss
index 1855dd34..741a5c7c 100644
--- a/sass/form/tools.scss
+++ b/sass/form/tools.scss
@@ -15,7 +15,7 @@ $label-colors: shared.$form-colors !default;
 
 $field-block-spacing: 0.75rem !default;
 
-#{cv.$variables-host} {
+#{iv.$variables-host} {
   @include cv.register-vars(
     (
       "label-color": #{$label-color},
diff --git a/sass/grid/columns.scss b/sass/grid/columns.scss
index 1ec72a8a..d26f3a86 100644
--- a/sass/grid/columns.scss
+++ b/sass/grid/columns.scss
@@ -7,7 +7,7 @@
 
 $column-gap: 0.75rem !default;
 
-#{cv.$variables-host} {
+#{iv.$variables-host} {
   @include cv.register-vars(
     (
       "column-gap": #{$column-gap},
diff --git a/sass/themes/_index.scss b/sass/themes/_index.scss
index 8cc8a047..d665f383 100644
--- a/sass/themes/_index.scss
+++ b/sass/themes/_index.scss
@@ -1,13 +1,14 @@
 /* Bulma Themes */
 @charset "utf-8";
 
+@use "../utilities/initial-variables" as iv;
 @use "../utilities/css-variables" as cv;
 
 @use "light";
 @use "dark";
 @use "setup";
 
-#{cv.$variables-host} {
+#{iv.$variables-host} {
   @include light.light-theme;
   @include setup.setup-theme;
 }
diff --git a/sass/utilities/controls.scss b/sass/utilities/controls.scss
index 0f9d9153..47a3d758 100644
--- a/sass/utilities/controls.scss
+++ b/sass/utilities/controls.scss
@@ -16,10 +16,7 @@ $control-padding-horizontal: calc(0.75em - #{$control-border-width}) !default;
 
 $control-focus-shadow-l: 50% !default;
 
-@debug cv.$variables-host;
-@debug iv.$radius;
-
-#{cv.$variables-host} {
+#{iv.$variables-host} {
   @include cv.register-vars(
     (
       "control-radius": #{$control-radius},
diff --git a/sass/utilities/css-variables.scss b/sass/utilities/css-variables.scss
index ea2796c1..499fa35f 100644
--- a/sass/utilities/css-variables.scss
+++ b/sass/utilities/css-variables.scss
@@ -6,8 +6,6 @@
 @use "initial-variables" as iv;
 @use "functions" as fn;
 
-$variables-host: iv.$variables-host;
-
 @function buildVarName($name, $prefix: "", $suffix: "") {
   @return "--#{iv.$cssvars-prefix}#{$prefix}#{$name}#{$suffix}";
 }
@@ -497,7 +495,7 @@ $variables-host: iv.$variables-host;
 
 @mixin system-theme($name) {
   @media (prefers-color-scheme: #{$name}) {
-    #{$variables-host} {
+    #{iv.$variables-host} {
       @content;
     }
   }