diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-20 13:28:39 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-20 13:28:39 -0700 |
| commit | 33c319508e3e554db6c6d673cb0f564262133e06 (patch) | |
| tree | 321ca46988e6b7baa41f7aabbc7d7eff073ae279 /app/views/import | |
| parent | 69fe32a51c1f0299663177cad47641c50af5caec (diff) | |
| parent | 3873617548c03359e4fb9e093d181a7d61f642c4 (diff) | |
| download | gitlab-ce-33c319508e3e554db6c6d673cb0f564262133e06.tar.gz | |
Merge branch 'master' into sh-support-bitbucket-server-import
Diffstat (limited to 'app/views/import')
| -rw-r--r-- | app/views/import/gitlab_projects/new.html.haml | 6 | ||||
| -rw-r--r-- | app/views/import/manifest/_form.html.haml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/import/gitlab_projects/new.html.haml b/app/views/import/gitlab_projects/new.html.haml index a258fc64b1e..4225ee19217 100644 --- a/app/views/import/gitlab_projects/new.html.haml +++ b/app/views/import/gitlab_projects/new.html.haml @@ -9,7 +9,7 @@ = form_tag import_gitlab_project_path, class: 'new_project', multipart: true do .row .form-group.col-12.col-sm-6 - = label_tag :namespace_id, 'Project path', class: 'label-light' + = label_tag :namespace_id, 'Project path', class: 'label-bold' .form-group .input-group - if current_user.can_select_namespace? @@ -24,7 +24,7 @@ #{user_url(current_user.username)}/ = hidden_field_tag :namespace_id, value: current_user.namespace_id .form-group.col-12.col-sm-6.project-path - = label_tag :path, _('Project name'), class: 'label-light' + = label_tag :path, _('Project name'), class: 'label-bold' = text_field_tag :path, @path, placeholder: "my-awesome-project", class: "js-path-name form-control", tabindex: 2, autofocus: true, required: true .row @@ -33,7 +33,7 @@ .row .form-group.col-sm-12 = hidden_field_tag :namespace_id, @namespace.id - = label_tag :file, _('GitLab project export'), class: 'label-light' + = label_tag :file, _('GitLab project export'), class: 'label-bold' .form-group = file_field_tag :file, class: '' .row diff --git a/app/views/import/manifest/_form.html.haml b/app/views/import/manifest/_form.html.haml index 763beb5958f..78c7fadb019 100644 --- a/app/views/import/manifest/_form.html.haml +++ b/app/views/import/manifest/_form.html.haml @@ -1,6 +1,6 @@ = form_tag upload_import_manifest_path, multipart: true do .form-group - = label_tag :group_id, nil, class: 'label-light' do + = label_tag :group_id, nil, class: 'label-bold' do = _('Group') .input-group .input-group-prepend.has-tooltip{ title: root_url } @@ -11,7 +11,7 @@ = _('Choose the top-level group for your repository imports.') .form-group - = label_tag :manifest, class: 'label-light' do + = label_tag :manifest, class: 'label-bold' do = _('Manifest') = file_field_tag :manifest, class: 'form-control-file', required: true .form-text.text-muted |