From 54e0af0303fe6617e438b9bf68e85b377b0e8ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20D=C3=A9ramond?= <julien.deramond@orange.com>
Date: Mon, 25 Apr 2022 12:34:49 +0200
Subject: [PATCH] Clean up last `$variable-prefix` usages

---
 scss/_variables.scss                              | 4 ++--
 site/assets/scss/_navbar.scss                     | 6 +++---
 site/layouts/partials/home/masthead-followup.html | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 2c89f991f3..79649a5f9a 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1253,7 +1253,7 @@ $card-group-margin:                 $grid-gutter-width * .5 !default;
 // scss-docs-start accordion-variables
 $accordion-padding-y:                     1rem !default;
 $accordion-padding-x:                     1.25rem !default;
-$accordion-color:                         var(--#{$variable-prefix}body-color) !default;
+$accordion-color:                         var(--#{$prefix}body-color) !default;
 $accordion-bg:                            $body-bg !default;
 $accordion-border-width:                  $border-width !default;
 $accordion-border-color:                  var(--#{$prefix}border-color) !default;
@@ -1266,7 +1266,7 @@ $accordion-body-padding-x:                $accordion-padding-x !default;
 $accordion-button-padding-y:              $accordion-padding-y !default;
 $accordion-button-padding-x:              $accordion-padding-x !default;
 $accordion-button-color:                  $accordion-color !default;
-$accordion-button-bg:                     var(--#{$variable-prefix}accordion-bg) !default;
+$accordion-button-bg:                     var(--#{$prefix}accordion-bg) !default;
 $accordion-transition:                    $btn-transition, border-radius .15s ease !default;
 $accordion-button-active-bg:              tint-color($component-active-bg, 90%) !default;
 $accordion-button-active-color:           shade-color($primary, 10%) !default;
diff --git a/site/assets/scss/_navbar.scss b/site/assets/scss/_navbar.scss
index 4f9f3f8290..57e3f47b7f 100644
--- a/site/assets/scss/_navbar.scss
+++ b/site/assets/scss/_navbar.scss
@@ -69,9 +69,9 @@
   }
 
   .dropdown-menu {
-    --#{$variable-prefix}dropdown-min-width: 12rem;
-    --#{$variable-prefix}dropdown-link-hover-bg: rgba(var(--bd-violet-rgb), .1);
-    @include rfs(.875rem, --#{$variable-prefix}dropdown-font-size);
+    --#{$prefix}dropdown-min-width: 12rem;
+    --#{$prefix}dropdown-link-hover-bg: rgba(var(--bd-violet-rgb), .1);
+    @include rfs(.875rem, --#{$prefix}dropdown-font-size);
     box-shadow: $dropdown-box-shadow;
   }
 
diff --git a/site/layouts/partials/home/masthead-followup.html b/site/layouts/partials/home/masthead-followup.html
index 26c8a04a9b..a57e0f7330 100644
--- a/site/layouts/partials/home/masthead-followup.html
+++ b/site/layouts/partials/home/masthead-followup.html
@@ -66,7 +66,7 @@
       {{ highlight (printf `// Variable overrides first
 $primary: #900;
 $enable-shadows: true;
-$variable-prefix: "mo-";
+$prefix: "mo-";
 
 // Then import Bootstrap
 @import "../node_modules/bootstrap/scss/bootstrap";
@@ -82,7 +82,7 @@ $variable-prefix: "mo-";
 // Variable overrides second
 $primary: #900;
 $enable-shadows: true;
-$variable-prefix: "mo-";
+$prefix: "mo-";
 
 // Required Bootstrap imports
 @import "../node_modules/bootstrap/scss/variables";