diff options
| author | Phil Hughes <me@iamphill.com> | 2017-12-06 16:20:40 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-12-06 16:20:40 +0000 |
| commit | 41e045a1aedf8be472f97763d44c2e28ad53765c (patch) | |
| tree | e203ace01eb3cabb7058db77d4c0cd201d474fb2 | |
| parent | d87d1e7901f7a71c6f0541c709be26fce3db7e4b (diff) | |
| download | gitlab-ce-41e045a1aedf8be472f97763d44c2e28ad53765c.tar.gz | |
Fixed merge request locked icon sizemerge-request-lock-icon-size-fix
Closes #40876
| -rw-r--r-- | app/views/projects/_md_preview.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/notes/_notes_with_form.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/merge-request-lock-icon-size-fix.yml | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml index 2cd5d0c60ea..c5e3a7945bd 100644 --- a/app/views/projects/_md_preview.html.haml +++ b/app/views/projects/_md_preview.html.haml @@ -2,7 +2,7 @@ - if defined?(@merge_request) && @merge_request.discussion_locked? .issuable-note-warning - = icon('lock', class: 'icon') + = sprite_icon('lock', size: 16, css_class: 'icon') %span = _('This merge request is locked.') = _('Only project members can comment.') diff --git a/app/views/shared/notes/_notes_with_form.html.haml b/app/views/shared/notes/_notes_with_form.html.haml index c6e18108c7a..e11f778adf5 100644 --- a/app/views/shared/notes/_notes_with_form.html.haml +++ b/app/views/shared/notes/_notes_with_form.html.haml @@ -27,7 +27,7 @@ - elsif discussion_locked .disabled-comment.text-center.prepend-top-default %span.issuable-note-warning - %span.icon= sprite_icon('lock', size: 14) + = sprite_icon('lock', size: 16, css_class: 'icon') %span This = issuable.class.to_s.titleize.downcase diff --git a/changelogs/unreleased/merge-request-lock-icon-size-fix.yml b/changelogs/unreleased/merge-request-lock-icon-size-fix.yml new file mode 100644 index 00000000000..09c059a3011 --- /dev/null +++ b/changelogs/unreleased/merge-request-lock-icon-size-fix.yml @@ -0,0 +1,5 @@ +--- +title: Fixed merge request lock icon size +merge_request: +author: +type: fixed |