summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/jobs/components/artifacts_block.vue
diff options
context:
space:
mode:
authorNathan Friend <nfriend@gitlab.com>2018-12-19 15:16:10 -0400
committerNathan Friend <nfriend@gitlab.com>2018-12-19 15:16:10 -0400
commit7798a4a62ab9c4015949f6243a5990b6a158bbf2 (patch)
treef543b474699dbce0f9e941c5b362038c9136edc9 /app/assets/javascripts/jobs/components/artifacts_block.vue
parent4a10c813e726d09216c534bb0ad0ae50a0400259 (diff)
downloadgitlab-ce-7798a4a62ab9c4015949f6243a5990b6a158bbf2.tar.gz
Fix style issues in job details sidebar
This commit fixes a number of minor style issues in the job details sidebar - spacing, font weights, button sizes, and font sizes. More details here: https://gitlab.com/gitlab-org/gitlab-ce/issues/54814
Diffstat (limited to 'app/assets/javascripts/jobs/components/artifacts_block.vue')
-rw-r--r--app/assets/javascripts/jobs/components/artifacts_block.vue32
1 files changed, 16 insertions, 16 deletions
diff --git a/app/assets/javascripts/jobs/components/artifacts_block.vue b/app/assets/javascripts/jobs/components/artifacts_block.vue
index 309b7427b9e..0bce860df91 100644
--- a/app/assets/javascripts/jobs/components/artifacts_block.vue
+++ b/app/assets/javascripts/jobs/components/artifacts_block.vue
@@ -28,27 +28,29 @@ export default {
</script>
<template>
<div class="block">
- <div class="title">{{ s__('Job|Job artifacts') }}</div>
+ <div class="title font-weight-bold">{{ s__('Job|Job artifacts') }}</div>
- <p v-if="isExpired" class="js-artifacts-removed build-detail-row">
- {{ s__('Job|The artifacts were removed') }}
+ <p
+ v-if="isExpired || willExpire"
+ :class="{
+ 'js-artifacts-removed': isExpired,
+ 'js-artifacts-will-be-removed': willExpire,
+ }"
+ class="build-detail-row"
+ >
+ <span v-if="isExpired">{{ s__('Job|The artifacts were removed') }}</span>
+ <span v-if="willExpire">{{ s__('Job|The artifacts will be removed') }}</span>
+ <timeago-tooltip v-if="artifact.expire_at" :time="artifact.expire_at" />
</p>
- <p v-else-if="willExpire" class="js-artifacts-will-be-removed build-detail-row">
- {{ s__('Job|The artifacts will be removed in') }}
- </p>
-
- <timeago-tooltip v-if="artifact.expire_at" :time="artifact.expire_at" />
-
- <div class="btn-group d-flex" role="group">
+ <div class="btn-group d-flex prepend-top-10" role="group">
<gl-link
v-if="artifact.keep_path"
:href="artifact.keep_path"
class="js-keep-artifacts btn btn-sm btn-default"
data-method="post"
+ >{{ s__('Job|Keep') }}</gl-link
>
- {{ s__('Job|Keep') }}
- </gl-link>
<gl-link
v-if="artifact.download_path"
@@ -56,17 +58,15 @@ export default {
class="js-download-artifacts btn btn-sm btn-default"
download
rel="nofollow"
+ >{{ s__('Job|Download') }}</gl-link
>
- {{ s__('Job|Download') }}
- </gl-link>
<gl-link
v-if="artifact.browse_path"
:href="artifact.browse_path"
class="js-browse-artifacts btn btn-sm btn-default"
+ >{{ s__('Job|Browse') }}</gl-link
>
- {{ s__('Job|Browse') }}
- </gl-link>
</div>
</div>
</template>