Commit af7f37c1 authored by Annabel Gray's avatar Annabel Gray

Merge branch 'ee-fix-popovers' into 'master'

Fix bootstrap popover class renames

Closes gitlab-ce#47727

See merge request gitlab-org/gitlab-ee!6085
parents 13a8ad60 c069e1f7
......@@ -126,7 +126,7 @@ export default {
:class="flagOrientation"
>
<div class="arrow"></div>
<div class="popover-title">
<div class="popover-header">
<h5 v-if="deploymentFlagData">
Deployed
</h5>
......@@ -135,7 +135,7 @@ export default {
</div>
<div
v-if="deploymentFlagData"
class="popover-content deploy-meta-content"
class="popover-body deploy-meta-content"
>
<div>
<icon
......@@ -158,7 +158,7 @@ export default {
</a>
</div>
</div>
<div class="popover-content">
<div class="popover-body">
<table class="prometheus-table">
<tr
v-for="(series, index) in timeSeries"
......
......@@ -495,14 +495,14 @@
border-width: 8px;
}
> .popover-title,
> .popover-content {
> .popover-header,
> .popover-body {
padding: 8px;
font-size: 12px;
white-space: nowrap;
}
> .popover-title {
> .popover-header {
background-color: $theme-gray-50;
}
}
......
......@@ -206,7 +206,7 @@
padding: 0;
}
.popover-content {
.popover-body {
padding: 0;
}
}
......
......@@ -104,8 +104,8 @@
template: `
<div class="popover geo-node-detail-popover" role="tooltip">
<div class="arrow"></div>
<p class="popover-title"></p>
<div class="popover-content"></div>
<p class="popover-header"></p>
<div class="popover-body"></div>
</div>
`,
title: this.helpInfo.title,
......
......@@ -63,7 +63,7 @@ describe('GraphFlag', () => {
});
expect(
deploymentFlagComponent.$el.querySelector('.popover-title'),
deploymentFlagComponent.$el.querySelector('.popover-header'),
).toContainText('Deployed');
});
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment