Merge branch 'mw-replace-fa-github-icons' into 'master'

Replace fa-github with GitLab SVG

See merge request gitlab-org/gitlab!45533

app/assets/stylesheets/fontawesome_custom.scss

@@ -125,10 +125,6 @@
   content: '\f077';
 }
 
-.fa-github::before {
-  content: '\f09b';
-}
-
 .fa-paperclip::before {
   content: '\f0c6';
 }

app/views/import/github/new.html.haml

@@ -10,7 +10,9 @@
   = import_github_authorize_message
 
 - if github_import_configured? && !has_ci_cd_only_params?
-  = link_to icon('github', text: title), status_import_github_path, class: 'btn btn-success'
+  = link_to status_import_github_path, class: 'btn btn-success gl-button' do
+    = sprite_icon('github', css_class: 'gl-mr-2')
+    = title
 
   %hr
 

app/views/import/github/status.html.haml

@@ -2,7 +2,9 @@
 - page_title title
 - breadcrumb_title title
 - header_title _("Projects"), root_path
-%h3.page-title.mb-0
-  = icon 'github', class: 'fa-2x', text: _('Import repositories from GitHub')
+%h3.page-title.mb-0.gl-display-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('github', css_class: 'gl-mr-2')
+  = _('Import repositories from GitHub')
 
 = render 'import/githubish_status', provider: 'github'

app/views/projects/_import_project_pane.html.haml

@@ -15,7 +15,8 @@
       - if github_import_enabled?
         %div
           = link_to new_import_github_path, class: 'btn js-import-github', **tracking_attrs(track_label, 'click_button', 'github') do
-            = icon('github', text: 'GitHub')
+            = sprite_icon('github')
+            GitHub
 
       - if bitbucket_import_enabled?
         %div

changelogs/unreleased/mw-replace-fa-github-icons.yml

+---
+title: Replace fa-github with GitLab SVG MERGE_REQUEST_ID
+merge_request: 45533
+author:
+type: changed

ee/app/views/projects/_new_ci_cd_only_project_pane.html.haml

@@ -20,7 +20,8 @@
             %div
               - if github_import_enabled?
                 = link_to new_import_github_path(ci_cd_only: true), class: 'btn js-import-github', data: { track_label: "#{track_label}", track_property: 'github', track_event: "click_button", track_value: "" } do
-                  = icon('github', text: 'GitHub')
+                  = sprite_icon('github')
+                  GitHub
             %div
               - if git_import_enabled?
                 %button.btn.btn-svg.js-toggle-button.js-import-git-toggle-button{ type: "button", data: { toggle_open_class: 'active', track_label: "#{track_label}", track_property: 'repo_url', track_event: "click_button", track_value: "" } }

qa/qa/page/project/new.rb

@@ -23,10 +23,6 @@ module QA
           element :visibility_radios, 'visibility_level:' # rubocop:disable QA/ElementWithPattern
         end
 
-        view 'app/views/projects/_import_project_pane.html.haml' do
-          element :import_github, "icon('github', text: 'GitHub')" # rubocop:disable QA/ElementWithPattern
-        end
-
         view 'app/views/projects/project_templates/_template.html.haml' do
           element :use_template_button
           element :template_option_row