diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-24 12:45:07 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-24 12:45:07 -0700 |
| commit | b7f6f96abdb2aaba894e1ab0774d574e1c54aa2e (patch) | |
| tree | 842dc949a6ffab2b00e1564f42343500eae14b94 | |
| parent | 7c8fda2e5a4610b55da565ad7a989873f05ebedf (diff) | |
| download | gitlab-ce-b7f6f96abdb2aaba894e1ab0774d574e1c54aa2e.tar.gz | |
Fix group settings layout
| -rw-r--r-- | app/views/groups/_group_admin_settings.html.haml | 12 | ||||
| -rw-r--r-- | app/views/groups/edit.html.haml | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/views/groups/_group_admin_settings.html.haml b/app/views/groups/_group_admin_settings.html.haml index 5b96351a7c9..3cd3fb32b9c 100644 --- a/app/views/groups/_group_admin_settings.html.haml +++ b/app/views/groups/_group_admin_settings.html.haml @@ -1,5 +1,5 @@ -.form-group - = f.label :lfs_enabled, 'Large File Storage', class: 'col-form-label' +.form-group.row + = f.label :lfs_enabled, 'Large File Storage', class: 'col-form-label col-sm-2' .col-sm-10 .form-check = f.label :lfs_enabled do @@ -10,7 +10,7 @@ %br/ %span.descr This setting can be overridden in each project. -.form-group +.form-group.row = f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2' .col-sm-10 .form-check @@ -19,8 +19,8 @@ %strong Require all users in this group to setup Two-factor authentication = link_to icon('question-circle'), help_page_path('security/two_factor_authentication', anchor: 'enforcing-2fa-for-all-users-in-a-group') -.form-group - .col-sm-offset-2.col-sm-10 +.form-group.row + .offset-sm-2.col-sm-10 .form-check - = f.text_field :two_factor_grace_period, class: 'col-form-label' + = f.text_field :two_factor_grace_period, class: 'form-control' .form-text.text-muted Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index f2f5f0377af..96ed63937fa 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -30,7 +30,7 @@ = render 'shared/allow_request_access', form: f .form-group.row - %label.col-form-label + %label.col-form-label.col-sm-2 = s_("GroupSettings|Share with group lock") .col-sm-10 .form-check |