diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-05 21:01:55 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-05 21:01:55 +0300 |
commit | cf4fcf2521f7e6e72f597e0509956db8fbcd7eea (patch) | |
tree | c6192ff93b429c71c0eb2cc7344848aff8524028 /app/views/admin | |
parent | 119ebe30a6efe8ce46c709853124aa5fd041d05b (diff) | |
parent | 38c52b1be6ca05862db0f7e8c4931bebc873bf75 (diff) |
Merge branch 'fix-checkbox-align' into 'master'
Fix checkbox alignment in application settings
Add the form-control CSS class to the feature checkboxes on the application settings page to fix the vertical alignment with their labels. See #2053.
Also add aria-describedby attributes to form controls that have a help text block (http://getbootstrap.com/css/#callout-help-text-accessibility).
## Before
![Admin_area___GitLab](https://dev.gitlab.org/Okada/gitlabhq/uploads/2736fe81ba564b43cbef37cd187cf47a/Admin_area___GitLab.png)
---
## After
![Admin_area___GitLab_-_after](https://dev.gitlab.org/Okada/gitlabhq/uploads/95a8a26600458c9c55bc05d2e0c6be47/Admin_area___GitLab_-_after.png)
---
This doesn't address the help text block for the twitter checkbox. @dzaporozhets Do you want to keep the help text visible or would you rather put it in a dialog and hide it initially?
cc @sytse
See merge request !1615
Diffstat (limited to 'app/views/admin')
-rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index f528d69f431..ac64d26f9aa 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -8,39 +8,39 @@ %fieldset %legend Features .form-group - = f.label :signup_enabled, class: 'control-label' + = f.label :signup_enabled, class: 'control-label col-sm-2' .col-sm-10 - = f.check_box :signup_enabled, class: 'checkbox' + = f.check_box :signup_enabled, class: 'checkbox form-control' .form-group - = f.label :signin_enabled, class: 'control-label' + = f.label :signin_enabled, class: 'control-label col-sm-2' .col-sm-10 - = f.check_box :signin_enabled, class: 'checkbox' + = f.check_box :signin_enabled, class: 'checkbox form-control' .form-group - = f.label :gravatar_enabled, class: 'control-label' + = f.label :gravatar_enabled, class: 'control-label col-sm-2' .col-sm-10 - = f.check_box :gravatar_enabled, class: 'checkbox' + = f.check_box :gravatar_enabled, class: 'checkbox form-control' .form-group - = f.label :twitter_sharing_enabled, "Twitter enabled", class: 'control-label' + = f.label :twitter_sharing_enabled, "Twitter enabled", class: 'control-label col-sm-2' .col-sm-10 - = f.check_box :twitter_sharing_enabled, class: 'checkbox' - %span.help-block Show users button to share their newly created public or internal projects on twitter + = f.check_box :twitter_sharing_enabled, class: 'checkbox form-control', :'aria-describedby' => 'twitter_help_block' + %span.help-block#twitter_help_block Show users a button to share their newly created public or internal projects on twitter %fieldset %legend Misc .form-group - = f.label :default_projects_limit, class: 'control-label' + = f.label :default_projects_limit, class: 'control-label col-sm-2' .col-sm-10 = f.number_field :default_projects_limit, class: 'form-control' .form-group - = f.label :default_branch_protection, class: 'control-label' + = f.label :default_branch_protection, class: 'control-label col-sm-2' .col-sm-10 = f.select :default_branch_protection, options_for_select(Gitlab::Access.protection_options, @application_setting.default_branch_protection), {}, class: 'form-control' .form-group - = f.label :home_page_url, class: 'control-label' + = f.label :home_page_url, class: 'control-label col-sm-2' .col-sm-10 - = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com' - %span.help-block We will redirect non-logged in users to this page + = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block' + %span.help-block#home_help_block We will redirect non-logged in users to this page .form-group - = f.label :sign_in_text, class: 'control-label' + = f.label :sign_in_text, class: 'control-label col-sm-2' .col-sm-10 = f.text_area :sign_in_text, class: 'form-control', rows: 4 .help-block Markdown enabled |