Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0e1c5ed3
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
0e1c5ed3
编写于
4月 16, 2018
作者:
S
Simon Knox
提交者:
Phil Hughes
4月 16, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resolve "skeleton placeholder on diff has white background"
上级
d182f6d1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
34 addition
and
68 deletion
+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
未找到文件。
app/assets/javascripts/vue_shared/components/skeleton_loading_container.vue
浏览文件 @
0e1c5ed3
...
...
@@ -9,7 +9,7 @@
lines
:
{
type
:
Number
,
required
:
false
,
default
:
6
,
default
:
3
,
},
},
computed
:
{
...
...
app/assets/stylesheets/framework/animations.scss
浏览文件 @
0e1c5ed3
...
...
@@ -187,12 +187,9 @@ a {
animation
:
fadeInFull
$fade-in-duration
1
;
}
.animation-container
{
background
:
$repo-editor-grey
;
height
:
40px
;
overflow
:
hidden
;
position
:
relative
;
&
.animation-container-small
{
height
:
12px
;
...
...
@@ -205,60 +202,43 @@ a {
}
}
&
::before
{
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%
;
[
class
^=
"skeleton-line-"
]
{
position
:
relative
;
}
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
;
background-color
:
$theme-gray-100
;
height
:
10px
;
}
overflow
:
hidden
;
.skeleton-line-3
{
left
:
0
;
top
:
23px
;
}
&
:not
(
:last-of-type
)
{
margin-bottom
:
4px
;
}
.skeleton-line-4
{
left
:
0
;
top
:
38px
;
&
::after
{
content
:
' '
;
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
{
left
:
200px
;
top
:
28px
;
height
:
10px
;
}
$skeleton-line-widths
:
(
156px
,
235px
,
200px
,
);
.skeleton-line-6
{
top
:
14px
;
left
:
230px
;
height
:
10px
;
@for
$count
from
1
through
length
(
$skeleton-line-widths
)
{
.skeleton-line-
#{
$count
}
{
width
:
nth
(
$skeleton-line-widths
,
$count
);
}
}
...
...
app/assets/stylesheets/framework/variables.scss
浏览文件 @
0e1c5ed3
...
...
@@ -713,20 +713,6 @@ $color-high-score: $green-400;
$color-average-score
:
$orange-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
*/
...
...
spec/javascripts/ide/components/repo_loading_file_spec.js
浏览文件 @
0e1c5ed3
...
...
@@ -27,7 +27,7 @@ describe('RepoLoadingFile', () => {
const
lines
=
[...
container
.
querySelectorAll
(
'
:scope > div
'
)];
expect
(
container
).
toBeTruthy
();
expect
(
lines
.
length
).
toEqual
(
6
);
expect
(
lines
.
length
).
toEqual
(
3
);
assertLines
(
lines
);
});
}
...
...
spec/javascripts/vue_shared/components/skeleton_loading_container_spec.js
浏览文件 @
0e1c5ed3
...
...
@@ -14,8 +14,8 @@ describe('Skeleton loading container', () => {
vm
.
$destroy
();
});
it
(
'
renders
6
skeleton lines by default
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.skeleton-line-
6
'
)).
not
.
toBeNull
();
it
(
'
renders
3
skeleton lines by default
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.skeleton-line-
3
'
)).
not
.
toBeNull
();
});
it
(
'
renders in full mode by default
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录