Merge branch '13095-missing-borders-between-settings-items' into 'master'

Resolve "Missing borders between settings items"

Closes #13095

See merge request gitlab-org/gitlab-ee!14877

app/assets/stylesheets/pages/settings.scss

@@ -24,12 +24,16 @@
 
 .settings {
   // border-top for each item except the top one
-  + .settings {
   border-top: 1px solid $border-color;
-  }
 
   &:first-of-type {
     margin-top: 10px;
+    border: 0;
+  }
+
+  + div .settings:first-of-type {
+    margin-top: 0;
+    border-top: 1px solid $border-color;
   }
 
   &.animating {

ee/changelogs/unreleased/13095-missing-borders-between-settings-items.yml

+---
+title: Fix missing borders between settings items
+merge_request: 14877
+author:
+type: fixed