diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-07 17:33:28 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-07 17:33:28 +0000 |
| commit | 980ea20cc91fa5feee0f633526b14aa59c354fb1 (patch) | |
| tree | 73f36772a9a7669dcfc55114be4f9b75b9d0497a | |
| parent | 245fad4d8854e74b6f39c763c2f8d047eeb5f4eb (diff) | |
| parent | 41e045a1aedf8be472f97763d44c2e28ad53765c (diff) | |
| download | gitlab-ce-980ea20cc91fa5feee0f633526b14aa59c354fb1.tar.gz | |
Merge branch 'merge-request-lock-icon-size-fix' into 'master'
Fixed merge request locked icon size
Closes #40876
See merge request gitlab-org/gitlab-ce!15767
| -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 |