summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-04-19 11:13:38 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-04-19 11:13:38 +0000
commitd0abcc1a2b60dadc24e8d8f0d019b4b19688853a (patch)
tree7e764e6881147712374ba084483d7dfbe55b3048
parentab8bc5b98d479f8d4c2babc0b187121c6870a677 (diff)
parentec1d2147f21e467c61827d8bc07bec647d80ab43 (diff)
downloadgitlab-ce-d0abcc1a2b60dadc24e8d8f0d019b4b19688853a.tar.gz
Merge branch 'fixed-diff-border' into 'master'
Fixes the border color on diffs See merge request gitlab-org/gitlab-ce!27479
-rw-r--r--app/assets/stylesheets/pages/diff.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 5ea96392afa..b2b3720fdde 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -431,9 +431,9 @@ table.code {
&.diff-line-num {
user-select: none;
margin: 0;
- border: 0;
padding: 0 10px 0 5px;
- border-right: 1px solid;
+ border-right-width: 1px;
+ border-right-style: solid;
text-align: right;
width: 50px;
position: relative;