Merge branch '46879-import-project-alignment' into 'master'
Resolve "BS4: Import project page is missing margins and wells" Closes #46879 See merge request gitlab-org/gitlab-ce!19215
This commit is contained in:
commit
439adb96da
|
@ -1,8 +1,7 @@
|
|||
- active_tab = local_assigns.fetch(:active_tab, 'blank')
|
||||
- f = local_assigns.fetch(:f)
|
||||
|
||||
.project-import.row
|
||||
.col-lg-12
|
||||
.project-import
|
||||
.form-group.import-btn-container.clearfix
|
||||
= f.label :visibility_level, class: 'label-light' do #the label here seems wrong
|
||||
Import project from
|
||||
|
@ -44,7 +43,6 @@
|
|||
- if git_import_enabled?
|
||||
%button.btn.js-toggle-button.js-import-git-toggle-button{ type: "button", data: { toggle_open_class: 'active' } }
|
||||
= icon('git', text: 'Repo by URL')
|
||||
.col-lg-12
|
||||
.js-toggle-content.toggle-import-form{ class: ('hide' if active_tab != 'import') }
|
||||
%hr
|
||||
= render "shared/import_form", f: f
|
||||
|
|
|
@ -35,11 +35,10 @@
|
|||
%span (optional)
|
||||
= f.text_area :description, placeholder: 'Description format', class: "form-control", rows: 3, maxlength: 250
|
||||
|
||||
.form-group.visibility-level-setting
|
||||
= f.label :visibility_level, class: 'label-light' do
|
||||
= f.label :visibility_level, class: 'label-light' do
|
||||
Visibility Level
|
||||
= link_to icon('question-circle'), help_page_path("public_access/public_access"), aria: { label: 'Documentation for Visibility Level' }, target: '_blank', rel: 'noopener noreferrer'
|
||||
= render 'shared/visibility_level', f: f, visibility_level: visibility_level.to_i, can_change_visibility_level: true, form_model: @project, with_label: false
|
||||
= render 'shared/visibility_level', f: f, visibility_level: visibility_level.to_i, can_change_visibility_level: true, form_model: @project, with_label: false
|
||||
|
||||
= f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4
|
||||
= link_to 'Cancel', dashboard_projects_path, class: 'btn btn-cancel'
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
- ci_cd_only = local_assigns.fetch(:ci_cd_only, false)
|
||||
|
||||
.form-group.row.import-url-data
|
||||
.form-group.import-url-data
|
||||
= f.label :import_url, class: 'label-light' do
|
||||
%span
|
||||
= _('Git repository URL')
|
||||
|
||||
= f.text_field :import_url, autocomplete: 'off', class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git', required: true
|
||||
|
||||
.card.prepend-top-20
|
||||
.info-well.prepend-top-20
|
||||
.well-segment
|
||||
%ul
|
||||
%li
|
||||
= _('The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>.').html_safe
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
- with_label = local_assigns.fetch(:with_label, true)
|
||||
|
||||
.form-group.row.visibility-level-setting
|
||||
.form-group.visibility-level-setting
|
||||
- if with_label
|
||||
= f.label :visibility_level, class: 'col-form-label col-sm-2' do
|
||||
Visibility Level
|
||||
|
|
Loading…
Reference in New Issue