Commit 0709379d authored by Mark Florian's avatar Mark Florian

Merge branch...

Merge branch '241929-remove-v-html-from-ee-app-assets-javascripts-add_gitlab_slack_application-components' into 'master'

Replace v-html with gl-icon in ee/app/assets/javascripts/add_gitlab_slack_application/components/add_gitlab_slack_application.vue

Closes #241929

See merge request gitlab-org/gitlab!41505
parents 9b73fa03 e5b4b694
...@@ -868,9 +868,6 @@ $add-to-slack-popup-max-width: 400px; ...@@ -868,9 +868,6 @@ $add-to-slack-popup-max-width: 400px;
$add-to-slack-gif-max-width: 850px; $add-to-slack-gif-max-width: 850px;
$add-to-slack-well-max-width: 750px; $add-to-slack-well-max-width: 750px;
$add-to-slack-logo-size: 100px; $add-to-slack-logo-size: 100px;
$double-headed-arrow-width: 100px;
$double-headed-arrow-height: 25px;
$right-arrow-size: 16px;
/* /*
Popup Popup
......
...@@ -447,20 +447,3 @@ table.u2f-registrations, ...@@ -447,20 +447,3 @@ table.u2f-registrations,
width: 100%; width: 100%;
max-width: $add-to-slack-popup-max-width; max-width: $add-to-slack-popup-max-width;
} }
.gitlab-slack-right-arrow svg {
fill: $white-dark;
width: $right-arrow-size;
height: $right-arrow-size;
vertical-align: text-bottom;
}
.gitlab-slack-double-headed-arrow {
vertical-align: text-top;
svg {
fill: $gray-darker;
width: $double-headed-arrow-width;
height: $double-headed-arrow-height;
}
}
<script> <script>
/* eslint-disable @gitlab/vue-require-i18n-strings, vue/no-v-html */ /* eslint-disable @gitlab/vue-require-i18n-strings */
import { GlButton } from '@gitlab/ui'; import { GlButton, GlIcon } from '@gitlab/ui';
import { __ } from '~/locale'; import { __ } from '~/locale';
import { deprecatedCreateFlash as Flash } from '~/flash'; import { deprecatedCreateFlash as Flash } from '~/flash';
import { redirectTo } from '~/lib/utils/url_utility'; import { redirectTo } from '~/lib/utils/url_utility';
import { spriteIcon } from '~/lib/utils/common_utils';
import GitlabSlackService from '../services/gitlab_slack_service'; import GitlabSlackService from '../services/gitlab_slack_service';
export default { export default {
components: { components: {
GlButton, GlButton,
GlIcon,
}, },
props: { props: {
...@@ -64,14 +64,6 @@ export default { ...@@ -64,14 +64,6 @@ export default {
}, },
computed: { computed: {
doubleHeadedArrowSvg() {
return spriteIcon('double-headed-arrow');
},
arrowRightSvg() {
return spriteIcon('arrow-right');
},
hasProjects() { hasProjects() {
return this.projects.length > 0; return this.projects.length > 0;
}, },
...@@ -96,12 +88,9 @@ export default { ...@@ -96,12 +88,9 @@ export default {
<h1>{{ __('GitLab for Slack') }}</h1> <h1>{{ __('GitLab for Slack') }}</h1>
<p>{{ __('Track your GitLab projects with GitLab for Slack.') }}</p> <p>{{ __('Track your GitLab projects with GitLab for Slack.') }}</p>
<div v-once class="prepend-top-20 append-bottom-20"> <div v-once class="gl-my-5 gl-display-flex gl-justify-content-center gl-align-items-center">
<img :src="gitlabLogoPath" class="gitlab-slack-logo" /> <img :src="gitlabLogoPath" class="gitlab-slack-logo" />
<div <gl-icon name="double-headed-arrow" :size="72" class="gl-mx-5 gl-text-gray-200" />
class="gitlab-slack-double-headed-arrow inline prepend-left-20 append-right-20"
v-html="doubleHeadedArrowSvg"
></div>
<img :src="slackLogoPath" class="gitlab-slack-logo" /> <img :src="slackLogoPath" class="gitlab-slack-logo" />
</div> </div>
...@@ -159,7 +148,7 @@ export default { ...@@ -159,7 +148,7 @@ export default {
>/gitlab &lt;project-alias&gt; issue show &lt;id&gt;</code >/gitlab &lt;project-alias&gt; issue show &lt;id&gt;</code
> >
<span> <span>
<div class="gitlab-slack-right-arrow inline gl-mr-2" v-html="arrowRightSvg"></div> <gl-icon name="arrow-right" class="gl-mr-2 gl-text-gray-200" />
Shows the issue with id <strong>&lt;id&gt;</strong> Shows the issue with id <strong>&lt;id&gt;</strong>
</span> </span>
......
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