From 4263ea30f23951a3b7bb7341cb868c3a78d3b09d Mon Sep 17 00:00:00 2001
From: Aurooba Ahmed <hey@aurooba.com>
Date: Wed, 31 May 2023 17:47:11 -0600
Subject: [PATCH 1/5] removes the `size` and `font-size` mixins

---
 src/scss/utils/mixins.scss | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/scss/utils/mixins.scss b/src/scss/utils/mixins.scss
index efd4709..3c00b0e 100644
--- a/src/scss/utils/mixins.scss
+++ b/src/scss/utils/mixins.scss
@@ -1,11 +1,5 @@
 @use "props" as *;
 
-/// Size an element
-@mixin size($width, $height: $width) {
-	width: $width;
-	height: $height;
-}
-
 /// Add left/right padding to an element
 @mixin padding(
 	$top: ref("style.root.paddingTop"),
@@ -34,13 +28,6 @@
 	margin-bottom: $bottom;
 }
 
-/// Set font size, line height, and letter spacing
-@mixin font-size($font-size, $line-height: normal, $letter-spacing: normal) {
-	font-size: $font-size;
-	line-height: $line-height;
-	letter-spacing: $letter-spacing;
-}
-
 /// Simple fade-in animation
 @mixin fade($type: "hide") {
 	@if $type == "hide" {

From 87e3a39096a6cb981e63f2c678c105f47923d6d3 Mon Sep 17 00:00:00 2001
From: Aurooba Ahmed <hey@aurooba.com>
Date: Wed, 31 May 2023 21:59:34 -0600
Subject: [PATCH 2/5] remove duplicate margin-y mixin

---
 src/scss/utils/mixins.scss | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/scss/utils/mixins.scss b/src/scss/utils/mixins.scss
index 3c00b0e..14a7f4a 100644
--- a/src/scss/utils/mixins.scss
+++ b/src/scss/utils/mixins.scss
@@ -22,12 +22,6 @@
 	margin-right: $right;
 }
 
-/// Add top/bottom margin to an element
-@mixin margin-y($top, $bottom: $top) {
-	margin-top: $top;
-	margin-bottom: $bottom;
-}
-
 /// Simple fade-in animation
 @mixin fade($type: "hide") {
 	@if $type == "hide" {

From 72eb796d85b276f1acd6abfa1411ffc1a2b01a9b Mon Sep 17 00:00:00 2001
From: Aurooba Ahmed <hey@aurooba.com>
Date: Wed, 31 May 2023 22:00:45 -0600
Subject: [PATCH 3/5] update comments on visually hidden mixins

---
 src/scss/utils/mixins.scss | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/scss/utils/mixins.scss b/src/scss/utils/mixins.scss
index 14a7f4a..2c9f1f3 100644
--- a/src/scss/utils/mixins.scss
+++ b/src/scss/utils/mixins.scss
@@ -35,7 +35,6 @@
 	}
 }
 
-
 /// Flow mixin
 @mixin flow($gap: ref("style.blockGap")) {
 	& > * + * {
@@ -57,7 +56,6 @@
 	}
 }
 
-
 /// Blocks alignment mixin
 @mixin blocks-alignment() {
 	padding-right: ref("style.root.paddingRight");
@@ -90,7 +88,7 @@
 	}
 }
 
-/// Visually Hidden
+/// Always visually hidden, but accessible to screen readers
 @mixin always-visually-hidden() {
 	border: 0;
 	clip: rect(0 0 0 0);
@@ -103,6 +101,7 @@
 	white-space: nowrap;
 }
 
+/// Visually hidden, accessible to screen readers, but visible on focus
 @mixin visually-hidden() {
 	&:not(:focus):not(:active) {
 		@include always-visually-hidden();

From 2a1e9f1933a04e607e64cc3ee9d343f265db03f1 Mon Sep 17 00:00:00 2001
From: Aurooba Ahmed <hey@aurooba.com>
Date: Wed, 31 May 2023 22:05:36 -0600
Subject: [PATCH 4/5] add padding/margin x/y mixins

---
 src/scss/utils/mixins.scss | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/scss/utils/mixins.scss b/src/scss/utils/mixins.scss
index 2c9f1f3..c501ba9 100644
--- a/src/scss/utils/mixins.scss
+++ b/src/scss/utils/mixins.scss
@@ -1,13 +1,26 @@
 @use "props" as *;
 
 /// Add left/right padding to an element
+@mixin padding-x($left: ref("style.root.paddingLeft"), $right: ref("style.root.paddingRight")) {
+	padding-left: $left;
+	padding-right: $right;
+}
+
+/// Add top/bottom padding to an element
+@mixin padding-y($top: ref("style.root.paddingTop"), $bottom: ref("style.root.paddingBottom")) {
+	padding-top: $top;
+	padding-bottom: $bottom;
+}
+
+/// Add padding to an element
 @mixin padding(
 	$top: ref("style.root.paddingTop"),
 	$right: ref("style.root.paddingRight"),
 	$bottom: ref("style.root.paddingBottom"),
 	$left: ref("style.root.paddingLeft")
 ) {
-	padding: $top $right $bottom $left;
+	@include padding-y($top, $bottom);
+	@include padding-x($left, $right);
 }
 
 /// Add top/bottom padding to an element
@@ -17,11 +30,17 @@
 }
 
 /// Add left/right margin to an element
-@mixin margin-x($left, $right: $left) {
+@mixin margin-x($right, $left: $right) {
 	margin-left: $left;
 	margin-right: $right;
 }
 
+/// Add margin to an element
+@mixin margin($top, $right: $top, $bottom: $top, $left: $right) {
+	@include margin-y($top, $bottom);
+	@include margin-x($left, $right);
+}
+
 /// Simple fade-in animation
 @mixin fade($type: "hide") {
 	@if $type == "hide" {

From 21ef1da031e8f57947857b178ca1ca13b44b44ca Mon Sep 17 00:00:00 2001
From: Brian Coords <bacoords@gmail.com>
Date: Thu, 11 Apr 2024 16:39:46 -0700
Subject: [PATCH 5/5] fixes old props references

---
 src/scss/utils/mixins.scss | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/scss/utils/mixins.scss b/src/scss/utils/mixins.scss
index f148390..e3671f3 100644
--- a/src/scss/utils/mixins.scss
+++ b/src/scss/utils/mixins.scss
@@ -1,5 +1,3 @@
-@use "props" as *;
-
 /// Size an element
 @mixin size($width, $height: $width) {
 	width: $width;
@@ -7,12 +5,13 @@
 }
 
 /// Add left/right padding to an element
-@mixin padding-x($left: ref("style.root.paddingLeft"), $right: ref("style.root.paddingRight")) {
+@mixin padding-x($left: var(--wp--style--root--padding-left), $right: var(--wp--style--root--padding-right)) {
 	padding-left: $left;
 	padding-right: $right;
+}
 
 /// Add top/bottom padding to an element
-@mixin padding-y($top: ref("style.root.paddingTop"), $bottom: ref("style.root.paddingBottom")) {
+@mixin padding-y($top: var(--wp--style--root--padding-top), $bottom: var(--wp--style--root--padding-bottom)) {
 	padding-top: $top;
 	padding-bottom: $bottom;
 }