Commit 87b17888 authored by Jacques Erasmus's avatar Jacques Erasmus

Merge branch '229329-migrate-slack-button' into 'master'

Update button to gl-button on GitLab for Slack page

Closes #229329

See merge request gitlab-org/gitlab!42426
parents 2aff10f1 c903f7c7
---
title: Update button to gl-button on GitLab for Slack page
merge_request: 42426
author:
type: other
<script> <script>
/* eslint-disable @gitlab/vue-require-i18n-strings, vue/no-v-html */ /* eslint-disable @gitlab/vue-require-i18n-strings, vue/no-v-html */
import { GlButton } 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';
...@@ -8,6 +9,10 @@ import { spriteIcon } from '~/lib/utils/common_utils'; ...@@ -8,6 +9,10 @@ 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: {
GlButton,
},
props: { props: {
projects: { projects: {
type: Array, type: Array,
...@@ -100,9 +105,14 @@ export default { ...@@ -100,9 +105,14 @@ export default {
<img :src="slackLogoPath" class="gitlab-slack-logo" /> <img :src="slackLogoPath" class="gitlab-slack-logo" />
</div> </div>
<button type="button" class="btn btn-red mx-auto js-popup-button gl-mt-3" @click="togglePopup"> <gl-button
category="primary"
variant="success"
class="js-popup-button gl-mt-3"
@click="togglePopup"
>
{{ __('Add GitLab to Slack') }} {{ __('Add GitLab to Slack') }}
</button> </gl-button>
<div <div
v-if="popupOpen" v-if="popupOpen"
...@@ -117,9 +127,14 @@ export default { ...@@ -117,9 +127,14 @@ export default {
</option> </option>
</select> </select>
<button type="button" class="btn btn-red float-right js-add-button" @click="addToSlack"> <gl-button
category="primary"
variant="success"
class="float-right js-add-button"
@click="addToSlack"
>
{{ __('Add to Slack') }} {{ __('Add to Slack') }}
</button> </gl-button>
</div> </div>
<span v-else-if="isSignedIn && !hasProjects" class="js-no-projects">{{ <span v-else-if="isSignedIn && !hasProjects" class="js-no-projects">{{
......
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