Commit 84b0e560 authored by Kushal Pandya's avatar Kushal Pandya

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

Replace fa-bitbucket-* icons with GitLab SVG

See merge request gitlab-org/gitlab!45437
parents 5ce0fc27 605d596b
......@@ -149,10 +149,6 @@
content: '\f0f3';
}
.fa-bitbucket-square::before {
content: '\f172';
}
.fa-file-o::before {
content: '\f016';
}
......@@ -165,10 +161,6 @@
content: '\f111';
}
.fa-bitbucket::before {
content: '\f171';
}
.fa-git::before {
content: '\f1d3';
}
......
- page_title _('Bitbucket import')
- header_title _('Projects'), root_path
%h3.page-title
%i.fa.fa-bitbucket
%h3.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
= sprite_icon('bitbucket', css_class: 'gl-mr-2')
= _('Import projects from Bitbucket')
= render 'import/githubish_status', provider: 'bitbucket'
......@@ -3,8 +3,10 @@
- breadcrumb_title title
- header_title _("Projects"), root_path
%h3.page-title
= icon 'bitbucket-square', text: _('Import repositories from Bitbucket Server')
%h3.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
= sprite_icon('bitbucket', css_class: 'gl-mr-2')
= _('Import repositories from Bitbucket Server')
%p
= _('Enter in your Bitbucket Server URL and personal access token below')
......
- page_title _('Bitbucket Server import')
- header_title _('Projects'), root_path
%h3.page-title
%i.fa.fa-bitbucket-square
%h3.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
= sprite_icon('bitbucket', css_class: 'gl-mr-2')
= _('Import projects from Bitbucket Server')
= render 'import/githubish_status', provider: 'bitbucket_server', paginatable: true, extra_data: { reconfigure_path: configure_import_bitbucket_server_path }
......@@ -21,13 +21,15 @@
%div
= link_to status_import_bitbucket_path, class: "btn import_bitbucket #{'how_to_import_link' unless bitbucket_import_configured?}",
**tracking_attrs(track_label, 'click_button', 'bitbucket_cloud') do
= icon('bitbucket', text: 'Bitbucket Cloud')
= sprite_icon('bitbucket')
Bitbucket Cloud
- unless bitbucket_import_configured?
= render 'projects/bitbucket_import_modal'
- if bitbucket_server_import_enabled?
%div
= link_to status_import_bitbucket_server_path, class: "btn import_bitbucket", **tracking_attrs(track_label, 'click_button', 'bitbucket_server') do
= icon('bitbucket-square', text: 'Bitbucket Server')
= sprite_icon('bitbucket')
Bitbucket Server
%div
- if gitlab_import_enabled?
%div
......
---
title: Replace fa-bitbucket-* icons with GitLab SVG
merge_request: 45437
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment