diff options
| author | James Lopez <james@jameslopez.es> | 2016-09-20 08:52:02 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-09-20 10:15:20 +0200 |
| commit | 13e818981506f90b8a4686558d1b40d82dd2b7f9 (patch) | |
| tree | 4757a12569b326849b0d2405f99473fe048fd393 | |
| parent | 254c5aaa92c336d8e17beae546b34a056a954c17 (diff) | |
| download | gitlab-ce-13e818981506f90b8a4686558d1b40d82dd2b7f9.tar.gz | |
some UI changes
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 6 | ||||
| -rw-r--r-- | app/views/import/github/status.html.haml | 17 |
2 files changed, 8 insertions, 15 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 986a22f4e6e..713b2c6656b 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -769,10 +769,4 @@ pre.light-well { display: block; } } -} - -.input-group { - .project-path { - padding: 0; - } }
\ No newline at end of file diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml index 6d7193599f4..4aaf0db6a1b 100644 --- a/app/views/import/github/status.html.haml +++ b/app/views/import/github/status.html.haml @@ -46,17 +46,16 @@ = github_project_link(repo.full_name) %td.import-target %fieldset.row - .input-group - .col-xs-11.col-sm-5.project-path - - if current_user.can_select_namespace? + .input-group.col-sm-8 + .project-path.input-group-btn + - if false - selected = params[:namespace_id] || :current_user - - opts = current_user.can_create_group? ? { extra_groups: [repo.owner.login] } : { display_path: true } - = select_tag :namespace_id, namespaces_options(selected, opts), {class: 'project-path select2 js-select-namespace', tabindex: 1} + - opts = current_user.can_create_group? ? { extra_group: Group.new(name: repo.owner.login) } : { display_path: true } + = select_tag :namespace_id, namespaces_options(selected, opts), { class: 'select2 js-select-namespace', tabindex: 1 } - else - = text_field_tag :path, current_user.namespace_path, class: "form-control", tabindex: 2, autofocus: true, disabled: true - - .col-xs-12.col-sm-6.project-path - = text_field_tag :path, repo.name, class: "form-control", tabindex: 2, autofocus: true, required: true + = text_field_tag :path, current_user.namespace_path, class: "form-control", tabindex: 1, autofocus: true, disabled: true + %span.input-group-addon / + = text_field_tag :path, repo.name, class: "form-control", tabindex: 2, autofocus: true, required: true %td.import-actions.job-status = button_tag class: "btn btn-import js-add-to-import" do Import |