summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Slaughter <pslaughter@gitlab.com>2019-09-09 21:24:37 +0000
committerPaul Slaughter <pslaughter@gitlab.com>2019-09-09 21:24:37 +0000
commit96480a31abf1190438aa142d44756a5177b6ac35 (patch)
tree832a679af26b6052b43e35f134bb8d23baa2064b
parent814d12b8c72b0e8a4f9025ffb1373c11b36a061a (diff)
parentd270cfbbbfc2e6368929f589153414cfa6c615d6 (diff)
downloadgitlab-ce-96480a31abf1190438aa142d44756a5177b6ac35.tar.gz
Merge branch '13095-missing-borders-between-settings-items' into 'master'
[CE] Resolve "Missing borders between settings items" See merge request gitlab-org/gitlab-ce!32828
-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 {