diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-07 20:37:07 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-07 20:37:07 +0000 |
| commit | 735bfe053bc28c0d65b881e5c69e3b947c540870 (patch) | |
| tree | daba0c5ab60925eb7a44e33bbad33e4df1067406 | |
| parent | 039725311255a2060f4fdf6689b57972b04fc9b5 (diff) | |
| parent | 6a136be1e176556b9c7fd7566ca56a153aa71097 (diff) | |
| download | gitlab-ce-735bfe053bc28c0d65b881e5c69e3b947c540870.tar.gz | |
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
3 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 16e999341da..1f8e61257a9 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/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; } diff --git a/app/views/projects/services/prometheus/_configuration_banner.html.haml b/app/views/projects/services/prometheus/_configuration_banner.html.haml index 2cc2a6b2b5b..898b55e4b39 100644 --- a/app/views/projects/services/prometheus/_configuration_banner.html.haml +++ b/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 diff --git a/app/views/projects/services/prometheus/_help.html.haml b/app/views/projects/services/prometheus/_help.html.haml index 15e7362c2ba..35d655e4b32 100644 --- a/app/views/projects/services/prometheus/_help.html.haml +++ b/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') |