diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-15 12:45:49 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-15 12:45:49 +0000 |
| commit | 35b31ba84fd4ea37debfaf50a5ab98a417f2158a (patch) | |
| tree | 7a7547a6bbe0c67af600a95ea8d4ea11703602a7 | |
| parent | e8213b34854fada5174d80a4c5892e7eff81acc6 (diff) | |
| parent | 4304ea802ffd8c09a3880856db41bbe8ce4f64a0 (diff) | |
| download | gitlab-ce-35b31ba84fd4ea37debfaf50a5ab98a417f2158a.tar.gz | |
Merge branch 'create-new-project-ui-fix' into 'master'
Layout alignment fix in new project and edit project screen
See merge request !9201
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 8 | ||||
| -rw-r--r-- | app/views/projects/edit.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/new.html.haml | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 8b59c20cb65..9a72148f408 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -35,12 +35,8 @@ margin-bottom: 10px; } - .project-path { - padding-right: 0; - - .form-control { - border-radius: $border-radius-base; - } + .project-path .form-control { + border-radius: $border-radius-base; } .input-group > div { diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index f2905fa3ce9..b9300efd04f 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -6,7 +6,7 @@ .col-lg-9 .project-edit-errors = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit-project" }, authenticity_token: true do |f| - %fieldset.append-bottom-0 + %fieldset .row .form-group.col-md-9 = f.label :name, class: 'label-light', for: 'project_name_edit' do @@ -33,7 +33,7 @@ = f.text_field :tag_list, value: @project.tag_list.to_s, maxlength: 2000, class: "form-control" %p.help-block Separate tags with commas. %hr - %fieldset.append-bottom-0 + %fieldset %h5.prepend-top-0 Sharing & Permissions .form_group.prepend-top-20.sharing-and-permissions diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 41473fae4de..a07885537b9 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -12,7 +12,7 @@ Create or Import your project from popular Git services .col-lg-9 = form_for @project, html: { class: 'new_project' } do |f| - %fieldset.append-bottom-0 + .row .form-group.col-xs-12.col-sm-6 = f.label :namespace_id, class: 'label-light' do %span |