From b8357ae85fb6e76e0a34a73a80647cc929d1b4b0 Mon Sep 17 00:00:00 2001
From: louismaximepiton <louismaxime.piton@orange.com>
Date: Wed, 4 Jan 2023 15:59:41 +0100
Subject: [PATCH 1/2] Fix

---
 scss/_root.scss      |  2 +-
 scss/_utilities.scss | 10 +++++-----
 scss/_variables.scss |  5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/scss/_root.scss b/scss/_root.scss
index 62ed0fd62138..db3e59b34ff2 100644
--- a/scss/_root.scss
+++ b/scss/_root.scss
@@ -106,7 +106,7 @@
   --#{$prefix}border-radius-sm: #{$border-radius-sm};
   --#{$prefix}border-radius-lg: #{$border-radius-lg};
   --#{$prefix}border-radius-xl: #{$border-radius-xl};
-  --#{$prefix}border-radius-2xl: #{$border-radius-2xl};
+  --#{$prefix}border-radius-xxl: #{$border-radius-xxl};
   --#{$prefix}border-radius-pill: #{$border-radius-pill};
   // scss-docs-end root-border-var
 
diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index d017d117f121..9ece12772fa4 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -720,7 +720,7 @@ $utilities: map-merge(
         2: var(--#{$prefix}border-radius),
         3: var(--#{$prefix}border-radius-lg),
         4: var(--#{$prefix}border-radius-xl),
-        5: var(--#{$prefix}border-radius-2xl),
+        5: var(--#{$prefix}border-radius-xxl),
         circle: 50%,
         pill: var(--#{$prefix}border-radius-pill)
       )
@@ -735,7 +735,7 @@ $utilities: map-merge(
         2: var(--#{$prefix}border-radius),
         3: var(--#{$prefix}border-radius-lg),
         4: var(--#{$prefix}border-radius-xl),
-        5: var(--#{$prefix}border-radius-2xl),
+        5: var(--#{$prefix}border-radius-xxl),
         circle: 50%,
         pill: var(--#{$prefix}border-radius-pill)
       )
@@ -750,7 +750,7 @@ $utilities: map-merge(
         2: var(--#{$prefix}border-radius),
         3: var(--#{$prefix}border-radius-lg),
         4: var(--#{$prefix}border-radius-xl),
-        5: var(--#{$prefix}border-radius-2xl),
+        5: var(--#{$prefix}border-radius-xxl),
         circle: 50%,
         pill: var(--#{$prefix}border-radius-pill)
       )
@@ -765,7 +765,7 @@ $utilities: map-merge(
         2: var(--#{$prefix}border-radius),
         3: var(--#{$prefix}border-radius-lg),
         4: var(--#{$prefix}border-radius-xl),
-        5: var(--#{$prefix}border-radius-2xl),
+        5: var(--#{$prefix}border-radius-xxl),
         circle: 50%,
         pill: var(--#{$prefix}border-radius-pill)
       )
@@ -780,7 +780,7 @@ $utilities: map-merge(
         2: var(--#{$prefix}border-radius),
         3: var(--#{$prefix}border-radius-lg),
         4: var(--#{$prefix}border-radius-xl),
-        5: var(--#{$prefix}border-radius-2xl),
+        5: var(--#{$prefix}border-radius-xxl),
         circle: 50%,
         pill: var(--#{$prefix}border-radius-pill)
       )
diff --git a/scss/_variables.scss b/scss/_variables.scss
index c2201401578d..1be3fa344dff 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -535,9 +535,12 @@ $border-radius:               .375rem !default;
 $border-radius-sm:            .25rem !default;
 $border-radius-lg:            .5rem !default;
 $border-radius-xl:            1rem !default;
-$border-radius-2xl:           2rem !default;
+$border-radius-xxl:           2rem !default;
 $border-radius-pill:          50rem !default;
 // scss-docs-end border-radius-variables
+// fusv-disable
+$border-radius-2xl:           2rem !default; // Deprecated in 5.3.0
+// fusv-enable
 
 // scss-docs-start box-shadow-variables
 $box-shadow:                  0 .5rem 1rem rgba(var(--#{$prefix}body-color-rgb), .15) !default;

From e622ae32c73b2a56a0e7b9814c9446d5e3837ba3 Mon Sep 17 00:00:00 2001
From: louismaximepiton <louismaxime.piton@orange.com>
Date: Fri, 6 Jan 2023 12:10:30 +0100
Subject: [PATCH 2/2] fix(review)

---
 scss/_root.scss      | 1 +
 scss/_variables.scss | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scss/_root.scss b/scss/_root.scss
index db3e59b34ff2..e3aa59f50ea2 100644
--- a/scss/_root.scss
+++ b/scss/_root.scss
@@ -107,6 +107,7 @@
   --#{$prefix}border-radius-lg: #{$border-radius-lg};
   --#{$prefix}border-radius-xl: #{$border-radius-xl};
   --#{$prefix}border-radius-xxl: #{$border-radius-xxl};
+  --#{$prefix}border-radius-2xl: var(--#{$prefix}border-radius-xxl); // Deprecated in v5.3.0 for consistency
   --#{$prefix}border-radius-pill: #{$border-radius-pill};
   // scss-docs-end root-border-var
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 1be3fa344dff..089f94258cba 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -539,7 +539,7 @@ $border-radius-xxl:           2rem !default;
 $border-radius-pill:          50rem !default;
 // scss-docs-end border-radius-variables
 // fusv-disable
-$border-radius-2xl:           2rem !default; // Deprecated in 5.3.0
+$border-radius-2xl:           $border-radius-xxl !default; // Deprecated in v5.3.0
 // fusv-enable
 
 // scss-docs-start box-shadow-variables