summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-11-09 12:39:15 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-11-09 12:39:15 +0000
commit9719b3c0763c1a968831c540132b6bd8ebe86af0 (patch)
tree63c371b10fbb16e40e250ee13d26d1b2b59c3367
parent019d9604818d5c6e35d464c4a728313ef2ab72e2 (diff)
downloadgitlab-ce-51259-ci-cd-gitlab-ui-1.tar.gz
Removes unnecessary classes & uses `variant` instead51259-ci-cd-gitlab-ui-1
-rw-r--r--app/assets/javascripts/pipelines/components/empty_state.vue11
-rw-r--r--app/assets/javascripts/pipelines/components/nav_controls.vue18
-rw-r--r--app/assets/javascripts/pipelines/components/pipelines_actions.vue2
-rw-r--r--app/assets/javascripts/pipelines/components/pipelines_artifacts.vue7
4 files changed, 21 insertions, 17 deletions
diff --git a/app/assets/javascripts/pipelines/components/empty_state.vue b/app/assets/javascripts/pipelines/components/empty_state.vue
index 3c1a59cca30..8a0259ed5a5 100644
--- a/app/assets/javascripts/pipelines/components/empty_state.vue
+++ b/app/assets/javascripts/pipelines/components/empty_state.vue
@@ -1,10 +1,10 @@
<script>
-import { GlLink } from '@gitlab-org/gitlab-ui';
+import { GlButton } from '@gitlab-org/gitlab-ui';
export default {
name: 'PipelinesEmptyState',
components: {
- GlLink,
+ GlButton,
},
props: {
helpPagePath: {
@@ -46,12 +46,13 @@ export default {
</p>
<div class="text-center">
- <gl-link
+ <gl-button
:href="helpPagePath"
- class="btn btn-primary js-get-started-pipelines"
+ variant="primary"
+ class="js-get-started-pipelines"
>
{{ s__('Pipelines|Get started with Pipelines') }}
- </gl-link>
+ </gl-button>
</div>
</template>
diff --git a/app/assets/javascripts/pipelines/components/nav_controls.vue b/app/assets/javascripts/pipelines/components/nav_controls.vue
index 5cdb3d1b7e5..0911acbb131 100644
--- a/app/assets/javascripts/pipelines/components/nav_controls.vue
+++ b/app/assets/javascripts/pipelines/components/nav_controls.vue
@@ -1,5 +1,5 @@
<script>
-import { GlLink } from '@gitlab-org/gitlab-ui';
+import { GlLink, GlButton } from '@gitlab-org/gitlab-ui';
import LoadingButton from '../../vue_shared/components/loading_button.vue';
export default {
@@ -7,6 +7,7 @@ export default {
components: {
LoadingButton,
GlLink,
+ GlButton,
},
props: {
newPipelinePath: {
@@ -42,28 +43,29 @@ export default {
</script>
<template>
<div class="nav-controls">
- <gl-link
+ <gl-button
v-if="newPipelinePath"
:href="newPipelinePath"
- class="btn btn-success js-run-pipeline"
+ variant="success"
+ class="js-run-pipeline"
>
{{ s__('Pipelines|Run Pipeline') }}
- </gl-link>
+ </gl-button>
<loading-button
v-if="resetCachePath"
:loading="isResetCacheButtonLoading"
:label="s__('Pipelines|Clear Runner Caches')"
- class="btn btn-default js-clear-cache"
+ class="js-clear-cache"
@click="onClickResetCache"
/>
- <gl-link
+ <gl-button
v-if="ciLintPath"
:href="ciLintPath"
- class="btn btn-default js-ci-lint"
+ class="js-ci-lint"
>
{{ s__('Pipelines|CI Lint') }}
- </gl-link>
+ </gl-button>
</div>
</template>
diff --git a/app/assets/javascripts/pipelines/components/pipelines_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_actions.vue
index eda9aea29b6..811495c45a9 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_actions.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_actions.vue
@@ -60,7 +60,7 @@ export default {
<template>
<div class="btn-group">
<gl-button
- v-gl-tooltip.top
+ v-gl-tooltip
:disabled="isLoading"
class="dropdown-new btn btn-default js-pipeline-dropdown-manual-actions"
title="Manual job"
diff --git a/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue b/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
index 95261d3a0bf..2abb24b87b6 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
@@ -25,8 +25,8 @@ export default {
role="group"
>
<gl-button
- v-gl-tooltip.top
- class="dropdown-toggle btn btn-default build-artifacts js-pipeline-dropdown-download"
+ v-gl-tooltip
+ class="dropdown-toggle build-artifacts js-pipeline-dropdown-download"
title="Artifacts"
data-toggle="dropdown"
aria-label="Artifacts"
@@ -41,7 +41,8 @@ export default {
<ul class="dropdown-menu dropdown-menu-right">
<li
v-for="(artifact, i) in artifacts"
- :key="i">
+ :key="i"
+ >
<gl-link
:href="artifact.path"
rel="nofollow"