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
This commit is contained in:
commit
980ea20cc9
|
@ -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.')
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fixed merge request lock icon size
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
Loading…
Reference in New Issue