diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-25 00:10:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-25 00:10:17 +0300 |
commit | 39a4ea6124066f2209829899e6c1afe247304c91 (patch) | |
tree | a6a337abe741974ab90c8fb07787ef1e69f63108 /app/assets/javascripts/jobs | |
parent | 9b14160725d91f8824b35223f16bf073a97bf7de (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
-rw-r--r-- | app/assets/javascripts/jobs/components/manual_variables_form.vue | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/app/assets/javascripts/jobs/components/manual_variables_form.vue b/app/assets/javascripts/jobs/components/manual_variables_form.vue index 122eb5068db..81daad32157 100644 --- a/app/assets/javascripts/jobs/components/manual_variables_form.vue +++ b/app/assets/javascripts/jobs/components/manual_variables_form.vue @@ -1,14 +1,13 @@ <script> import { uniqueId } from 'lodash'; import { mapActions } from 'vuex'; -import { GlDeprecatedButton, GlIcon } from '@gitlab/ui'; +import { GlButton } from '@gitlab/ui'; import { s__, sprintf } from '~/locale'; export default { name: 'ManualVariablesForm', components: { - GlDeprecatedButton, - GlIcon, + GlButton, }, props: { action: { @@ -136,12 +135,12 @@ export default { <div class="table-section section-10"> <div class="table-mobile-header" role="rowheader"></div> <div class="table-mobile-content justify-content-end"> - <gl-deprecated-button - class="btn-transparent btn-blank w-25" + <gl-button + category="tertiary" + icon="clear" + :aria-label="__('Delete variable')" @click="deleteVariable(variable.id)" - > - <gl-icon name="clear" /> - </gl-deprecated-button> + /> </div> </div> </div> @@ -175,9 +174,14 @@ export default { <p class="text-muted" v-html="helpText"></p> </div> <div class="d-flex justify-content-center"> - <gl-deprecated-button variant="primary" @click="triggerManualJob(variables)"> + <gl-button + variant="info" + category="primary" + :aria-label="__('Trigger manual job')" + @click="triggerManualJob(variables)" + > {{ action.button_title }} - </gl-deprecated-button> + </gl-button> </div> </div> </template> |