Merge branch 'remove-redundant-icons' into 'master'

app/assets/javascripts/pipelines/components/pipelines_actions.vue

@@ -69,8 +69,7 @@
           @click="onClickAction(action.path)"
           :class="{ disabled: isActionDisabled(action) }"
           :disabled="isActionDisabled(action)">
-          <span v-html="playIconSvg"></span>
-          <span>{{action.name}}</span>
+          {{action.name}}
         </button>
       </li>
     </ul>

app/assets/javascripts/pipelines/components/pipelines_artifacts.vue

@@ -39,11 +39,7 @@
           rel="nofollow"
           download
           :href="artifact.path">
-          <i
-            class="fa fa-download"
-            aria-hidden="true">
-          </i>
-          <span>Download {{artifact.name}} artifacts</span>
+          Download {{artifact.name}} artifacts
         </a>
       </li>
     </ul>

app/views/projects/buttons/_download.html.haml

@@ -11,19 +11,15 @@
         #{ _('Source code') }
       %li
         = link_to archive_project_repository_path(project, ref: ref, format: 'zip'), rel: 'nofollow', download: '' do
-          %i.fa.fa-download
           %span=  _('Download zip')
       %li
         = link_to archive_project_repository_path(project, ref: ref, format: 'tar.gz'), rel: 'nofollow', download: '' do
-          %i.fa.fa-download
           %span= _('Download tar.gz')
       %li
         = link_to archive_project_repository_path(project, ref: ref, format: 'tar.bz2'), rel: 'nofollow', download: '' do
-          %i.fa.fa-download
           %span= _('Download tar.bz2')
       %li
         = link_to archive_project_repository_path(project, ref: ref, format: 'tar'), rel: 'nofollow', download: '' do
-          %i.fa.fa-download
           %span= _('Download tar')
 
       - if pipeline && pipeline.latest_builds_with_artifacts.any?
@@ -36,6 +32,5 @@
         - pipeline.latest_builds_with_artifacts.each do |job|
           %li
             = link_to latest_succeeded_project_artifacts_path(project, "#{ref}/download", job: job.name), rel: 'nofollow', download: '' do
-              %i.fa.fa-download
               %span
                 #{s_('DownloadArtifacts|Download')} '#{job.name}'

app/views/projects/buttons/_dropdown.html.haml

@@ -11,19 +11,16 @@
       - if can_create_issue
         %li
           = link_to new_project_issue_path(@project) do
-            = icon('exclamation-circle fw')
             #{ _('New issue') }
 
       - if merge_project
         %li
           = link_to project_new_merge_request_path(merge_project) do
-            = icon('tasks fw')
             #{ _('New merge request') }
 
       - if can_create_snippet
         %li
           = link_to new_project_snippet_path(@project) do
-            = icon('file-text-o fw')
             #{ _('New snippet') }
 
       - if can_create_issue || merge_project || can_create_snippet
@@ -32,20 +29,16 @@
       - if can?(current_user, :push_code, @project)
         %li
           = link_to project_new_blob_path(@project, @project.default_branch || 'master') do
-            = icon('file fw')
             #{ _('New file') }
         %li
           = link_to new_project_branch_path(@project) do
-            = icon('code-fork fw')
             #{ _('New branch') }
         %li
           = link_to new_project_tag_path(@project) do
-            = icon('tags fw')
             #{ _('New tag') }
       - elsif current_user && current_user.already_forked?(@project)
         %li
           = link_to project_new_blob_path(@project, @project.default_branch || 'master') do
-            = icon('file fw')
             #{ _('New file') }
       - elsif can?(current_user, :fork_project, @project)
         %li
@@ -55,5 +48,4 @@
           - fork_path = project_forks_path(@project, namespace_key:  current_user.namespace.id,
                                                                                   continue:       continue_params)
           = link_to fork_path, method: :post do
-            = icon('file fw')
             #{ _('New file') }

app/views/projects/tree/_old_tree_header.html.haml

@@ -20,15 +20,12 @@
             - if can_edit_tree?
               %li
                 = link_to project_new_blob_path(@project, @id) do
-                  = icon('pencil fw')
                   #{ _('New file') }
               %li
                 = link_to '#modal-upload-blob', { 'data-target' => '#modal-upload-blob', 'data-toggle' => 'modal' } do
-                  = icon('file fw')
                   #{ _('Upload file') }
               %li
                 = link_to '#modal-create-new-dir', { 'data-target' => '#modal-create-new-dir', 'data-toggle' => 'modal' } do
-                  = icon('folder fw')
                   #{ _('New directory') }
             - elsif can?(current_user, :fork_project, @project)
               %li
@@ -38,7 +35,6 @@
                 - fork_path = project_forks_path(@project, namespace_key:  current_user.namespace.id,
                                                                                         continue:       continue_params)
                 = link_to fork_path, method: :post do
-                  = icon('pencil fw')
                   #{ _('New file') }
               %li
                 - continue_params = { to:         request.fullpath,
@@ -47,7 +43,6 @@
                 - fork_path = project_forks_path(@project, namespace_key:  current_user.namespace.id,
                                                                                         continue:       continue_params)
                 = link_to fork_path, method: :post do
-                  = icon('file fw')
                   #{ _('Upload file') }
               %li
                 - continue_params = { to:         request.fullpath,
@@ -56,15 +51,12 @@
                 - fork_path = project_forks_path(@project, namespace_key:  current_user.namespace.id,
                                                                                         continue:       continue_params)
                 = link_to fork_path, method: :post do
-                  = icon('folder fw')
                   #{ _('New directory') }
 
             %li.divider
             %li
               = link_to new_project_branch_path(@project) do
-                = icon('code-fork fw')
                 #{ _('New branch') }
             %li
               = link_to new_project_tag_path(@project) do
-                = icon('tags fw')
                 #{ _('New tag') }

spec/javascripts/pipelines/pipelines_artifacts_spec.js

@@ -34,7 +34,7 @@ describe('Pipelines Artifacts dropdown', () => {
     ).toEqual(artifacts[0].path);
 
     expect(
-      component.$el.querySelector('.dropdown-menu li a span').textContent,
+      component.$el.querySelector('.dropdown-menu li a').textContent,
     ).toContain(artifacts[0].name);
   });
 });