kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-diff-comment-alignment' into 'master'

Browse source 
Fix diff comment alignment for parallel code additions

Closes #47861

See merge request gitlab-org/gitlab-ce!20006
This commit is contained in:
Mike Greiling 2018-06-21 18:18:36 +00:00
commit e3a1b825f4
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/pages/diff.scss
View file

@ -65,6 +65,7 @@
.diff-line-num { .diff-line-num {
width: 50px; width: 50px;
position: relative;
a { a {
transition: none; transition: none;

8
app/assets/stylesheets/pages/notes.scss
View file

@ -632,20 +632,18 @@ ul.notes {
.line_holder .is-over:not(.no-comment-btn) { .line_holder .is-over:not(.no-comment-btn) {
.add-diff-note { .add-diff-note {
opacity: 1; opacity: 1;
z-index: 101;
} }
} }
.add-diff-note { .add-diff-note {
@include btn-comment-icon; @include btn-comment-icon;
opacity: 0; opacity: 0;
margin-top: -2px;
margin-left: -55px; margin-left: -55px;
position: absolute; position: absolute;
top: 50%;
transform: translateY(-50%);
z-index: 10; z-index: 10;
.new & {
margin-top: -10px;
}
} }
.discussion-body, .discussion-body,