Commit 6c9027f8 authored by Phil Hughes's avatar Phil Hughes

fixed up after bootstrap upgrade

parent 65c16758
...@@ -54,10 +54,13 @@ export default { ...@@ -54,10 +54,13 @@ export default {
<template> <template>
<div <div
class="panel panel-default prepend-top-default" class="card prepend-top-default"
> >
<div <div
class="panel-heading" class="card-header"
:class="{
'border-bottom-0': stage.isCollapsed
}"
@click="toggleStageCollapsed(stage.id)" @click="toggleStageCollapsed(stage.id)"
> >
<ci-icon <ci-icon
...@@ -75,9 +78,9 @@ export default { ...@@ -75,9 +78,9 @@ export default {
</strong> </strong>
<div <div
v-if="!stage.isLoading || stage.jobs.length" v-if="!stage.isLoading || stage.jobs.length"
class="append-right-8" class="append-right-8 prepend-left-4"
> >
<span class="badge"> <span class="badge badge-pill">
{{ jobsCount }} {{ jobsCount }}
</span> </span>
</div> </div>
...@@ -87,7 +90,7 @@ export default { ...@@ -87,7 +90,7 @@ export default {
/> />
</div> </div>
<div <div
class="panel-body" class="card-body"
v-show="!stage.isCollapsed" v-show="!stage.isCollapsed"
> >
<loading-icon <loading-icon
...@@ -105,20 +108,20 @@ export default { ...@@ -105,20 +108,20 @@ export default {
</template> </template>
<style scoped> <style scoped>
.panel-heading { .card-header {
display: flex; display: flex;
cursor: pointer; cursor: pointer;
} }
.panel-heading .ci-status-icon { .card-header .ci-status-icon {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.panel-heading .pull-right { .card-header .pull-right {
margin: auto 0 auto auto; margin: auto 0 auto auto;
} }
.panel-body { .card-body {
padding: 0; padding: 0;
} }
......
...@@ -18,6 +18,11 @@ export default { ...@@ -18,6 +18,11 @@ export default {
}, },
methods: { methods: {
...mapActions(['setRightPane']), ...mapActions(['setRightPane']),
clickTab(e, view) {
e.target.blur();
this.setRightPane(view);
},
}, },
rightSidebarViews, rightSidebarViews,
}; };
...@@ -46,7 +51,7 @@ export default { ...@@ -46,7 +51,7 @@ export default {
active: rightPane === $options.rightSidebarViews.pipelines active: rightPane === $options.rightSidebarViews.pipelines
}" }"
type="button" type="button"
@click="setRightPane($options.rightSidebarViews.pipelines)" @click="clickTab($event, $options.rightSidebarViews.pipelines)"
> >
<icon <icon
:size="16" :size="16"
......
...@@ -69,7 +69,7 @@ export default { ...@@ -69,7 +69,7 @@ export default {
Jobs Jobs
<span <span
v-if="jobsCount" v-if="jobsCount"
class="badge" class="badge badge-pill"
> >
{{ jobsCount }} {{ jobsCount }}
</span> </span>
...@@ -86,7 +86,7 @@ export default { ...@@ -86,7 +86,7 @@ export default {
Failed Jobs Failed Jobs
<span <span
v-if="failedJobsCount" v-if="failedJobsCount"
class="badge" class="badge badge-pill"
> >
{{ failedJobsCount }} {{ failedJobsCount }}
</span> </span>
......
...@@ -26,12 +26,12 @@ export default { ...@@ -26,12 +26,12 @@ export default {
'li', 'li',
{ {
key: i, key: i,
class: tab.localActive ? 'active' : null,
}, },
[ [
h( h(
'a', 'a',
{ {
class: tab.localActive ? 'active' : null,
attrs: { attrs: {
href: '#', href: '#',
}, },
......
...@@ -65,17 +65,19 @@ describe('IDE pipelines mutations', () => { ...@@ -65,17 +65,19 @@ describe('IDE pipelines mutations', () => {
expect(mockedState.stages.length).toBe(2); expect(mockedState.stages.length).toBe(2);
expect(mockedState.stages).toEqual([ expect(mockedState.stages).toEqual([
{ {
...stages[0],
dropdownPath: stages[0].dropdownPath,
id: 0, id: 0,
dropdownPath: stages[0].dropdown_path,
name: stages[0].name,
status: stages[0].status,
isCollapsed: false, isCollapsed: false,
isLoading: false, isLoading: false,
jobs: [], jobs: [],
}, },
{ {
...stages[1],
dropdownPath: stages[1].dropdownPath,
id: 1, id: 1,
dropdownPath: stages[1].dropdown_path,
name: stages[1].name,
status: stages[1].status,
isCollapsed: false, isCollapsed: false,
isLoading: false, isLoading: false,
jobs: [], jobs: [],
......
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