Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b3e2fe69
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,发现更多精彩内容 >>
提交
b3e2fe69
编写于
12月 08, 2016
作者:
A
Annabel Dunstone Gray
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Start commits refactor
上级
714f70a3
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
161 addition
and
173 deletion
+161
-173
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+0
-6
app/assets/stylesheets/pages/commit.scss
app/assets/stylesheets/pages/commit.scss
+0
-132
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+135
-10
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+25
-24
app/views/projects/commits/_commits.html.haml
app/views/projects/commits/_commits.html.haml
+1
-1
未找到文件。
app/assets/stylesheets/framework/lists.scss
浏览文件 @
b3e2fe69
...
...
@@ -236,12 +236,6 @@ ul.content-list {
.panel
>
.content-list
>
li
{
padding
:
$gl-padding-top
$gl-padding
;
&
.commit
{
@media
(
min-width
:
$screen-sm-min
)
{
padding-left
:
46px
+
$gl-padding
;
}
}
}
ul
.controls
{
...
...
app/assets/stylesheets/pages/commit.scss
已删除
100644 → 0
浏览文件 @
714f70a3
.commit-title
{
display
:
block
;
}
.commit-author
,
.commit-committer
{
display
:
block
;
color
:
$commit-committer-color
;
font-weight
:
normal
;
font-style
:
italic
;
}
.commit-author
strong
,
.commit-committer
strong
{
font-weight
:
bold
;
font-style
:
normal
;
}
.commit-description
{
background
:
none
;
border
:
none
;
margin
:
0
;
padding
:
0
;
margin-top
:
10px
;
word-break
:
normal
;
white-space
:
pre-wrap
;
}
.js-details-expand
{
&
:hover
{
text-decoration
:
none
;
}
}
.ci-status-link
{
svg
{
overflow
:
visible
;
}
}
.commit-box
{
border-top
:
1px
solid
$border-color
;
padding
:
$gl-padding
0
;
.commit-title
{
margin
:
0
;
font-size
:
23px
;
color
:
$gl-gray-dark
;
}
.commit-description
{
margin-top
:
15px
;
}
}
.commit-hash-full
{
@media
(
max-width
:
$screen-sm-max
)
{
width
:
80px
;
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
display
:
inline-block
;
vertical-align
:
bottom
;
}
}
.file-stats
{
ul
{
list-style
:
none
;
margin
:
0
;
padding
:
10px
0
;
li
{
padding
:
3px
0
;
line-height
:
20px
;
}
}
.new-file
{
a
{
color
:
$gl-text-green
;
}
}
.renamed-file
{
a
{
color
:
$gl-text-orange
;
}
}
.deleted-file
{
a
{
color
:
$gl-text-red
;
}
}
.edit-file
{
a
{
color
:
$gl-text-color
;
}
}
}
/*
* Commit message textarea for web editor and
* custom merge request message
*/
.commit-message-container
{
background-color
:
$body-bg
;
position
:
relative
;
font-family
:
$monospace_font
;
$left
:
12px
;
overflow
:
hidden
;
// See https://gitlab.com/gitlab-org/gitlab-ce/issues/13987
.max-width-marker
{
width
:
72ch
;
color
:
$commit-max-width-marker-color
;
font-family
:
inherit
;
left
:
$left
;
height
:
100%
;
border-right
:
1px
solid
mix
(
$input-border
,
$white-light
);
position
:
absolute
;
z-index
:
1
;
}
>
textarea
{
background-color
:
$commit-message-text-area-bg
;
font-family
:
inherit
;
padding-left
:
$left
;
position
:
relative
;
z-index
:
2
;
}
}
app/assets/stylesheets/pages/commits.scss
浏览文件 @
b3e2fe69
.commit-title
{
display
:
block
;
}
.commit-author
,
.commit-committer
{
display
:
block
;
color
:
$commit-committer-color
;
font-weight
:
normal
;
font-style
:
italic
;
}
.commit-author
strong
,
.commit-committer
strong
{
font-weight
:
bold
;
font-style
:
normal
;
}
.commit-description
{
background
:
none
;
border
:
none
;
margin
:
0
;
padding
:
0
;
margin-top
:
10px
;
word-break
:
normal
;
white-space
:
pre-wrap
;
}
.js-details-expand
{
&
:hover
{
text-decoration
:
none
;
}
}
.ci-status-link
{
svg
{
overflow
:
visible
;
}
}
.commit-box
{
border-top
:
1px
solid
$border-color
;
padding
:
$gl-padding
0
;
.commit-title
{
margin
:
0
;
font-size
:
23px
;
color
:
$gl-gray-dark
;
}
.commit-description
{
margin-top
:
15px
;
}
}
.commit-hash-full
{
@media
(
max-width
:
$screen-sm-max
)
{
width
:
80px
;
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
display
:
inline-block
;
vertical-align
:
bottom
;
}
}
.file-stats
{
ul
{
list-style
:
none
;
margin
:
0
;
padding
:
10px
0
;
li
{
padding
:
3px
0
;
line-height
:
20px
;
}
}
.new-file
{
a
{
color
:
$gl-text-green
;
}
}
.renamed-file
{
a
{
color
:
$gl-text-orange
;
}
}
.deleted-file
{
a
{
color
:
$gl-text-red
;
}
}
.edit-file
{
a
{
color
:
$gl-text-color
;
}
}
}
/*
* Commit message textarea for web editor and
* custom merge request message
*/
.commit-message-container
{
background-color
:
$body-bg
;
position
:
relative
;
font-family
:
$monospace_font
;
$left
:
12px
;
overflow
:
hidden
;
// See https://gitlab.com/gitlab-org/gitlab-ce/issues/13987
.max-width-marker
{
width
:
72ch
;
color
:
$commit-max-width-marker-color
;
font-family
:
inherit
;
left
:
$left
;
height
:
100%
;
border-right
:
1px
solid
mix
(
$input-border
,
$white-light
);
position
:
absolute
;
z-index
:
1
;
}
>
textarea
{
background-color
:
$commit-message-text-area-bg
;
font-family
:
inherit
;
padding-left
:
$left
;
position
:
relative
;
z-index
:
2
;
}
}
.commits-compare-switch
{
@include
btn-default
;
@include
btn-white
;
...
...
@@ -18,7 +152,6 @@
}
.commit-row-title
{
line-height
:
1
.35
;
.notes_count
{
float
:
right
;
...
...
@@ -93,21 +226,13 @@
padding-left
:
46px
;
}
&
:not
(
:last-child
)
{
border-bottom
:
1px
solid
$gray-darker
;
}
a
,
button
{
color
:
$gl-dark-link-color
;
vertical-align
:
baseline
;
}
.avatar
{
margin-left
:
-46px
;
}
.item-title
{
.commit-content
{
display
:
inline-block
;
@media
(
min-width
:
$screen-sm-min
)
{
...
...
app/views/projects/commits/_commit.html.haml
浏览文件 @
b3e2fe69
...
...
@@ -10,32 +10,33 @@
=
cache
(
cache_key
,
expires_in:
1
.
day
)
do
%li
.commit.js-toggle-container
{
id:
"commit-#{commit.short_id}"
}
=
author_avatar
(
commit
,
size:
36
)
.commit-info-block
.commit-row-title
%span
.item-title
=
link_to_gfm
commit
.
title
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
.
id
),
class:
"commit-row-message"
%span
.commit-row-message.visible-xs-inline
·
=
commit
.
short_id
-
if
commit
.
status
(
ref
)
.visible-xs-inline
=
render_commit_status
(
commit
,
ref:
ref
)
-
if
commit
.
description?
%a
.text-expander.hidden-xs.js-toggle-button
...
.commit-row-title
.image-container
=
author_avatar
(
commit
,
size:
36
)
.commit-actions.hidden-xs
-
if
commit
.
status
(
ref
)
.commit-content
=
link_to_gfm
commit
.
title
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
.
id
),
class:
"commit-row-message item-title"
%span
.commit-row-message.visible-xs-inline
·
=
commit
.
short_id
-
if
commit
.
status
(
ref
)
.visible-xs-inline
=
render_commit_status
(
commit
,
ref:
ref
)
=
clipboard_button
(
clipboard_text:
commit
.
id
)
=
link_to
commit
.
short_id
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
),
class:
"commit-short-id btn btn-transparent"
=
link_to_browse_code
(
project
,
commit
)
-
if
commit
.
description?
%a
.text-expander.hidden-xs.js-toggle-button
...
-
if
commit
.
description?
%pre
.commit-row-description.js-toggle-content
=
preserve
(
markdown
(
commit
.
description
,
pipeline: :single_line
,
author:
commit
.
author
))
-
if
commit
.
description?
%pre
.commit-row-description.js-toggle-content
=
preserve
(
markdown
(
commit
.
description
,
pipeline: :single_line
,
author:
commit
.
author
))
.commiter
=
commit_author_link
(
commit
,
avatar:
false
,
size:
24
)
committed
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
=
commit_author_link
(
commit
,
avatar:
false
,
size:
24
)
committed
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
.commit-actions.hidden-xs
-
if
commit
.
status
(
ref
)
=
render_commit_status
(
commit
,
ref:
ref
)
=
clipboard_button
(
clipboard_text:
commit
.
id
)
=
link_to
commit
.
short_id
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
),
class:
"commit-short-id btn btn-transparent"
=
link_to_browse_code
(
project
,
commit
)
app/views/projects/commits/_commits.html.haml
浏览文件 @
b3e2fe69
...
...
@@ -4,7 +4,7 @@
-
commits
.
chunk
{
|
c
|
c
.
committed_date
.
in_time_zone
.
to_date
}.
each
do
|
day
,
commits
|
%li
.commit-header
=
"
#{
day
.
strftime
(
'%d %b, %Y'
)
}
#{
pluralize
(
commits
.
count
,
'commit'
)
}
"
%li
.commits-row
%ul
.
list-unstyled
.commit-list
%ul
.
content-list
.commit-list
=
render
commits
,
project:
project
,
ref:
ref
-
if
hidden
>
0
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录