Commit 748862ff authored by Phil Hughes's avatar Phil Hughes

Merge branch 'aregnery/fix-button-variant-profile-pic-scale' into 'master'

Switch from confirm to default for resizing profile pic

See merge request gitlab-org/gitlab!77780
parents 72fa139f 0d7434f0
...@@ -142,10 +142,10 @@ ...@@ -142,10 +142,10 @@
%img.modal-profile-crop-image{ alt: s_("Profiles|Avatar cropper") } %img.modal-profile-crop-image{ alt: s_("Profiles|Avatar cropper") }
.crop-controls .crop-controls
.btn-group .btn-group
%button.btn.gl-button.btn-confirm{ data: { method: 'zoom', option: '-0.1' } } %button.btn.gl-button.btn-default{ data: { method: 'zoom', option: '-0.1' } }
%span %span
= sprite_icon('search-minus') = sprite_icon('search-minus')
%button.btn.gl-button.btn-confirm{ data: { method: 'zoom', option: '0.1' } } %button.btn.gl-button.btn-default{ data: { method: 'zoom', option: '0.1' } }
%span %span
= sprite_icon('search-plus') = sprite_icon('search-plus')
.modal-footer .modal-footer
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment