Commit 1d8e8fd5 authored by Simon Knox's avatar Simon Knox

Merge branch 'migrate-bootstrap-to-glbutton-ide-jobs' into 'master'

Update bootstrap buttons to GlButton

See merge request gitlab-org/gitlab!41557
parents b5af728d d041fe34
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { mapActions, mapState } from 'vuex'; import { mapActions, mapState } from 'vuex';
import { throttle } from 'lodash'; import { throttle } from 'lodash';
import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; import { GlTooltipDirective, GlButton, GlIcon } from '@gitlab/ui';
import { __ } from '../../../locale'; import { __ } from '../../../locale';
import ScrollButton from './detail/scroll_button.vue'; import ScrollButton from './detail/scroll_button.vue';
import JobDescription from './detail/description.vue'; import JobDescription from './detail/description.vue';
...@@ -17,6 +17,7 @@ export default { ...@@ -17,6 +17,7 @@ export default {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
}, },
components: { components: {
GlButton,
GlIcon, GlIcon,
ScrollButton, ScrollButton,
JobDescription, JobDescription,
...@@ -75,9 +76,9 @@ export default { ...@@ -75,9 +76,9 @@ export default {
<template> <template>
<div class="ide-pipeline build-page d-flex flex-column flex-fill"> <div class="ide-pipeline build-page d-flex flex-column flex-fill">
<header class="ide-job-header d-flex align-items-center"> <header class="ide-job-header d-flex align-items-center">
<button class="btn btn-default btn-sm d-flex" @click="setDetailJob(null)"> <gl-button category="secondary" icon="chevron-left" size="small" @click="setDetailJob(null)">
<gl-icon name="chevron-left" /> {{ __('View jobs') }} {{ __('View jobs') }}
</button> </gl-button>
</header> </header>
<div class="top-bar d-flex border-left-0 mr-3"> <div class="top-bar d-flex border-left-0 mr-3">
<job-description :job="detailJob" /> <job-description :job="detailJob" />
......
<script> <script>
import { GlButton } from '@gitlab/ui';
import JobDescription from './detail/description.vue'; import JobDescription from './detail/description.vue';
export default { export default {
components: { components: {
JobDescription, JobDescription,
GlButton,
}, },
props: { props: {
job: { job: {
...@@ -28,9 +30,9 @@ export default { ...@@ -28,9 +30,9 @@ export default {
<div class="ide-job-item"> <div class="ide-job-item">
<job-description :job="job" class="gl-mr-3" /> <job-description :job="job" class="gl-mr-3" />
<div class="ml-auto align-self-center"> <div class="ml-auto align-self-center">
<button v-if="job.started" type="button" class="btn btn-default btn-sm" @click="clickViewLog"> <gl-button v-if="job.started" category="secondary" size="small" @click="clickViewLog">
{{ __('View log') }} {{ __('View log') }}
</button> </gl-button>
</div> </div>
</div> </div>
</template> </template>
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