Commit 4686d99c authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'mw-onboarding-popover-fixes' into 'master'

Minor style changes for onboarding popovers

See merge request gitlab-org/gitlab-ee!14144
parents 9d16138e f63bec71
......@@ -60,8 +60,8 @@ export default {
boundary="viewport"
:placement="placement"
:show="showPopover"
:css-classes="['blue', 'onboarding-action-popover-container']"
:css-classes="['blue', 'onboarding-popover']"
>
<div class="onboarding-popover" v-html="content"></div>
<div v-html="content"></div>
</gl-popover>
</template>
......@@ -48,15 +48,16 @@ export default {
:placement="placement"
:show="show"
:disabled="disabled"
:css-classes="['onboarding-popover']"
>
<div class="onboarding-popover">
<div>
<p v-html="helpContent.text"></p>
<template v-if="helpContent.buttons">
<gl-button
v-for="(button, index) in helpContent.buttons"
:key="index"
:class="button.btnClass"
class="btn btn-xs mr-2"
class="btn btn-sm mr-2"
:disabled="button.disabled"
@click="callButtonAction(button)"
>
......
......@@ -80,7 +80,7 @@ describe('User onboarding action popover', () => {
describe('template', () => {
it('shows the content passed in as prop', () => {
expect(wrapper.find('.onboarding-popover').text()).toEqual(content);
expect(wrapper.text()).toEqual(content);
});
});
});
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