CE - Resolve "Missing borders between settings items"

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14877

CE - Resolve "Missing borders between settings items"
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14877
d270cfbb · Marcel van Remmerden · Paul Slaughter · cbb35ea8 · d270cfbb
Commit d270cfbb authored Aug 08, 2019 by Marcel van Remmerden Committed by Paul Slaughter Sep 09, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

app/assets/stylesheets/pages/settings.scss app/assets/stylesheets/pages/settings.scss +7 -3

No files found.
--- 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;
-  }
+  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 {