Add latest changes from gitlab-org/gitlab@master

10 files changed, 26 insertions, 19 deletions

diff --git a/app/views/import/bitbucket/status.html.haml b/app/views/import/bitbucket/status.html.haml
index b4b73e9e790..dc80aeb8a30 100644
--- a/app/views/import/bitbucket/status.html.haml
+++ b/app/views/import/bitbucket/status.html.haml
@@ -1,9 +1,9 @@
 - page_title _('Bitbucket import')
 - header_title _('Projects'), root_path
 
-%h1.page-title.gl-font-size-h-display.d-flex
+%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
   .gl-display-flex.gl-align-items-center.gl-justify-content-center
-    = sprite_icon('bitbucket', css_class: 'gl-mr-2')
+    = sprite_icon('bitbucket', css_class: 'gl-mr-3', size: 48)
   = _('Import projects from Bitbucket')
 
 = render 'import/githubish_status', provider: 'bitbucket', default_namespace: @namespace
diff --git a/app/views/import/bitbucket_server/new.html.haml b/app/views/import/bitbucket_server/new.html.haml
index de94f142a40..583d312154c 100644
--- a/app/views/import/bitbucket_server/new.html.haml
+++ b/app/views/import/bitbucket_server/new.html.haml
@@ -2,10 +2,11 @@
 - header_title _("New project"), new_project_path
 - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project')
 
-%h1.page-title.gl-font-size-h-display.d-flex
+%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
   .gl-display-flex.gl-align-items-center.gl-justify-content-center
-    = sprite_icon('bitbucket', css_class: 'gl-mr-2')
+    = sprite_icon('bitbucket', css_class: 'gl-mr-3', size: 48)
   = _('Import repositories from Bitbucket Server')
+%hr
 
 %p
   = _('Enter in your Bitbucket Server URL and personal access token below')
diff --git a/app/views/import/bitbucket_server/status.html.haml b/app/views/import/bitbucket_server/status.html.haml
index 7e0c7b3dd74..6994404c8c9 100644
--- a/app/views/import/bitbucket_server/status.html.haml
+++ b/app/views/import/bitbucket_server/status.html.haml
@@ -1,8 +1,8 @@
 - page_title _('Bitbucket Server import')
 
-%h1.page-title.gl-font-size-h-display.d-flex
+%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
   .gl-display-flex.gl-align-items-center.gl-justify-content-center
-    = sprite_icon('bitbucket', css_class: 'gl-mr-2')
+    = sprite_icon('bitbucket', css_class: 'gl-mr-3', size: 48)
   = _('Import projects from Bitbucket Server')
 
 = render 'import/githubish_status', provider: 'bitbucket_server', paginatable: true, default_namespace: @namespace, extra_data: { reconfigure_path: configure_import_bitbucket_server_path }
diff --git a/app/views/import/fogbugz/new.html.haml b/app/views/import/fogbugz/new.html.haml
index 2edd9cd5592..001f6588405 100644
--- a/app/views/import/fogbugz/new.html.haml
+++ b/app/views/import/fogbugz/new.html.haml
@@ -2,9 +2,9 @@
 - header_title _("New project"), new_project_path
 - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project')
 
-%h1.page-title.gl-font-size-h-display.d-flex
+%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
   .gl-display-flex.gl-align-items-center.gl-justify-content-center
-    = sprite_icon('bug', css_class: 'gl-mr-2')
+    = sprite_icon('bug', css_class: 'gl-mr-3', size: 48)
   = _('Import projects from FogBugz')
 %hr
 
diff --git a/app/views/import/fogbugz/status.html.haml b/app/views/import/fogbugz/status.html.haml
index fb05e8e9724..7512e3d3935 100644
--- a/app/views/import/fogbugz/status.html.haml
+++ b/app/views/import/fogbugz/status.html.haml
@@ -1,7 +1,7 @@
 - page_title _("FogBugz import")
-%h1.page-title.gl-font-size-h-display.d-flex
+%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
   .gl-display-flex.gl-align-items-center.gl-justify-content-center
-    = sprite_icon('bug', css_class: 'gl-mr-2')
+    = sprite_icon('bug', css_class: 'gl-mr-3', size: 48)
   = _('Import projects from FogBugz')
 
 %p.light
diff --git a/app/views/import/gitea/new.html.haml b/app/views/import/gitea/new.html.haml
index f25ee8dedfb..dcee0c473a1 100644
--- a/app/views/import/gitea/new.html.haml
+++ b/app/views/import/gitea/new.html.haml
@@ -2,9 +2,11 @@
 - header_title _("New project"), new_project_path
 - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project')
 
-%h1.page-title.gl-font-size-h-display
-  = custom_icon('gitea_logo')
+%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('gitea', css_class: 'gl-mr-3', size: 48)
   = _('Import projects from Gitea')
+%hr
 
 %p
   - link_to_personal_token = link_to(_('personal access token'), 'https://docs.gitea.io/en-us/api-usage/#authentication-via-the-api')
diff --git a/app/views/import/gitea/status.html.haml b/app/views/import/gitea/status.html.haml
index 2dde642d8f0..86ab3ca85c3 100644
--- a/app/views/import/gitea/status.html.haml
+++ b/app/views/import/gitea/status.html.haml
@@ -1,6 +1,7 @@
 - page_title _("Gitea import")
-%h1.page-title.gl-font-size-h-display
-  = custom_icon('gitea_logo')
+%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('gitea', css_class: 'gl-mr-3', size: 48)
   = _('Import projects from Gitea')
 
 = render 'import/githubish_status', provider: 'gitea', default_namespace: @namespace
diff --git a/app/views/import/github/new.html.haml b/app/views/import/github/new.html.haml
index 6d0205957ec..2630c2e42e8 100644
--- a/app/views/import/github/new.html.haml
+++ b/app/views/import/github/new.html.haml
@@ -3,8 +3,11 @@
 - header_title _("New project"), new_project_path
 - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project')
 
-%h1.page-title.gl-font-size-h-display
+%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
+  .gl-display-flex.gl-align-items-center.gl-justify-content-center
+    = sprite_icon('github', css_class: 'gl-mr-3', size: 48)
   = title
+%hr
 
 %p
   = import_github_authorize_message
diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml
index 6f25bc75ca1..f1a61d72771 100644
--- a/app/views/import/github/status.html.haml
+++ b/app/views/import/github/status.html.haml
@@ -1,8 +1,8 @@
 - title = has_ci_cd_only_params? ? _('Connect repositories from GitHub') : _('GitHub import')
 - page_title title
-%h1.page-title.gl-font-size-h-display.mb-0.gl-display-flex
+%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
   .gl-display-flex.gl-align-items-center.gl-justify-content-center
-    = sprite_icon('github', css_class: 'gl-mr-2')
+    = sprite_icon('github', css_class: 'gl-mr-3', size: 48)
   = _('Import repositories from GitHub')
 
 = render 'import/githubish_status',
diff --git a/app/views/import/gitlab_projects/new.html.haml b/app/views/import/gitlab_projects/new.html.haml
index 8e51eafd84c..b90d400a843 100644
--- a/app/views/import/gitlab_projects/new.html.haml
+++ b/app/views/import/gitlab_projects/new.html.haml
@@ -2,9 +2,9 @@
 - header_title _("New project"), new_project_path
 - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project')
 
-%h1.page-title.gl-font-size-h-display.d-flex
+%h1.page-title.gl-font-size-h-display.d-flex.gl-align-items-center
   .gl-display-flex.gl-align-items-center.gl-justify-content-center
-    = sprite_icon('tanuki', css_class: 'gl-mr-2')
+    = sprite_icon('tanuki', css_class: 'gl-mr-3', size: 48)
   = _('Import an exported GitLab project')
 %hr