diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-06-21 18:18:36 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-06-21 18:18:36 +0000 |
| commit | e3a1b825f4c787e2fb29f852c530138347014d31 (patch) | |
| tree | 49e8d7ece10297b701a17da1efeeea17eaaee43e | |
| parent | 6d2a48d52fc3b32eedd64d15cc23906f1871be7b (diff) | |
| parent | 00525de03f4035300d38accc222ced32c960db8d (diff) | |
| download | gitlab-ce-e3a1b825f4c787e2fb29f852c530138347014d31.tar.gz | |
Merge branch 'fix-diff-comment-alignment' into 'master'
Fix diff comment alignment for parallel code additions
Closes #47861
See merge request gitlab-org/gitlab-ce!20006
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 65add153606..8e8a879be88 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -65,6 +65,7 @@ .diff-line-num { width: 50px; + position: relative; a { transition: none; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index dcc42117861..25400d886fb 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -632,20 +632,18 @@ ul.notes { .line_holder .is-over:not(.no-comment-btn) { .add-diff-note { opacity: 1; + z-index: 101; } } .add-diff-note { @include btn-comment-icon; opacity: 0; - margin-top: -2px; margin-left: -55px; position: absolute; + top: 50%; + transform: translateY(-50%); z-index: 10; - - .new & { - margin-top: -10px; - } } .discussion-body, |