Merge branch '225951-replace-pencil-icons-in-methods' into 'master'

Replace pencil icon calls with sprite_icon

Closes #225951

See merge request gitlab-org/gitlab!36328

app/views/admin/runners/_runner.html.haml

@@ -66,7 +66,7 @@
     .btn-group.table-action-buttons
       .btn-group
         = link_to admin_runner_path(runner), class: 'btn btn-default has-tooltip', title: _('Edit'), ref: 'tooltip', aria: { label: _('Edit') }, data: { placement: 'top', container: 'body'} do
-          = icon('pencil')
+          = sprite_icon('pencil', size: 16)
       .btn-group
         - if runner.active?
           = link_to [:pause, :admin, runner], method: :get, class: 'btn btn-default has-tooltip', title: _('Pause'), ref: 'tooltip', aria: { label: _('Pause') }, data: { placement: 'top', container: 'body', confirm: _('Are you sure?') } do

app/views/doorkeeper/applications/index.html.haml

@@ -44,7 +44,7 @@
                       = link_to edit_oauth_application_path(application), class: "btn btn-transparent gl-mr-2" do
                         %span.sr-only
                           = _('Edit')
-                        = icon('pencil')
+                        = sprite_icon('pencil')
                       = render 'delete_form', application: application, small: true
         - else
           .settings-message.text-center

app/views/help/ui.html.haml

@@ -68,7 +68,7 @@
     .cover-block.user-cover-block
       = render layout: 'users/cover_controls' do
         = link_to '#', class: link_classes + 'btn btn-default' do
-          = icon('pencil')
+          = sprite_icon('pencil')
         = link_to '#', class: link_classes + 'btn btn-default' do
           = icon('rss')
       .avatar-holder

app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml

@@ -33,8 +33,8 @@
           = link_to take_ownership_pipeline_schedule_path(pipeline_schedule), method: :post, title: s_('PipelineSchedules|Take ownership'), class: 'btn' do
             = s_('PipelineSchedules|Take ownership')
         - if can?(current_user, :update_pipeline_schedule, pipeline_schedule)
-          = link_to edit_pipeline_schedule_path(pipeline_schedule), title: _('Edit'), class: 'btn' do
-            = icon('pencil')
+          = link_to edit_pipeline_schedule_path(pipeline_schedule), title: _('Edit'), class: 'btn gl-display-flex' do
+            = sprite_icon('pencil', size: 16)
         - if can?(current_user, :admin_pipeline_schedule, pipeline_schedule)
           = link_to pipeline_schedule_path(pipeline_schedule), title: _('Delete'), method: :delete, class: 'btn btn-remove', data: { confirm: _("Are you sure you want to delete this pipeline schedule?") } do
             = icon('trash')

app/views/projects/tags/_tag.html.haml

@@ -37,6 +37,6 @@
 
     - if can?(current_user, :admin_tag, @project)
       = link_to edit_project_tag_release_path(@project, tag.name), class: 'btn btn-edit has-tooltip', title: s_('TagsPage|Edit release notes'), data: { container: "body" } do
-        = icon("pencil")
+        = sprite_icon("pencil")
       = link_to project_tag_path(@project, tag.name), class: "btn btn-remove remove-row has-tooltip gl-ml-3 #{protected_tag?(@project, tag) ? 'disabled' : ''}", title: s_('TagsPage|Delete tag'), method: :delete, data: { confirm: s_('TagsPage|Deleting the %{tag_name} tag cannot be undone. Are you sure?') % { tag_name: tag.name }, container: 'body' }, remote: true do
         = icon("trash-o")

app/views/projects/tags/show.html.haml

@@ -43,7 +43,7 @@
       = render partial: 'projects/commit/signature', object: @tag.signature
     - if can?(current_user, :admin_tag, @project)
       = link_to edit_project_tag_release_path(@project, @tag.name), class: 'btn btn-edit controls-item has-tooltip', title: s_('TagsPage|Edit release notes') do
-        = icon("pencil")
+        = sprite_icon("pencil")
     = link_to project_tree_path(@project, @tag.name), class: 'btn controls-item has-tooltip', title: s_('TagsPage|Browse files') do
       = sprite_icon('folder-open')
     = link_to project_commits_path(@project, @tag.name), class: 'btn controls-item has-tooltip', title: s_('TagsPage|Browse commits') do

app/views/users/show.html.haml

@@ -14,7 +14,7 @@
     = render layout: 'users/cover_controls' do
       - if @user == current_user
         = link_to profile_path, class: link_classes + 'btn btn-default has-tooltip', title: s_('UserProfile|Edit profile'), 'aria-label': 'Edit profile' do
-          = icon('pencil')
+          = sprite_icon('pencil')
       - elsif current_user
         - if @user.abuse_report
           %button{ class: link_classes + 'btn btn-danger mr-1', title: s_('UserProfile|Already reported for abuse'),

ee/app/views/shared/members/ee/_override_member_buttons.html.haml

@@ -8,10 +8,11 @@
   - if action.edit?
     %button.btn.btn-default.btn-ldap-override.js-ldap-permissions{ type: 'button',
       'aria-label' => 'Edit permissions',
+      class: 'btn align-self-center m-0 ml-sm-2',
       data: { name: user.name, el_id: dom_id(member) } }
       %span.d-block.d-md-none
         Edit permissions
-      = icon('pencil', class: 'd-none d-sm-none d-md-block')
+      = sprite_icon('pencil', size: 16, css_class: 'd-none d-sm-none d-md-inline-block')
   - else
     %li.alert.alert-member-ldap{ style: 'display: none;' }
       %p