diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-05-25 21:05:53 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-05-25 21:05:53 +0000 |
| commit | 74894a38779adb32a8b8a3cdad8358fc98693403 (patch) | |
| tree | 4bf957d7b513797b03e571f451a760e2eb1524d8 /app/views/discussions/_notes.html.haml | |
| parent | 6f4935bcee76a7af532399945f440a8fbd15658e (diff) | |
| parent | d219ed25fa0b67984984f0b5f60f1eff7a0c34c9 (diff) | |
| download | gitlab-ce-74894a38779adb32a8b8a3cdad8358fc98693403.tar.gz | |
Merge branch 'bootstrap4' into 'master'
Upgrade to Bootstrap 4
Closes #45185 and #46710
See merge request gitlab-org/gitlab-ce!18232
Diffstat (limited to 'app/views/discussions/_notes.html.haml')
| -rw-r--r-- | app/views/discussions/_notes.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index 1cc227428e9..30b00ca86b3 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -11,7 +11,7 @@ - if discussion.try(:on_image?) && show_toggle %button.diff-notes-collapse.js-diff-notes-toggle{ type: 'button' } = sprite_icon('collapse', css_class: 'collapse-icon') - %button.btn-transparent.badge.js-diff-notes-toggle{ type: 'button' } + %button.btn-transparent.badge.badge-pill.js-diff-notes-toggle{ type: 'button' } = badge_counter = render partial: "shared/notes/note", collection: discussion.notes, as: :note, locals: { badge_counter: badge_counter, show_image_comment_badge: show_image_comment_badge } @@ -22,7 +22,7 @@ - if discussion.potentially_resolvable? - line_type = local_assigns.fetch(:line_type, nil) - .btn-group-justified.discussion-with-resolve-btn{ role: "group" } + .btn-group.discussion-with-resolve-btn{ role: "group" } .btn-group{ role: "group" } = link_to_reply_discussion(discussion, line_type) |