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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
0e1c5ed3
Commit
0e1c5ed3
authored
Apr 16, 2018
by
Simon Knox
Committed by
Phil Hughes
Apr 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "skeleton placeholder on diff has white background"
parent
d182f6d1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
68 deletions
+34
-68
app/assets/javascripts/vue_shared/components/skeleton_loading_container.vue
...ipts/vue_shared/components/skeleton_loading_container.vue
+1
-1
app/assets/stylesheets/framework/animations.scss
app/assets/stylesheets/framework/animations.scss
+30
-50
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+0
-14
spec/javascripts/ide/components/repo_loading_file_spec.js
spec/javascripts/ide/components/repo_loading_file_spec.js
+1
-1
spec/javascripts/vue_shared/components/skeleton_loading_container_spec.js
.../vue_shared/components/skeleton_loading_container_spec.js
+2
-2
No files found.
app/assets/javascripts/vue_shared/components/skeleton_loading_container.vue
View file @
0e1c5ed3
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
lines
:
{
lines
:
{
type
:
Number
,
type
:
Number
,
required
:
false
,
required
:
false
,
default
:
6
,
default
:
3
,
},
},
},
},
computed
:
{
computed
:
{
...
...
app/assets/stylesheets/framework/animations.scss
View file @
0e1c5ed3
...
@@ -187,12 +187,9 @@ a {
...
@@ -187,12 +187,9 @@ a {
animation
:
fadeInFull
$fade-in-duration
1
;
animation
:
fadeInFull
$fade-in-duration
1
;
}
}
.animation-container
{
.animation-container
{
background
:
$repo-editor-grey
;
height
:
40px
;
height
:
40px
;
overflow
:
hidden
;
overflow
:
hidden
;
position
:
relative
;
&
.animation-container-small
{
&
.animation-container-small
{
height
:
12px
;
height
:
12px
;
...
@@ -205,60 +202,43 @@ a {
...
@@ -205,60 +202,43 @@ a {
}
}
}
}
&
:
:
before
{
[
class
^=
"skeleton-line-"
]
{
animation-duration
:
1s
;
animation-fill-mode
:
forwards
;
animation-iteration-count
:
infinite
;
animation-name
:
blockTextShine
;
animation-timing-function
:
linear
;
background-image
:
$repo-editor-linear-gradient
;
background-repeat
:
no-repeat
;
background-size
:
800px
45px
;
content
:
' '
;
display
:
block
;
height
:
100%
;
position
:
relative
;
position
:
relative
;
}
background-color
:
$theme-gray-100
;
div
{
background
:
$white-light
;
height
:
6px
;
left
:
0
;
position
:
absolute
;
right
:
0
;
}
.skeleton-line-1
{
left
:
0
;
top
:
8px
;
}
.skeleton-line-2
{
left
:
150px
;
top
:
0
;
height
:
10px
;
height
:
10px
;
}
overflow
:
hidden
;
.skeleton-line-3
{
&
:not
(
:last-of-type
)
{
left
:
0
;
margin-bottom
:
4px
;
top
:
23px
;
}
}
.skeleton-line-4
{
&
:
:
after
{
left
:
0
;
content
:
' '
;
top
:
38px
;
display
:
block
;
animation
:
blockTextShine
1s
linear
infinite
forwards
;
background-repeat
:
no-repeat
;
background-size
:
cover
;
background-image
:
linear-gradient
(
to
right
,
$theme-gray-100
0%
,
$theme-gray-50
20%
,
$theme-gray-100
40%
,
$theme-gray-100
100%
);
height
:
10px
;
}
}
}
}
.skeleton-line-5
{
$skeleton-line-widths
:
(
left
:
200px
;
156px
,
top
:
28px
;
235px
,
height
:
10px
;
200px
,
}
);
.skeleton-line-6
{
@for
$count
from
1
through
length
(
$skeleton-line-widths
)
{
top
:
14px
;
.skeleton-line-
#{
$count
}
{
left
:
230px
;
width
:
nth
(
$skeleton-line-widths
,
$count
);
height
:
10px
;
}
}
}
}
...
...
app/assets/stylesheets/framework/variables.scss
View file @
0e1c5ed3
...
@@ -713,20 +713,6 @@ $color-high-score: $green-400;
...
@@ -713,20 +713,6 @@ $color-high-score: $green-400;
$color-average-score
:
$orange-400
;
$color-average-score
:
$orange-400
;
$color-low-score
:
$red-400
;
$color-low-score
:
$red-400
;
/*
Repo editor
*/
$repo-editor-grey
:
#f6f7f9
;
$repo-editor-grey-darker
:
#e9ebee
;
$repo-editor-linear-gradient
:
linear-gradient
(
to
right
,
$repo-editor-grey
0%
,
$repo-editor-grey-darker
,
20%
,
$repo-editor-grey
40%
,
$repo-editor-grey
100%
);
/*
/*
Performance Bar
Performance Bar
*/
*/
...
...
spec/javascripts/ide/components/repo_loading_file_spec.js
View file @
0e1c5ed3
...
@@ -27,7 +27,7 @@ describe('RepoLoadingFile', () => {
...
@@ -27,7 +27,7 @@ describe('RepoLoadingFile', () => {
const
lines
=
[...
container
.
querySelectorAll
(
'
:scope > div
'
)];
const
lines
=
[...
container
.
querySelectorAll
(
'
:scope > div
'
)];
expect
(
container
).
toBeTruthy
();
expect
(
container
).
toBeTruthy
();
expect
(
lines
.
length
).
toEqual
(
6
);
expect
(
lines
.
length
).
toEqual
(
3
);
assertLines
(
lines
);
assertLines
(
lines
);
});
});
}
}
...
...
spec/javascripts/vue_shared/components/skeleton_loading_container_spec.js
View file @
0e1c5ed3
...
@@ -14,8 +14,8 @@ describe('Skeleton loading container', () => {
...
@@ -14,8 +14,8 @@ describe('Skeleton loading container', () => {
vm
.
$destroy
();
vm
.
$destroy
();
});
});
it
(
'
renders
6
skeleton lines by default
'
,
()
=>
{
it
(
'
renders
3
skeleton lines by default
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.skeleton-line-
6
'
)).
not
.
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.skeleton-line-
3
'
)).
not
.
toBeNull
();
});
});
it
(
'
renders in full mode by default
'
,
()
=>
{
it
(
'
renders in full mode by default
'
,
()
=>
{
...
...
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