diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-31 19:28:58 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-31 19:28:58 +0000 |
| commit | f153faa86e5ed3c0fff43f92bcc6121fe79b1070 (patch) | |
| tree | 987e4dbf55210d7f096675291dbfb65c33d8e199 /app/views/admin | |
| parent | 7e83211fc96db9530ff2053a17e4cd59f39357da (diff) | |
| parent | cf3f7601b06a82f02cc0f870bf05ec4b42a8ea92 (diff) | |
| download | gitlab-ce-f153faa86e5ed3c0fff43f92bcc6121fe79b1070.tar.gz | |
Merge branch 'jivl-update-form-horizontal-usage' into 'master'
Remove form-horizontal class where applicable
Closes #46744
See merge request gitlab-org/gitlab-ce!19262
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/application_settings/_repository_mirrors_form.html.haml | 8 | ||||
| -rw-r--r-- | app/views/admin/application_settings/_terms.html.haml | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/views/admin/application_settings/_repository_mirrors_form.html.haml b/app/views/admin/application_settings/_repository_mirrors_form.html.haml index 1fa793e2ace..187c6c28bb1 100644 --- a/app/views/admin/application_settings/_repository_mirrors_form.html.haml +++ b/app/views/admin/application_settings/_repository_mirrors_form.html.haml @@ -1,10 +1,10 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path do |f| = form_errors(@application_setting) %fieldset - .form-group - = f.label :mirror_available, 'Enable mirror configuration', class: 'control-label col-sm-2' - .col-sm-10 + .form-group.row + = f.label :mirror_available, 'Enable mirror configuration', class: 'control-label col-sm-4' + .col-sm-8 .form-check = f.check_box :mirror_available, class: 'form-check-input' = f.label :mirror_available, class: 'form-check-label' do diff --git a/app/views/admin/application_settings/_terms.html.haml b/app/views/admin/application_settings/_terms.html.haml index 325ca1ac003..257565ce193 100644 --- a/app/views/admin/application_settings/_terms.html.haml +++ b/app/views/admin/application_settings/_terms.html.haml @@ -1,8 +1,8 @@ -= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f| += form_for @application_setting, url: admin_application_settings_path do |f| = form_errors(@application_setting) %fieldset - .form-group + .form-group.row .col-sm-12 .form-check = f.check_box :enforce_terms, class: 'form-check-input' @@ -10,7 +10,7 @@ = _("Require all users to accept Terms of Service when they access GitLab.") .form-text.text-muted = _("When enabled, users cannot use GitLab until the terms have been accepted.") - .form-group + .form-group.row .col-sm-12 = f.label :terms do = _("Terms of Service Agreement") |