summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel van Remmerden <mvanremmerden@gitlab.com>2019-08-08 16:21:19 +0000
committerPaul Slaughter <pslaughter@gitlab.com>2019-09-09 13:53:06 -0500
commitd270cfbbbfc2e6368929f589153414cfa6c615d6 (patch)
tree87b094203757d8bd33c5057c1f510a96b021adb4
parentcbb35ea882cdc40c09f7f6cd44bca8d72e506092 (diff)
downloadgitlab-ce-d270cfbbbfc2e6368929f589153414cfa6c615d6.tar.gz
CE - Resolve "Missing borders between settings items"
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14877
-rw-r--r--app/assets/stylesheets/pages/settings.scss10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index 79de1d78a6e..416537ef763 100644
--- 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 {