Merge branch 'fix-forms' into 'master'

Fix features checkboxes at admin settings page

For !1615

See merge request !1674

app/views/admin/application_settings/_form.html.haml

@@ -8,22 +8,30 @@
   %fieldset
     %legend Features
     .form-group
-      = f.label :signup_enabled, class: 'control-label col-sm-2'
-      .col-sm-10
-        = f.check_box :signup_enabled, class: 'checkbox form-control'
-    .form-group
-      = f.label :signin_enabled, class: 'control-label col-sm-2'
-      .col-sm-10
-        = f.check_box :signin_enabled, class: 'checkbox form-control'
-    .form-group
-      = f.label :gravatar_enabled, class: 'control-label col-sm-2'
-      .col-sm-10
-        = f.check_box :gravatar_enabled, class: 'checkbox form-control'
-    .form-group
-      = f.label :twitter_sharing_enabled, "Twitter enabled", class: 'control-label col-sm-2'
-      .col-sm-10
-        = 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
+      .col-sm-offset-2.col-sm-10
+        .checkbox
+          = f.label :signup_enabled do
+            = f.check_box :signup_enabled
+            Signin enabled
+    .form-group
+      .col-sm-offset-2.col-sm-10
+        .checkbox
+          = f.label :signin_enabled do
+            = f.check_box :signin_enabled
+            Signup enabled
+    .form-group
+      .col-sm-offset-2.col-sm-10
+        .checkbox
+          = f.label :gravatar_enabled do
+            = f.check_box :gravatar_enabled
+            Gravatar enabled
+    .form-group
+      .col-sm-offset-2.col-sm-10
+        .checkbox
+          = f.label :twitter_sharing_enabled do
+            = f.check_box :twitter_sharing_enabled, :'aria-describedby' => 'twitter_help_block'
+            %strong Twitter enabled
+          %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