Commit 9c7faac0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'resetyle-import' into 'master'

Restyle import

Render import providers in one line and make it buttons

See merge request !1699
parents 8e1a3fd1 abf90611
...@@ -301,3 +301,8 @@ table.table.protected-branches-list tr.no-border { ...@@ -301,3 +301,8 @@ table.table.protected-branches-list tr.no-border {
border: 0; border: 0;
} }
} }
.project-import .btn {
float: left;
margin-right: 10px;
}
...@@ -40,52 +40,45 @@ ...@@ -40,52 +40,45 @@
The import will time out after 4 minutes. For big repositories, use a clone/push combination. The import will time out after 4 minutes. For big repositories, use a clone/push combination.
For SVN repositories, check #{link_to "this migrating from SVN doc.", "http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"} For SVN repositories, check #{link_to "this migrating from SVN doc.", "http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"}
.project-import.form-group .project-import.form-group
.col-sm-2 %label.control-label Import projects from
.col-sm-10 .col-sm-10
- if github_import_enabled? - if github_import_enabled?
= link_to status_import_github_path do = link_to status_import_github_path, class: 'btn' do
%i.fa.fa-github %i.fa.fa-github
Import projects from GitHub GitHub
- else - else
= link_to '#', class: 'how_to_import_link light' do = link_to '#', class: 'how_to_import_link light btn' do
%i.fa.fa-github %i.fa.fa-github
Import projects from GitHub GitHub
= render 'github_import_modal' = render 'github_import_modal'
.project-import.form-group
.col-sm-2
.col-sm-10
- if bitbucket_import_enabled? - if bitbucket_import_enabled?
= link_to status_import_bitbucket_path do = link_to status_import_bitbucket_path, class: 'btn' do
%i.fa.fa-bitbucket %i.fa.fa-bitbucket
Import projects from Bitbucket Bitbucket
- else - else
= link_to '#', class: 'how_to_import_link light' do = link_to '#', class: 'how_to_import_link light btn' do
%i.fa.fa-bitbucket %i.fa.fa-bitbucket
Import projects from Bitbucket Bitbucket
= render 'bitbucket_import_modal' = render 'bitbucket_import_modal'
- unless request.host == 'gitlab.com' - unless request.host == 'gitlab.com'
.project-import.form-group
.col-sm-2
.col-sm-10
- if gitlab_import_enabled? - if gitlab_import_enabled?
= link_to status_import_gitlab_path do = link_to status_import_gitlab_path, class: 'btn' do
%i.fa.fa-heart %i.fa.fa-heart
Import projects from GitLab.com GitLab.com
- else - else
= link_to '#', class: 'how_to_import_link light' do = link_to '#', class: 'how_to_import_link light btn' do
%i.fa.fa-heart %i.fa.fa-heart
Import projects from GitLab.com GitLab.com
= render 'gitlab_import_modal' = render 'gitlab_import_modal'
.project-import.form-group = link_to new_import_gitorious_path, class: 'btn' do
.col-sm-2
.col-sm-10
= link_to new_import_gitorious_path do
%i.icon-gitorious.icon-gitorious-small %i.icon-gitorious.icon-gitorious-small
Import projects from Gitorious.org Gitorious.org
%hr.prepend-botton-10 %hr.prepend-botton-10
......
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