summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/timeline.scss
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-06 18:39:53 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-11-06 18:39:53 +0000
commit9de635bd953518c19ceb18bb2156e26ba9e73924 (patch)
treec7fc5877230e6ca062c421983c8c2b91584215d0 /app/assets/stylesheets/framework/timeline.scss
parentd035bdbe3c9aff1b139ed656a5c4507475820e9d (diff)
parentfb63796ed9b5062431ee40faf9c7652964b48112 (diff)
downloadgitlab-ce-9de635bd953518c19ceb18bb2156e26ba9e73924.tar.gz
Merge branch '39757-border-zero-of-scss-lint' into 'master'
Enable BorderZero rule in scss-lint Closes #39757 See merge request gitlab-org/gitlab-ce!15168
Diffstat (limited to 'app/assets/stylesheets/framework/timeline.scss')
-rw-r--r--app/assets/stylesheets/framework/timeline.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index f718ec4bcad..373f35e71d8 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -21,7 +21,7 @@
}
&.text-file .diff-file {
- border-bottom: none;
+ border-bottom: 0;
}
}
@@ -66,5 +66,5 @@
.discussion .timeline-entry {
margin: 0;
- border-right: none;
+ border-right: 0;
}