diff options
| author | Simon Knox <psimyn@gmail.com> | 2019-03-01 10:26:05 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2019-03-01 12:10:19 +1100 |
| commit | a7418c9c18cb3e4d2823e3739dadf0f9f364c7e0 (patch) | |
| tree | 44cccc2a7fcc2e71030a8e652cc95c9e4accd2a2 | |
| parent | 5444b0a1fadf57cbbb2183001c53864421f8c0fc (diff) | |
| download | gitlab-ce-psimyn-incident-report-section-ee.tar.gz | |
Add Incidents section to operations Settings page (EE Backport)psimyn-incident-report-section-ee
| -rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/settings/operations/_error_tracking.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/settings/operations/show.html.haml | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 811cc310a8f..ef9541b11e0 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -23,7 +23,10 @@ } .settings { - border-bottom: 1px solid $gray-darker; + // border-top for each item except the top one + + .settings { + border-top: 1px solid $border-color; + } &:first-of-type { margin-top: 10px; diff --git a/app/views/projects/settings/operations/_error_tracking.html.haml b/app/views/projects/settings/operations/_error_tracking.html.haml index 4911e8d3770..61a3423bd4a 100644 --- a/app/views/projects/settings/operations/_error_tracking.html.haml +++ b/app/views/projects/settings/operations/_error_tracking.html.haml @@ -2,7 +2,7 @@ - setting = error_tracking_setting -%section.settings.expanded.border-0.no-animate +%section.settings.expanded.no-animate .settings-header %h4 = _('Error Tracking') diff --git a/app/views/projects/settings/operations/show.html.haml b/app/views/projects/settings/operations/show.html.haml index b36fa9a5f51..79b01ad933c 100644 --- a/app/views/projects/settings/operations/show.html.haml +++ b/app/views/projects/settings/operations/show.html.haml @@ -1,5 +1,6 @@ - @content_class = 'limit-container-width' unless fluid_layout - page_title _('Operations') += render_if_exists 'projects/settings/operations/incidents' = render 'projects/settings/operations/error_tracking', expanded: true = render_if_exists 'projects/settings/operations/tracing' |