From f2aee4339332afe922458a924a4f1802c321fa79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20D=C3=A9ramond?= <juderamond@gmail.com>
Date: Wed, 10 Jul 2024 17:05:10 +0200
Subject: [PATCH 1/2] Build(deps-dev): Bump sass from 1.77.6 to 1.77.7

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3a8f20d8860c..71c31baf9b3b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,7 +64,7 @@
         "rollup": "^4.18.0",
         "rollup-plugin-istanbul": "^5.0.0",
         "rtlcss": "^4.1.1",
-        "sass": "^1.77.6",
+        "sass": "^1.77.7",
         "sass-true": "^8.0.0",
         "shelljs": "^0.8.5",
         "stylelint": "^16.6.1",
@@ -10219,9 +10219,9 @@
       "dev": true
     },
     "node_modules/sass": {
-      "version": "1.77.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
-      "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==",
+      "version": "1.77.7",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.7.tgz",
+      "integrity": "sha512-9ywH75cO+rLjbrZ6en3Gp8qAMwPGBapFtlsMJoDTkcMU/bSe5a6cjKVUn5Jr4Gzg5GbP3HE8cm+02pLCgcoMow==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
diff --git a/package.json b/package.json
index 82b4f3460576..e6c520241711 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
     "rollup": "^4.18.0",
     "rollup-plugin-istanbul": "^5.0.0",
     "rtlcss": "^4.1.1",
-    "sass": "^1.77.6",
+    "sass": "^1.77.7",
     "sass-true": "^8.0.0",
     "shelljs": "^0.8.5",
     "stylelint": "^16.6.1",

From b4a3c0f92f304b3ce103f50d02943692a643a864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20D=C3=A9ramond?= <juderamond@gmail.com>
Date: Wed, 10 Jul 2024 17:10:33 +0200
Subject: [PATCH 2/2] Fix use of declarations after nested rules (deprecated in
 Sass 1.77.7

---
 scss/_modal.scss  | 2 +-
 scss/_reboot.scss | 2 +-
 scss/_type.scss   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scss/_modal.scss b/scss/_modal.scss
index 494db94e7eb9..ee58032ee811 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -59,8 +59,8 @@
 
   // When fading in the modal, animate it to slide down
   .modal.fade & {
-    @include transition($modal-transition);
     transform: $modal-fade-transform;
+    @include transition($modal-transition);
   }
   .modal.show & {
     transform: $modal-show-transform;
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 18791753d0ca..5e1665c35887 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -499,9 +499,9 @@ legend {
   width: 100%;
   padding: 0;
   margin-bottom: $legend-margin-bottom;
-  @include font-size($legend-font-size);
   font-weight: $legend-font-weight;
   line-height: inherit;
+  @include font-size($legend-font-size);
 
   + * {
     clear: left; // 2
diff --git a/scss/_type.scss b/scss/_type.scss
index 37d64bf89c55..6961390f1e62 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -34,11 +34,11 @@
 // Type display classes
 @each $display, $font-size in $display-font-sizes {
   .display-#{$display} {
-    @include font-size($font-size);
     font-family: $display-font-family;
     font-style: $display-font-style;
     font-weight: $display-font-weight;
     line-height: $display-line-height;
+    @include font-size($font-size);
   }
 }