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

Replace fa-google with GitLab SVG

See merge request gitlab-org/gitlab!45506

app/assets/stylesheets/fontawesome_custom.scss

@@ -137,10 +137,6 @@
   content: '\f188';
 }
 
-.fa-google::before {
-  content: '\f1a0';
-}
-
 .fa-exclamation-circle::before {
   content: '\f06a';
 }

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

 - page_title _("Google Code import")
 - header_title _("Projects"), root_path
-%h3.page-title
-  %i.fa.fa-google
+%h3.page-title.gl-display-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('google', css_class: 'gl-mr-2')
   = _('Import projects from Google Code')
 %hr
 

app/views/import/google_code/new_user_map.html.haml

 - page_title _("User map"), _("Google Code import")
 - header_title _("Projects"), root_path
-%h3.page-title
-  %i.fa.fa-google
+%h3.page-title.gl-display-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('google', css_class: 'gl-mr-2')
   = _('Import projects from Google Code')
 %hr
 

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

 - page_title _("Google Code import")
 - header_title _("Projects"), root_path
-%h3.page-title
-  %i.fa.fa-google
+%h3.page-title.gl-display-flex
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('google', css_class: 'gl-mr-2')
   = _('Import projects from Google Code')
 
 - if @repos.any?

app/views/projects/_import_project_pane.html.haml

@@ -43,7 +43,8 @@
       - if google_code_import_enabled?
         %div
           = link_to new_import_google_code_path, class: 'btn import_google_code', **tracking_attrs(track_label, 'click_button', 'google_code') do
-            = icon('google', text: 'Google Code')
+            = sprite_icon('google')
+            Google Code
 
       - if fogbugz_import_enabled?
         %div

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

+---
+title: Replace fa-google with GitLab SVG
+merge_request: 45506
+author:
+type: changed