Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
3bb0ff23
Commit
3bb0ff23
authored
May 11, 2021
by
Jose Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use utility classes in job app
Replace classes in the build.scss file for utility based ones
parent
27159020
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
13 deletions
+12
-13
app/assets/javascripts/jobs/components/job_app.vue
app/assets/javascripts/jobs/components/job_app.vue
+5
-5
app/assets/javascripts/jobs/components/job_container_item.vue
...assets/javascripts/jobs/components/job_container_item.vue
+2
-2
app/assets/javascripts/jobs/components/job_log_controllers.vue
...ssets/javascripts/jobs/components/job_log_controllers.vue
+5
-2
app/assets/stylesheets/page_bundles/build.scss
app/assets/stylesheets/page_bundles/build.scss
+0
-4
No files found.
app/assets/javascripts/jobs/components/job_app.vue
View file @
3bb0ff23
...
...
@@ -201,7 +201,7 @@ export default {
</
script
>
<
template
>
<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"
>
<div
class=
"build-page"
data-testid=
"job-content"
>
...
...
@@ -272,17 +272,17 @@ export default {
<div
v-if=
"job.archived"
class=
"gl-mt-3 archived-job"
:class=
"
{ 'sticky-top border-bottom-0': hasTrace }"
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
gl-
border-bottom-0': hasTrace }"
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.
'
)
}}
</div>
<!-- job log -->
<div
v-if=
"hasTrace"
class=
"build-trace-container
position
-relative"
class=
"build-trace-container
gl
-relative"
:class=
"
{ 'gl-mt-3': !job.archived }"
>
<log-top-bar
...
...
app/assets/javascripts/jobs/components/job_container_item.vue
View file @
3bb0ff23
...
...
@@ -41,7 +41,7 @@ export default {
<
template
>
<div
class=
"build-job
position
-relative"
class=
"build-job
gl
-relative"
:class=
"
{
retried: job.retried,
active: isActive,
...
...
@@ -56,7 +56,7 @@ export default {
<gl-icon
v-if=
"isActive"
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"
/>
...
...
app/assets/javascripts/jobs/components/job_log_controllers.vue
View file @
3bb0ff23
...
...
@@ -69,7 +69,10 @@ export default {
<
template
>
<div
class=
"top-bar"
>
<!-- 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"
>
{{
jobLogSize
}}
<gl-link
...
...
@@ -83,7 +86,7 @@ export default {
</div>
<!-- eo truncate information -->
<div
class=
"controllers float-right"
>
<div
class=
"controllers
gl-
float-right"
>
<!-- links -->
<gl-button
v-if=
"rawPath"
...
...
app/assets/stylesheets/page_bundles/build.scss
View file @
3bb0ff23
...
...
@@ -11,10 +11,6 @@
color
:
var
(
--
orange-600
,
$orange-600
);
background-color
:
var
(
--
orange-50
,
$orange-50
);
border
:
1px
solid
var
(
--
border-color
,
$border-color
);
padding
:
3px
12px
;
margin
:
auto
;
align-items
:
center
;
z-index
:
1
;
.with-performance-bar
&
{
top
:
$header-height
+
$performance-bar-height
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment