Commit 20c56228 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'jivanvl-cleanup-css-job-app' into 'master'

Use utility classes in job app

See merge request gitlab-org/gitlab!61532
parents 142231f2 3bb0ff23
...@@ -201,7 +201,7 @@ export default { ...@@ -201,7 +201,7 @@ export default {
</script> </script>
<template> <template>
<div> <div>
<gl-loading-icon v-if="isLoading" size="lg" class="qa-loading-animation prepend-top-20" /> <gl-loading-icon v-if="isLoading" size="lg" class="qa-loading-animation gl-mt-6" />
<template v-else-if="shouldRenderContent"> <template v-else-if="shouldRenderContent">
<div class="build-page" data-testid="job-content"> <div class="build-page" data-testid="job-content">
...@@ -272,17 +272,17 @@ export default { ...@@ -272,17 +272,17 @@ export default {
<div <div
v-if="job.archived" v-if="job.archived"
class="gl-mt-3 archived-job" class="gl-mt-3 gl-py-2 gl-px-3 gl-align-items-center gl-z-index-1 gl-m-auto archived-job"
:class="{ 'sticky-top border-bottom-0': hasTrace }" :class="{ 'sticky-top gl-border-bottom-0': hasTrace }"
data-testid="archived-job" data-testid="archived-job"
> >
<gl-icon name="lock" class="align-text-bottom" /> <gl-icon name="lock" class="gl-vertical-align-bottom" />
{{ __('This job is archived. Only the complete pipeline can be retried.') }} {{ __('This job is archived. Only the complete pipeline can be retried.') }}
</div> </div>
<!-- job log --> <!-- job log -->
<div <div
v-if="hasTrace" v-if="hasTrace"
class="build-trace-container position-relative" class="build-trace-container gl-relative"
:class="{ 'gl-mt-3': !job.archived }" :class="{ 'gl-mt-3': !job.archived }"
> >
<log-top-bar <log-top-bar
......
...@@ -41,7 +41,7 @@ export default { ...@@ -41,7 +41,7 @@ export default {
<template> <template>
<div <div
class="build-job position-relative" class="build-job gl-relative"
:class="{ :class="{
retried: job.retried, retried: job.retried,
active: isActive, active: isActive,
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
<gl-icon <gl-icon
v-if="isActive" v-if="isActive"
name="arrow-right" name="arrow-right"
class="js-arrow-right icon-arrow-right position-absolute d-block" class="js-arrow-right icon-arrow-right gl-absolute gl-display-block"
/> />
<ci-icon :status="job.status" /> <ci-icon :status="job.status" />
......
...@@ -69,7 +69,10 @@ export default { ...@@ -69,7 +69,10 @@ export default {
<template> <template>
<div class="top-bar"> <div class="top-bar">
<!-- truncate information --> <!-- truncate information -->
<div class="truncated-info d-none d-sm-block float-left" data-testid="log-truncated-info"> <div
class="truncated-info gl-display-none gl-sm-display-block gl-float-left"
data-testid="log-truncated-info"
>
<template v-if="isTraceSizeVisible"> <template v-if="isTraceSizeVisible">
{{ jobLogSize }} {{ jobLogSize }}
<gl-link <gl-link
...@@ -83,7 +86,7 @@ export default { ...@@ -83,7 +86,7 @@ export default {
</div> </div>
<!-- eo truncate information --> <!-- eo truncate information -->
<div class="controllers float-right"> <div class="controllers gl-float-right">
<!-- links --> <!-- links -->
<gl-button <gl-button
v-if="rawPath" v-if="rawPath"
......
...@@ -11,10 +11,6 @@ ...@@ -11,10 +11,6 @@
color: var(--orange-600, $orange-600); color: var(--orange-600, $orange-600);
background-color: var(--orange-50, $orange-50); background-color: var(--orange-50, $orange-50);
border: 1px solid var(--border-color, $border-color); border: 1px solid var(--border-color, $border-color);
padding: 3px 12px;
margin: auto;
align-items: center;
z-index: 1;
.with-performance-bar & { .with-performance-bar & {
top: $header-height + $performance-bar-height; top: $header-height + $performance-bar-height;
......
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