Commit 55f2dc66 authored by Illya Klymov's avatar Illya Klymov

Merge branch '217634-improve-the-suggest-pipeline-popover-content-alignment' into 'master'

Improve the suggest pipeline popover content alignment

Closes #217634

See merge request gitlab-org/gitlab!32453
parents 9045a83f b59f574a
<script> <script>
import { s__, sprintf } from '~/locale';
import { GlPopover, GlDeprecatedButton } from '@gitlab/ui'; import { GlPopover, GlDeprecatedButton } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
...@@ -15,18 +14,6 @@ export default { ...@@ -15,18 +14,6 @@ export default {
dismissTrackValue: 20, dismissTrackValue: 20,
showTrackValue: 10, showTrackValue: 10,
trackEvent: 'click_button', trackEvent: 'click_button',
popoverContent: sprintf(
'%{messageText1}%{lineBreak}%{messageText2}%{lineBreak}%{messageText3}%{lineBreak}%{messageText4}%{lineBreak}%{messageText5}',
{
messageText1: s__('mrWidget|Detect issues before deployment with a CI pipeline'),
messageText2: s__('mrWidget|that continuously tests your code. We created'),
messageText3: s__("mrWidget|a quick guide that'll show you how to create"),
messageText4: s__('mrWidget|one. Make your code more secure and more'),
messageText5: s__('mrWidget|robust in just a minute.'),
lineBreak: '<br/>',
},
false,
),
components: { components: {
GlPopover, GlPopover,
GlDeprecatedButton, GlDeprecatedButton,
...@@ -110,7 +97,13 @@ export default { ...@@ -110,7 +97,13 @@ export default {
<div class="svg-content svg-150 pt-1"> <div class="svg-content svg-150 pt-1">
<img :src="pipelineSvgPath" /> <img :src="pipelineSvgPath" />
</div> </div>
<p v-html="$options.popoverContent"></p> <p>
{{
s__(
'mrWidget|Detect issues before deployment with a CI pipeline that continuously tests your code. We created a quick guide that will show you how to create one. Make your code more secure and more robust in just a minute.',
)
}}
</p>
<gl-deprecated-button <gl-deprecated-button
ref="ok" ref="ok"
category="primary" category="primary"
......
...@@ -26058,7 +26058,7 @@ msgstr "" ...@@ -26058,7 +26058,7 @@ msgstr ""
msgid "mrWidget|Deployment statistics are not available currently" msgid "mrWidget|Deployment statistics are not available currently"
msgstr "" msgstr ""
msgid "mrWidget|Detect issues before deployment with a CI pipeline" msgid "mrWidget|Detect issues before deployment with a CI pipeline that continuously tests your code. We created a quick guide that will show you how to create one. Make your code more secure and more robust in just a minute."
msgstr "" msgstr ""
msgid "mrWidget|Did not close" msgid "mrWidget|Did not close"
...@@ -26238,9 +26238,6 @@ msgstr "" ...@@ -26238,9 +26238,6 @@ msgstr ""
msgid "mrWidget|Your password" msgid "mrWidget|Your password"
msgstr "" msgstr ""
msgid "mrWidget|a quick guide that'll show you how to create"
msgstr ""
msgid "mrWidget|branch does not exist." msgid "mrWidget|branch does not exist."
msgstr "" msgstr ""
...@@ -26250,15 +26247,6 @@ msgstr "" ...@@ -26250,15 +26247,6 @@ msgstr ""
msgid "mrWidget|into" msgid "mrWidget|into"
msgstr "" msgstr ""
msgid "mrWidget|one. Make your code more secure and more"
msgstr ""
msgid "mrWidget|robust in just a minute."
msgstr ""
msgid "mrWidget|that continuously tests your code. We created"
msgstr ""
msgid "mrWidget|to be added to the merge train when the pipeline succeeds" msgid "mrWidget|to be added to the merge train when the pipeline succeeds"
msgstr "" msgstr ""
......
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