summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/jobs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-23 12:06:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-23 12:06:20 +0000
commit94e614c94c0a42e261e6af88c89461d90f3330c0 (patch)
tree96a7a34c8fad39465ed5021b3f171a642c0a5869 /app/assets/javascripts/jobs
parent1d89871c573830a8194110af252e8907177184b3 (diff)
downloadgitlab-ce-94e614c94c0a42e261e6af88c89461d90f3330c0.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
-rw-r--r--app/assets/javascripts/jobs/components/log/duration_badge.vue4
-rw-r--r--app/assets/javascripts/jobs/components/log/line.vue2
-rw-r--r--app/assets/javascripts/jobs/components/log/line_header.vue2
3 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/jobs/components/log/duration_badge.vue b/app/assets/javascripts/jobs/components/log/duration_badge.vue
index 83f62703d27..31a101d2c95 100644
--- a/app/assets/javascripts/jobs/components/log/duration_badge.vue
+++ b/app/assets/javascripts/jobs/components/log/duration_badge.vue
@@ -9,5 +9,7 @@ export default {
};
</script>
<template>
- <div class="duration rounded align-self-start px-2 ml-2 flex-shrink-0">{{ duration }}</div>
+ <div class="log-duration-badge rounded align-self-start px-2 ml-2 flex-shrink-0">
+ {{ duration }}
+ </div>
</template>
diff --git a/app/assets/javascripts/jobs/components/log/line.vue b/app/assets/javascripts/jobs/components/log/line.vue
index 336ae623f0f..4e09c85b25a 100644
--- a/app/assets/javascripts/jobs/components/log/line.vue
+++ b/app/assets/javascripts/jobs/components/log/line.vue
@@ -19,7 +19,7 @@ export default {
</script>
<template>
- <div class="line">
+ <div class="log-line">
<line-number :line-number="line.lineNumber" :path="path" />
<span v-for="(content, i) in line.content" :key="i" :class="content.style">{{
content.text
diff --git a/app/assets/javascripts/jobs/components/log/line_header.vue b/app/assets/javascripts/jobs/components/log/line_header.vue
index af8de9ec0fa..92cf3b3cf5f 100644
--- a/app/assets/javascripts/jobs/components/log/line_header.vue
+++ b/app/assets/javascripts/jobs/components/log/line_header.vue
@@ -43,7 +43,7 @@ export default {
<template>
<div
- class="line collapsible-line d-flex justify-content-between"
+ class="log-line collapsible-line d-flex justify-content-between"
role="button"
@click="handleOnClick"
>