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
d93dcdb0
Commit
d93dcdb0
authored
Aug 03, 2018
by
Dennis Tang
Committed by
Annabel Gray
Aug 03, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
port 49776-pipeline-job-log-page-uses-too-much-cpu-for-loading-animation to EE
parent
474186b6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
42 additions
and
22 deletions
+42
-22
app/assets/javascripts/ide/components/jobs/detail.vue
app/assets/javascripts/ide/components/jobs/detail.vue
+3
-0
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+29
-11
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+6
-10
app/views/shared/builds/_build_output.html.haml
app/views/shared/builds/_build_output.html.haml
+3
-0
ee/app/assets/stylesheets/pages/builds.scss
ee/app/assets/stylesheets/pages/builds.scss
+1
-1
No files found.
app/assets/javascripts/ide/components/jobs/detail.vue
View file @
d93dcdb0
...
...
@@ -131,6 +131,9 @@ export default {
v-show=
"detailJob.isLoading"
class=
"build-loader-animation"
>
<div
class=
"dot"
></div>
<div
class=
"dot"
></div>
<div
class=
"dot"
></div>
</div>
</pre>
</div>
...
...
app/assets/stylesheets/framework/mixins.scss
View file @
d93dcdb0
...
...
@@ -22,7 +22,7 @@
border
:
0
;
border-color
:
$md-area-border
;
@supports
(
width
:
fit-content
)
{
@supports
(
width
:
fit-content
)
{
display
:
block
;
width
:
fit-content
;
}
...
...
@@ -116,7 +116,7 @@
/* http://phrappe.com/css/conditional-css-for-webkit-based-browsers/ */
@mixin
on-webkit-only
{
@media
screen
and
(
-
webkit-min-device-pixel-ratio
:
0
)
{
@media
screen
and
(
-
webkit-min-device-pixel-ratio
:
0
)
{
@content
;
}
}
...
...
@@ -164,14 +164,18 @@
bottom
:
12px
;
width
:
43px
;
height
:
30px
;
transition-duration
:
.3s
;
transition-duration
:
0
.3s
;
-webkit-transform
:
translateZ
(
0
);
background
:
linear-gradient
(
to
$gradient-direction
,
$gradient-color
45%
,
rgba
(
$gradient-color
,
0
.4
));
background
:
linear-gradient
(
to
$gradient-direction
,
$gradient-color
45%
,
rgba
(
$gradient-color
,
0
.4
)
);
&
.scrolling
{
visibility
:
visible
;
opacity
:
1
;
transition-duration
:
.3s
;
transition-duration
:
0
.3s
;
}
.fa
{
...
...
@@ -323,13 +327,27 @@
}
}
@mixin
build-loader-animation
()
{
@mixin
build-loader-animation
{
position
:
relative
;
width
:
6px
;
height
:
6px
;
margin
:
auto
auto
12px
2px
;
border-radius
:
50%
;
animation
:
blinking-dots
1s
linear
infinite
;
white-space
:
initial
;
.dot
{
display
:
inline-block
;
width
:
6px
;
height
:
6px
;
margin
:
auto
auto
12px
;
border-radius
:
50%
;
animation
:
blinking-dot
1s
linear
infinite
;
background
:
$white-light
;
&
:nth-child
(
2
)
{
animation-delay
:
0
.33s
;
}
&
:nth-child
(
3
)
{
animation-delay
:
0
.66s
;
}
}
}
@mixin
borderless-status-icon
(
$color
)
{
...
...
app/assets/stylesheets/pages/builds.scss
View file @
d93dcdb0
...
...
@@ -9,25 +9,21 @@
}
}
@keyframes
blinking-dot
s
{
@keyframes
blinking-dot
{
0
%
{
background-color
:
rgba
(
$white-light
,
1
);
box-shadow
:
12px
0
0
0
rgba
(
$white-light
,
0
.2
)
,
24px
0
0
0
rgba
(
$white-light
,
0
.2
);
opacity
:
1
;
}
25
%
{
background-color
:
rgba
(
$white-light
,
0
.4
);
box-shadow
:
12px
0
0
0
rgba
(
$white-light
,
2
)
,
24px
0
0
0
rgba
(
$white-light
,
0
.2
);
opacity
:
0
.4
;
}
75
%
{
background-color
:
rgba
(
$white-light
,
0
.4
);
box-shadow
:
12px
0
0
0
rgba
(
$white-light
,
0
.2
)
,
24px
0
0
0
rgba
(
$white-light
,
1
);
opacity
:
0
.4
;
}
100
%
{
background-color
:
rgba
(
$white-light
,
1
);
box-shadow
:
12px
0
0
0
rgba
(
$white-light
,
0
.2
)
,
24px
0
0
0
rgba
(
$white-light
,
0
.2
);
opacity
:
1
;
}
}
...
...
@@ -116,7 +112,7 @@
}
.build-loader-animation
{
@include
build-loader-animation
()
;
@include
build-loader-animation
;
}
}
...
...
app/views/shared/builds/_build_output.html.haml
View file @
d93dcdb0
%pre
.build-trace
#build-trace
%code
.bash.js-build-output
.build-loader-animation.js-build-refresh
.dot
.dot
.dot
ee/app/assets/stylesheets/pages/builds.scss
View file @
d93dcdb0
...
...
@@ -63,6 +63,6 @@
}
.build-loader-animation
{
@include
build-loader-animation
()
;
@include
build-loader-animation
;
}
}
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