Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cf01719d
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 搜索 >>
提交
cf01719d
编写于
6月 14, 2018
作者:
A
Annabel Gray
提交者:
Clement Ho
6月 14, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resolve ""Click to expand" link in collapsed diffs should be blue"
上级
941cf7c3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
4 addition
and
4 deletion
+4
-4
app/assets/javascripts/single_file_diff.js
app/assets/javascripts/single_file_diff.js
+1
-1
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+1
-0
app/views/projects/diffs/_collapsed.html.haml
app/views/projects/diffs/_collapsed.html.haml
+1
-1
spec/features/projects/diffs/diff_show_spec.rb
spec/features/projects/diffs/diff_show_spec.rb
+1
-2
未找到文件。
app/assets/javascripts/single_file_diff.js
浏览文件 @
cf01719d
...
...
@@ -11,7 +11,7 @@ import syntaxHighlight from './syntax_highlight';
const
WRAPPER
=
'
<div class="diff-content"></div>
'
;
const
LOADING_HTML
=
'
<i class="fa fa-spinner fa-spin"></i>
'
;
const
ERROR_HTML
=
'
<div class="nothing-here-block"><i class="fa fa-warning"></i> Could not load diff</div>
'
;
const
COLLAPSED_HTML
=
'
<div class="nothing-here-block diff-collapsed">This diff is collapsed. <
a class="click-to-expand">Click to expand it.</a
></div>
'
;
const
COLLAPSED_HTML
=
'
<div class="nothing-here-block diff-collapsed">This diff is collapsed. <
button class="click-to-expand btn btn-link">Click to expand it.</button
></div>
'
;
export
default
class
SingleFileDiff
{
constructor
(
file
)
{
...
...
app/assets/stylesheets/framework/blocks.scss
浏览文件 @
cf01719d
...
...
@@ -16,6 +16,7 @@
.click-to-expand
{
cursor
:
pointer
;
vertical-align
:
initial
;
}
}
}
...
...
app/views/projects/diffs/_collapsed.html.haml
浏览文件 @
cf01719d
...
...
@@ -2,4 +2,4 @@
-
url
=
url_for
(
safe_params
.
merge
(
action: :diff_for_path
,
old_path:
diff_file
.
old_path
,
new_path:
diff_file
.
new_path
,
file_identifier:
diff_file
.
file_identifier
))
.nothing-here-block.diff-collapsed
{
data:
{
diff_for_path:
url
}
}
This diff is collapsed.
%
a
.click-to-expand
Click to expand it.
%
button
.click-to-expand.btn.btn-link
Click to expand it.
spec/features/projects/diffs/diff_show_spec.rb
浏览文件 @
cf01719d
...
...
@@ -166,8 +166,7 @@ feature 'Diff file viewer', :js do
context
'expanding the diff'
do
before
do
# We can't use `click_link` because the "link" doesn't have an `href`.
find
(
'a.click-to-expand'
).
click
click_button
'Click to expand it.'
wait_for_requests
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录