diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-06-06 15:36:38 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-06-06 15:36:38 -0500 |
| commit | ff582303a8340fdd4d7fc3c7fb32b07c4c2270fa (patch) | |
| tree | c107fb35154175d5aa1eec5f9a7a1091283baed0 | |
| parent | 9efb1875b7b001f0bda8afea60be7145459eb496 (diff) | |
| download | gitlab-ce-ff582303a8340fdd4d7fc3c7fb32b07c4c2270fa.tar.gz | |
add custom card classes for autodevops settings
| -rw-r--r-- | app/assets/stylesheets/pages/settings_ci_cd.scss | 14 | ||||
| -rw-r--r-- | app/views/projects/settings/ci_cd/_autodevops_form.html.haml | 8 |
2 files changed, 8 insertions, 14 deletions
diff --git a/app/assets/stylesheets/pages/settings_ci_cd.scss b/app/assets/stylesheets/pages/settings_ci_cd.scss index 4366a348f69..777fdb3581e 100644 --- a/app/assets/stylesheets/pages/settings_ci_cd.scss +++ b/app/assets/stylesheets/pages/settings_ci_cd.scss @@ -17,17 +17,11 @@ min-height: 60px; } -.auto-devops-settings { - .card, - .card-body { - border-radius: $card-border-radius; - } +.auto-devops-card { + margin-bottom: $gl-vert-padding; - .card { - margin-bottom: $gl-vert-padding; - } - - .card-body { + > .card-body { + border-radius: $card-border-radius; padding: $gl-padding $gl-padding-24; } } diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml index ceb3597b5de..12a60400a42 100644 --- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml +++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml @@ -10,7 +10,7 @@ %p.auto-devops-warning-message.settings-message.text-center = message.html_safe = f.fields_for :auto_devops_attributes, @auto_devops do |form| - .card + .card.auto-devops-card .card-body .form-check = form.radio_button :enabled, 'true', class: 'form-check-input', data: { hide_extra_settings: false } @@ -19,7 +19,7 @@ .form-text.text-muted = s_('CICD|The Auto DevOps pipeline configuration will be used when there is no %{ci_file} in the project.').html_safe % { ci_file: ci_file_formatted } - .card + .card.auto-devops-card .card-body .form-check = form.radio_button :enabled, '', class: 'form-check-input', data: { hide_extra_settings: false } @@ -28,7 +28,7 @@ .form-text.text-muted = s_('CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}.').html_safe % { ci_file: ci_file_formatted } - .card.js-extra-settings{ class: form.object&.enabled == false ? 'hidden' : nil } + .card.auto-devops-card.js-extra-settings{ class: form.object&.enabled == false ? 'hidden' : nil } .card-body.bg-light = form.label :domain do %strong= _('Domain') @@ -54,7 +54,7 @@ %strong= s_('CICD|Automatic deployment to staging, manual deployment to production') = link_to icon('question-circle'), help_page_path('ci/environments.md', anchor: 'manually-deploying-to-environments'), target: '_blank' - .card + .card.auto-devops-card .card-body .form-check = form.radio_button :enabled, 'false', class: 'form-check-input', data: { hide_extra_settings: true } |