Resolve "Missing borders between settings items"

9ace095b · Marcel van Remmerden · Paul Slaughter · c8399469 · 9ace095b · 9ace095b
Commit 9ace095b authored Sep 09, 2019 by Marcel van Remmerden Committed by Paul Slaughter Sep 09, 2019
2 changed files
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/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 {

--- a/ee/changelogs/unreleased/13095-missing-borders-between-settings-items.yml
+++ b/ee/changelogs/unreleased/13095-missing-borders-between-settings-items.yml
+---
+title: Fix missing borders between settings items
+merge_request: 14877
+author:
+type: fixed