summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-10 15:33:45 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-10 15:33:45 +0000
commit190c9e9f39c6d14c2a47083fcd5d64717919d9eb (patch)
tree91c27eaebe73a0865444f7fac4f2ef520e147ea6 /app
parente407a481f2b52342c79e6a7eca2e785a6e943d2f (diff)
parent3620849018c64455d3f4aba478ec66e0a05d67ed (diff)
downloadgitlab-ce-190c9e9f39c6d14c2a47083fcd5d64717919d9eb.tar.gz
Merge branch 'fix-project-edit' into 'master'
Improve project edit form Properly align checkboxes according to bootstrap Before: ![Screenshot_2015-06-10_17.01.26](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2e874cc0a6edd52d98a17030f3d16f24/Screenshot_2015-06-10_17.01.26.png) After: ![Screenshot_2015-06-10_16.59.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d91ffe8e981f9bc57d9a18ce8ac79e2/Screenshot_2015-06-10_16.59.31.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !793
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/edit.html.haml42
1 files changed, 25 insertions, 17 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index c09d794ef7f..2765f63c6bc 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -6,7 +6,7 @@
Project settings
%hr
.panel-body
- = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit_project form-horizontal" }, authenticity_token: true do |f|
+ = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit_project form-horizontal fieldset-form" }, authenticity_token: true do |f|
%fieldset
.form-group.project_name_holder
@@ -41,32 +41,40 @@
%legend
Features:
.form-group
- = f.label :issues_enabled, "Issues", class: 'control-label'
- .col-sm-10
+ .col-sm-offset-2.col-sm-10
.checkbox
- = f.check_box :issues_enabled
- %span.descr Lightweight issue tracking system for this project
+ = f.label :issues_enabled do
+ = f.check_box :issues_enabled
+ %strong Issues
+ %br
+ %span.descr Lightweight issue tracking system for this project
.form-group
- = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label'
- .col-sm-10
+ .col-sm-offset-2.col-sm-10
.checkbox
- = f.check_box :merge_requests_enabled
- %span.descr Submit changes to be merged upstream.
+ = f.label :merge_requests_enabled do
+ = f.check_box :merge_requests_enabled
+ %strong Merge Requests
+ %br
+ %span.descr Submit changes to be merged upstream.
.form-group
- = f.label :wiki_enabled, "Wiki", class: 'control-label'
- .col-sm-10
+ .col-sm-offset-2.col-sm-10
.checkbox
- = f.check_box :wiki_enabled
- %span.descr Pages for project documentation
+ = f.label :wiki_enabled do
+ = f.check_box :wiki_enabled
+ %strong Wiki
+ %br
+ %span.descr Pages for project documentation
.form-group
- = f.label :snippets_enabled, "Snippets", class: 'control-label'
- .col-sm-10
+ .col-sm-offset-2.col-sm-10
.checkbox
- = f.check_box :snippets_enabled
- %span.descr Share code pastes with others out of git repository
+ = f.label :snippets_enabled do
+ = f.check_box :snippets_enabled
+ %strong Snippets
+ %br
+ %span.descr Share code pastes with others out of git repository
%fieldset.features
%legend