Merge branch 'jivl-fix-card-class-for-integration-forms' into 'master'

Fix card class for integration forms

Closes gitlab-ce#47074

See merge request gitlab-org/gitlab-ee!5983

app/assets/stylesheets/pages/settings.scss

@@ -127,12 +127,16 @@
   color: $gl-danger;
 }
 
-.service-settings .form-control-label {
-  padding-top: 0;
+.service-settings {
+  input[type="radio"],
+  input[type="checkbox"] {
+    margin-top: 10px;
+  }
 }
 
 .integration-settings-form {
-  .card.card-body {
+  .card.card-body,
+  .info-well {
     padding: $gl-padding / 2;
     box-shadow: none;
   }

app/views/projects/services/prometheus/_configuration_banner.html.haml

@@ -2,7 +2,7 @@
   = s_('PrometheusService|Auto configuration')
 
 - if service.manual_configuration?
-  .card
+  .info-well
     = s_('PrometheusService|To enable the installation of Prometheus on your clusters, deactivate the manual configuration below')
 - else
   .container-fluid

app/views/projects/services/prometheus/_help.html.haml

@@ -5,5 +5,5 @@
   = s_('PrometheusService|Manual configuration')
 
 - unless @service.editable?
-  .card
+  .info-well
     = s_('PrometheusService|To enable manual configuration, uninstall Prometheus from your clusters')

app/views/shared/_field.html.haml

@@ -9,11 +9,11 @@
 - help = field[:help]
 - disabled = disable_fields_service?(@service)
 
-.form-group
+.form-group.row
   - if type == "password" && value.present?
-    = form.label name, "Enter new #{title.downcase}", class: "col-form-label"
+    = form.label name, "Enter new #{title.downcase}", class: "col-form-label col-sm-2"
   - else
-    = form.label name, title, class: "col-form-label"
+    = form.label name, title, class: "col-form-label col-sm-2"
   .col-sm-10
     - if type == 'text'
       = form.text_field name, class: "form-control", placeholder: placeholder, required: required, disabled: disabled