Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-11-07 02:03:31 +0300
committerEric Eastwood <contact@ericeastwood.com>2017-11-07 02:03:31 +0300
commita46d32412ec93be2d6d10bd4bcbdd23b69d31865 (patch)
treeb017b0a0ff5628c11a42cf5c853414b46d77be10 /app/assets/stylesheets/framework/timeline.scss
parentcb7d63f90753617920cc6f9168a48dc998dc9ee4 (diff)
parent243530360edac31f309bd3706b2d5117f6d526ad (diff)
Merge branch 'master' into 38464-k8s-apps
Conflicts: db/schema.rb
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;
}