Merge branch 'main' into main-mc-sorry-eric

scss/_accordion.scss

@@ -16,10 +16,6 @@
   overflow-anchor: none;
   @include transition($accordion-transition);
 
-  &.collapsed {
-    border-bottom-width: 0;
-  }
-
   &:not(.collapsed) {
     color: $accordion-button-active-color;
     background-color: $accordion-button-active-bg;
@@ -66,11 +62,14 @@
     }
   }
 
+  &:not(:first-child) {
+    margin-top: -1px;
+  }
+
   &:last-of-type {
     .accordion-button {
       // Only set a border-radius on the last item if the accordion is collapsed
       &.collapsed {
-        border-bottom-width: $accordion-border-width;
         @include border-bottom-radius($accordion-border-radius);
       }
     }

scss/_variables.scss

@@ -1018,7 +1018,7 @@ $accordion-padding-x:                     1.25rem !default;
 $accordion-color:                         $body-color !default;
 $accordion-bg:                            transparent !default;
 $accordion-border-width:                  $border-width !default;
-$accordion-border-color:                  rgba($black, .125) !default;
+$accordion-border-color:                  $border-color !default;
 $accordion-border-radius:                 $border-radius !default;
 
 $accordion-body-padding-y:                $accordion-padding-y !default;