Commit c8d98d07 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'fl-job-log-bugs' into 'master'

Fixes the whitespace for titles

See merge request gitlab-org/gitlab!18572
parents 1803932d 1d8f18f9
...@@ -9,7 +9,7 @@ export default { ...@@ -9,7 +9,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div class="log-duration-badge rounded align-self-start px-2 ml-2 flex-shrink-0"> <div class="log-duration-badge rounded align-self-start px-2 ml-2 flex-shrink-0 ws-normal">
{{ duration }} {{ duration }}
</div> </div>
</template> </template>
...@@ -21,8 +21,12 @@ export default { ...@@ -21,8 +21,12 @@ export default {
<template> <template>
<div class="js-line log-line"> <div class="js-line log-line">
<line-number :line-number="line.lineNumber" :path="path" /> <line-number :line-number="line.lineNumber" :path="path" />
<span v-for="(content, i) in line.content" :key="i" :class="content.style">{{ <span
content.text v-for="(content, i) in line.content"
}}</span> :key="i"
:class="content.style"
class="ws-pre-wrap"
>{{ content.text }}</span
>
</div> </div>
</template> </template>
...@@ -43,15 +43,19 @@ export default { ...@@ -43,15 +43,19 @@ export default {
<template> <template>
<div <div
class="log-line collapsible-line d-flex justify-content-between" class="log-line collapsible-line d-flex justify-content-between ws-normal"
role="button" role="button"
@click="handleOnClick" @click="handleOnClick"
> >
<icon :name="iconName" class="arrow position-absolute" /> <icon :name="iconName" class="arrow position-absolute" />
<line-number :line-number="line.lineNumber" :path="path" /> <line-number :line-number="line.lineNumber" :path="path" />
<span v-for="(content, i) in line.content" :key="i" class="line-text" :class="content.style">{{ <span
content.text v-for="(content, i) in line.content"
}}</span> :key="i"
class="line-text w-100 ws-pre-wrap"
:class="content.style"
>{{ content.text }}</span
>
<duration-badge v-if="duration" :duration="duration" /> <duration-badge v-if="duration" :duration="duration" />
</div> </div>
</template> </template>
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
<template> <template>
<gl-link <gl-link
:id="lineNumberId" :id="lineNumberId"
class="d-inline-block text-right line-number" class="d-inline-block text-right line-number flex-shrink-0"
:href="buildLineNumber" :href="buildLineNumber"
>{{ parsedLineNumber }}</gl-link >{{ parsedLineNumber }}</gl-link
> >
......
...@@ -19,7 +19,7 @@ export default { ...@@ -19,7 +19,7 @@ export default {
state.isSidebarOpen = true; state.isSidebarOpen = true;
}, },
[types.RECEIVE_TRACE_SUCCESS](state, log) { [types.RECEIVE_TRACE_SUCCESS](state, log = {}) {
if (log.state) { if (log.state) {
state.traceState = log.state; state.traceState = log.state;
} }
......
...@@ -440,6 +440,7 @@ img.emoji { ...@@ -440,6 +440,7 @@ img.emoji {
.flex-no-shrink { flex-shrink: 0; } .flex-no-shrink { flex-shrink: 0; }
.ws-initial { white-space: initial; } .ws-initial { white-space: initial; }
.ws-normal { white-space: normal; } .ws-normal { white-space: normal; }
.ws-pre-wrap { white-space: pre-wrap; }
.overflow-auto { overflow: auto; } .overflow-auto { overflow: auto; }
.d-flex-center { .d-flex-center {
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
border-radius: $border-radius-small; border-radius: $border-radius-small;
min-height: 42px; min-height: 42px;
background-color: $builds-trace-bg; background-color: $builds-trace-bg;
white-space: pre-wrap;
} }
.log-line { .log-line {
......
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