Resolve "Use one column form layout on Admin Area Settings page"

1 files changed, 41 insertions, 48 deletions

diff --git a/app/views/admin/application_settings/_repository_storage.html.haml b/app/views/admin/application_settings/_repository_storage.html.haml
index 89d2c114b22..5a303666353 100644
--- a/app/views/admin/application_settings/_repository_storage.html.haml
+++ b/app/views/admin/application_settings/_repository_storage.html.haml
@@ -3,56 +3,49 @@
 
   %fieldset
     .sub-section
-      .form-group.row
-        .offset-sm-2.col-sm-10
-          .form-check
-            = f.check_box :hashed_storage_enabled, class: 'form-check-input'
-            = f.label :hashed_storage_enabled, class: 'form-check-label' do
-              Create new projects using hashed storage paths
-            .form-text.text-muted
-              Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents
-              repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance.
-              %em (EXPERIMENTAL)
-      .form-group.row
-        = f.label :repository_storages, 'Storage paths for new projects', class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages),
-            {include_hidden: false}, multiple: true, class: 'form-control'
+      .form-group
+        .form-check
+          = f.check_box :hashed_storage_enabled, class: 'form-check-input'
+          = f.label :hashed_storage_enabled, class: 'form-check-label' do
+            Create new projects using hashed storage paths
           .form-text.text-muted
-            Manage repository storage paths. Learn more in the
-            = succeed "." do
-              = link_to "repository storages documentation", help_page_path("administration/repository_storage_paths")
+            Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents
+            repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance.
+            %em (EXPERIMENTAL)
+      .form-group
+        = f.label :repository_storages, 'Storage paths for new projects', class: 'label-light'
+        = f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages),
+          {include_hidden: false}, multiple: true, class: 'form-control'
+        .form-text.text-muted
+          Manage repository storage paths. Learn more in the
+          = succeed "." do
+            = link_to "repository storages documentation", help_page_path("administration/repository_storage_paths")
     .sub-section
       %h4 Circuit breaker
-      .form-group.row
-        = f.label :circuitbreaker_check_interval, _('Check interval'), class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :circuitbreaker_check_interval, class: 'form-control'
-          .form-text.text-muted
-            = circuitbreaker_check_interval_help_text
-      .form-group.row
-        = f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :circuitbreaker_access_retries, class: 'form-control'
-          .form-text.text-muted
-            = circuitbreaker_access_retries_help_text
-      .form-group.row
-        = f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :circuitbreaker_storage_timeout, class: 'form-control'
-          .form-text.text-muted
-            = circuitbreaker_storage_timeout_help_text
-      .form-group.row
-        = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :circuitbreaker_failure_count_threshold, class: 'form-control'
-          .form-text.text-muted
-            = circuitbreaker_failure_count_help_text
-      .form-group.row
-        = f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'col-form-label col-sm-2'
-        .col-sm-10
-          = f.number_field :circuitbreaker_failure_reset_time, class: 'form-control'
-          .form-text.text-muted
-            = circuitbreaker_failure_reset_time_help_text
+      .form-group
+        = f.label :circuitbreaker_check_interval, _('Check interval'), class: 'label-light'
+        = f.number_field :circuitbreaker_check_interval, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_check_interval_help_text
+      .form-group
+        = f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'label-light'
+        = f.number_field :circuitbreaker_access_retries, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_access_retries_help_text
+      .form-group
+        = f.label :circuitbreaker_storage_timeout, _('Seconds to wait for a storage access attempt'), class: 'label-light'
+        = f.number_field :circuitbreaker_storage_timeout, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_storage_timeout_help_text
+      .form-group
+        = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'label-light'
+        = f.number_field :circuitbreaker_failure_count_threshold, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_failure_count_help_text
+      .form-group
+        = f.label :circuitbreaker_failure_reset_time, _('Seconds before reseting failure information'), class: 'label-light'
+        = f.number_field :circuitbreaker_failure_reset_time, class: 'form-control'
+        .form-text.text-muted
+          = circuitbreaker_failure_reset_time_help_text
 
   = f.submit 'Save changes', class: "btn btn-success"