summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/reports
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-13 12:08:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-13 12:08:04 +0000
commiteb30dd6e28f6fc9eb8021d205f6ed84511f001e2 (patch)
tree9557e4782c762f4d08f57c9e04991bf988695085 /app/assets/javascripts/reports
parentc3ad57034cc1cbd6d0ad02de7ac57f6004440c83 (diff)
downloadgitlab-ce-eb30dd6e28f6fc9eb8021d205f6ed84511f001e2.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/reports')
-rw-r--r--app/assets/javascripts/reports/components/report_section.vue20
1 files changed, 11 insertions, 9 deletions
diff --git a/app/assets/javascripts/reports/components/report_section.vue b/app/assets/javascripts/reports/components/report_section.vue
index 45c890769a0..20b0c52dbda 100644
--- a/app/assets/javascripts/reports/components/report_section.vue
+++ b/app/assets/javascripts/reports/components/report_section.vue
@@ -165,21 +165,23 @@ export default {
<template>
<section class="media-section">
<div class="media">
- <status-icon :status="statusIconName" :size="24" />
- <div class="media-body d-flex flex-align-self-center">
- <span class="js-code-text code-text">
- {{ headerText }}
- <slot :name="slotName"></slot>
-
- <popover v-if="hasPopover" :options="popoverOptions" class="prepend-left-5" />
- </span>
+ <status-icon :status="statusIconName" :size="24" class="align-self-center" />
+ <div class="media-body d-flex flex-align-self-center align-items-center">
+ <div class="js-code-text code-text">
+ <div>
+ {{ headerText }}
+ <slot :name="slotName"></slot>
+ <popover v-if="hasPopover" :options="popoverOptions" class="prepend-left-5" />
+ </div>
+ <slot name="subHeading"></slot>
+ </div>
<slot name="actionButtons"></slot>
<button
v-if="isCollapsible"
type="button"
- class="js-collapse-btn btn float-right btn-sm align-self-start qa-expand-report-button"
+ class="js-collapse-btn btn float-right btn-sm align-self-center qa-expand-report-button"
@click="toggleCollapsed"
>
{{ collapseText }}