Merge branch 'trunk' into font-library/improve-font-variant-selection

WordPress · Nov 30, 2023 · 15e33e9 · 15e33e9
2 parents ebd9b91 + 7b1f24c
commit 15e33e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -4,8 +4,9 @@
 
 ### Enhancements
 
--   `CheckboxControl`: Add option to not render label ([#56158](https://github.com/WordPress/gutenberg/pull/56158)).
+-   `FormToggle`: fix sass deprecation warning ([#56672](https://github.com/WordPress/gutenberg/pull/56672)).
 -   `QueryControls`: Add opt-in prop for 40px default size ([#56576](https://github.com/WordPress/gutenberg/pull/56576)).
+-   `CheckboxControl`: Add option to not render label ([#56158](https://github.com/WordPress/gutenberg/pull/56158)).
 
 ## 25.13.0 (2023-11-29)
 

diff --git a/packages/components/src/form-toggle/style.scss b/packages/components/src/form-toggle/style.scss
@@ -1,3 +1,5 @@
+@use "sass:math";
+
 $toggle-width: 36px;
 $toggle-height: 18px;
 $toggle-border-width: 1px;
@@ -20,7 +22,7 @@ $transition-duration: 0.2s;
 		border: $toggle-border-width solid $gray-900;
 		width: $toggle-width;
 		height: $toggle-height;
-		border-radius: $toggle-height * 0.5;
+		border-radius: math.div($toggle-height, 2);
 		transition:
 			$transition-duration background-color ease,
 			$transition-duration border-color ease;
@@ -59,7 +61,7 @@ $transition-duration: 0.2s;
 		background-color: $gray-900;
 
 		// Transparent border acts as a fill in Windows High Contrast Mode.
-		border: $thumb-size / 2 solid transparent;
+		border: math.div($thumb-size, 2) solid transparent;
 	}
 
 	// Checked state.