Merge branch 'jivl-ce-backport-card-class-integration-forms' into 'master'

CE backport for the card class changes

See merge request gitlab-org/gitlab-ce!19453

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?
-  .well
+  .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')