summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components/jobs
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-06-04 14:19:59 +0100
committerPhil Hughes <me@iamphill.com>2018-06-06 08:33:04 +0100
commitdeaf4f72aafa5e248fc58c7a01eef840d0401bd1 (patch)
tree7d3175a2292b1656cbc89c20e17e180d95f1d1bf /app/assets/javascripts/ide/components/jobs
parentf73b2c8e5ee0e02407b6674b9b0021ce4843349b (diff)
downloadgitlab-ce-deaf4f72aafa5e248fc58c7a01eef840d0401bd1.tar.gz
design update
Diffstat (limited to 'app/assets/javascripts/ide/components/jobs')
-rw-r--r--app/assets/javascripts/ide/components/jobs/detail.vue6
-rw-r--r--app/assets/javascripts/ide/components/jobs/item.vue15
2 files changed, 12 insertions, 9 deletions
diff --git a/app/assets/javascripts/ide/components/jobs/detail.vue b/app/assets/javascripts/ide/components/jobs/detail.vue
index 41833f1d4de..9169e138c1e 100644
--- a/app/assets/javascripts/ide/components/jobs/detail.vue
+++ b/app/assets/javascripts/ide/components/jobs/detail.vue
@@ -67,7 +67,7 @@ export default {
<template>
<div class="ide-pipeline build-page d-flex flex-column flex-fill">
- <header class="ide-tree-header ide-pipeline-header">
+ <header class="ide-job-header d-flex align-items-center">
<button
class="btn btn-default btn-sm d-flex"
@click="setDetailJob(null)"
@@ -78,7 +78,7 @@ export default {
{{ __('View jobs') }}
</button>
</header>
- <div class="top-bar d-flex">
+ <div class="top-bar d-flex border-left-0">
<job-description
:job="detailJob"
/>
@@ -110,7 +110,7 @@ export default {
</div>
</div>
<pre
- class="build-trace mb-0"
+ class="build-trace mb-0 h-100"
ref="buildTrace"
@scroll="scrollBuildLog"
>
diff --git a/app/assets/javascripts/ide/components/jobs/item.vue b/app/assets/javascripts/ide/components/jobs/item.vue
index 224e4d5158b..8848a334a48 100644
--- a/app/assets/javascripts/ide/components/jobs/item.vue
+++ b/app/assets/javascripts/ide/components/jobs/item.vue
@@ -27,13 +27,16 @@ export default {
<template>
<div class="ide-job-item">
<job-description
+ class="append-right-default"
:job="job"
/>
- <button
- class="btn btn-default btn-sm ml-auto"
- @click="clickViewLog"
- >
- {{ __('View log') }}
- </button>
+ <div class="ml-auto align-self-center">
+ <button
+ class="btn btn-default btn-sm"
+ @click="clickViewLog"
+ >
+ {{ __('View log') }}
+ </button>
+ </div>
</div>
</template>