diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-12-10 11:55:47 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-12-10 11:55:47 +0300 |
| commit | 5618606301cd7ef182b5a658dbabf254e0330f9b (patch) | |
| tree | b236cea04d8187ad87f123a1f2c690f2d5d69d21 /app/assets | |
| parent | f124328b2919fb1ed6b1fa65a9ce8855ec2e0420 (diff) | |
| parent | 0f827531b051f2d467b58f2f350dbb4a5a6eddbf (diff) | |
Merge branch 'commit-badge-style-fix' into 'master'
Fixed styling of image comment badges on commits
Closes #54849
See merge request gitlab-org/gitlab-ce!23659
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/image_diff/helpers/badge_helper.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/image_diff/helpers/badge_helper.js b/app/assets/javascripts/image_diff/helpers/badge_helper.js index eddaeda9578..000157efad0 100644 --- a/app/assets/javascripts/image_diff/helpers/badge_helper.js +++ b/app/assets/javascripts/image_diff/helpers/badge_helper.js @@ -12,7 +12,7 @@ export function createImageBadge(noteId, { x, y }, classNames = []) { } export function addImageBadge(containerEl, { coordinate, badgeText, noteId }) { - const buttonEl = createImageBadge(noteId, coordinate, ['badge']); + const buttonEl = createImageBadge(noteId, coordinate, ['badge', 'badge-pill']); buttonEl.innerText = badgeText; containerEl.appendChild(buttonEl); diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 5405f20a760..18c62cb4f1e 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -914,6 +914,7 @@ padding: 0; width: (2px * $image-comment-cursor-left-offset); height: (2px * $image-comment-cursor-top-offset); + color: $blue-400; // center the indicator to match the top left click region margin-top: (-1px * $image-comment-cursor-top-offset) + 2; margin-left: (-1px * $image-comment-cursor-left-offset) + 1; |