Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a7aee9d1
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,发现更多精彩内容 >>
提交
a7aee9d1
编写于
12月 19, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Pretty compare mode
上级
40c6d871
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
18 deletion
+26
-18
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+8
-3
app/views/compare/_form.html.haml
app/views/compare/_form.html.haml
+18
-15
未找到文件。
app/assets/stylesheets/sections/commits.scss
浏览文件 @
a7aee9d1
...
@@ -303,9 +303,14 @@
...
@@ -303,9 +303,14 @@
.commits-compare-switch
{
.commits-compare-switch
{
background
:
url(
'switch_icon.png')
;
background
:
url(
"switch_icon.png")
no-repeat
center
center
;
width
:
16px
;
width
:
16px
;
height
:
18px
;
height
:
18px
;
text-indent
:
-9999px
;
text-indent
:
-9999px
;
display
:
inline-block
;
float
:
left
;
}
margin-right
:
9px
;
\ No newline at end of file
border
:
1px
solid
#DDD
;
@include
border-radius
(
4px
);
padding
:
4px
;
background-color
:
#EEE
;
}
app/views/compare/_form.html.haml
浏览文件 @
a7aee9d1
%div
%div
%p
.slead
-
unless
params
[
:to
]
Fill input field with commit id like
%p
.slead
%code
.label_branch
4eedf23
Fill input field with commit id like
or branch/tag name like
%code
.label_branch
4eedf23
%code
.label_branch
master
or branch/tag name like
and press compare button for commits list, code diff.
%code
.label_branch
master
and press compare button for commits list, code diff.
%br
%br
=
form_tag
project_compare_index_path
(
@project
),
method: :post
do
=
form_tag
project_compare_index_path
(
@project
),
method: :post
do
.clearfix
.clearfix
=
text_field_tag
:from
,
params
[
:from
],
placeholder:
"master"
,
class:
"xlarge"
.pull-left
=
"..."
-
if
params
[
:to
]
&&
params
[
:from
]
=
text_field_tag
:to
,
params
[
:to
],
placeholder:
"aa8b4ef"
,
class:
"xlarge"
=
link_to
'switch'
,
{
from:
params
[
:to
],
to:
params
[
:from
]},
{
class:
'commits-compare-switch has_tooltip'
,
title:
'Switch base of comparison'
}
-
if
params
[
:to
]
&&
params
[
:from
]
=
text_field_tag
:from
,
params
[
:from
],
placeholder:
"master"
,
class:
"xlarge"
=
link_to
'switch'
,
{
from:
params
[
:to
],
to:
params
[
:from
]},
{
class:
'commits-compare-switch has_tooltip'
,
title:
'Switch base of comparison'
}
=
"..."
=
text_field_tag
:to
,
params
[
:to
],
placeholder:
"aa8b4ef"
,
class:
"xlarge"
.pull-left
=
submit_tag
"Compare"
,
class:
"btn primary wide commits-compare-btn"
-
if
@refs_are_same
-
if
@refs_are_same
.alert
.alert
%span
Refs are the same
%span
Refs are the same
.actions
=
submit_tag
"Compare"
,
class:
"btn primary wide commits-compare-btn"
:javascript
:javascript
$
(
function
()
{
$
(
function
()
{
var
availableTags
=
#{
@project
.
ref_names
.
to_json
}
;
var
availableTags
=
#{
@project
.
ref_names
.
to_json
}
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录