Merge branch '31072-activity-border' into 'master'

Fix border color on activities page

Closes #31072

See merge request !10864

app/assets/stylesheets/framework/blocks.scss

@@ -230,7 +230,6 @@
     float: right;
     margin-top: 8px;
     padding-bottom: 8px;
-    border-bottom: 1px solid $border-color;
   }
 }

app/assets/stylesheets/framework/nav.scss

@@ -110,7 +110,7 @@
 .top-area {
   @include clearfix;
-  border-bottom: 1px solid $white-normal;
+  border-bottom: 1px solid $border-color;
   .nav-text {
     padding-top: 16px;