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
Léo-Paul Géneau
gitlab-ce
Commits
7300440a
Commit
7300440a
authored
Aug 12, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve Commit#show page UI
parent
57b62c2b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
71 additions
and
55 deletions
+71
-55
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+26
-7
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+45
-48
No files found.
app/assets/stylesheets/sections/commits.scss
View file @
7300440a
...
...
@@ -440,17 +440,24 @@
margin-top
:
10px
;
}
.ui-box.commit-box
{
margin-top
:
0
;
.commit-committer-link
,
.commit-author-link
{
color
:
#333
;
.commit-box
{
margin
:
10px
0
;
border-top
:
1px
solid
#ddd
;
border-bottom
:
1px
solid
#ddd
;
padding
:
20px
0
;
.commit-title
{
margin
:
0
;
font-size
:
20px
;
font-weight
:
bold
;
text-shadow
:
0
1px
1px
#FFF
;
}
.commit-description
{
margin-top
:
15px
;
}
}
.commit-stat-summary
{
color
:
#666
;
line-height
:
2
;
...
...
@@ -477,3 +484,15 @@ li.commit {
.commit-breadcrumb
{
padding
:
0
;
}
.commit-info-row
{
margin-bottom
:
10px
;
.avatar
{
@extend
.avatar-inline
;
}
.commit-committer-link
,
.commit-author-link
{
color
:
#444
;
font-weight
:
bold
;
}
}
app/views/projects/commit/_commit_box.html.haml
View file @
7300440a
.ui-box.ui-box-show.commit-box
.ui-box-head
.pull-right
-
if
@notes_count
>
0
%span
.btn.disabled.grouped
%i
.icon-comment
=
@notes_count
.left.btn-group
%a
.btn.grouped.dropdown-toggle
{
data:
{
toggle: :dropdown
}
}
%i
.icon-download-alt
Download as
%span
.caret
%ul
.dropdown-menu
%li
=
link_to
"Email Patches"
,
project_commit_path
(
@project
,
@commit
,
format: :patch
)
%li
=
link_to
"Plain Diff"
,
project_commit_path
(
@project
,
@commit
,
format: :diff
)
=
link_to
project_tree_path
(
@project
,
@commit
),
class:
"btn btn-primary grouped"
do
%span
Browse Code »
%h3
.commit-title.page-title
=
gfm
escape_once
(
@commit
.
title
)
-
if
@commit
.
description
.
present?
%pre
.commit-description
=
gfm
escape_once
(
@commit
.
description
)
.ui-box-body
.row
.span5
.author
=
commit_author_link
(
@commit
,
avatar:
true
,
size:
32
)
authored
%time
{
title:
@commit
.
authored_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
#{
time_ago_in_words
(
@commit
.
authored_date
)
}
ago
-
if
@commit
.
different_committer?
.committer
→
=
commit_committer_link
(
@commit
)
committed
%time
{
title:
@commit
.
committed_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
#{
time_ago_in_words
(
@commit
.
committed_date
)
}
ago
.span6.pull-right
.pull-right
.sha-block
%span
.cgray
commit
%span
.label_commit
=
@commit
.
id
.clearfix
.pull-right
.sha-block
%span
.cgray
=
pluralize
(
@commit
.
parents
.
count
,
"parent"
)
-
@commit
.
parents
.
each
do
|
parent
|
=
link_to
parent
.
id
[
0
...
10
],
project_commit_path
(
@project
,
parent
)
.pull-right
%div
-
if
@notes_count
>
0
%span
.btn.disabled.grouped
%i
.icon-comment
=
@notes_count
.pull-left.btn-group
%a
.btn.grouped.dropdown-toggle
{
data:
{
toggle: :dropdown
}
}
%i
.icon-download-alt
Download as
%span
.caret
%ul
.dropdown-menu
%li
=
link_to
"Email Patches"
,
project_commit_path
(
@project
,
@commit
,
format: :patch
)
%li
=
link_to
"Plain Diff"
,
project_commit_path
(
@project
,
@commit
,
format: :diff
)
=
link_to
project_tree_path
(
@project
,
@commit
),
class:
"btn btn-primary grouped"
do
%span
Browse Code »
%div
%p
%span
.light
Commit
=
link_to
@commit
.
id
,
project_commit_path
(
@project
,
@commit
)
.commit-info-row
%span
.light
Authored by
%strong
=
commit_author_link
(
@commit
,
avatar:
true
,
size:
24
)
%time
{
title:
@commit
.
authored_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
#{
time_ago_in_words
(
@commit
.
authored_date
)
}
ago
-
if
@commit
.
different_committer?
.commit-info-row
%span
.light
Committed by
%strong
=
commit_committer_link
(
@commit
,
avatar:
true
,
size:
24
)
%time
{
title:
@commit
.
committed_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
#{
time_ago_in_words
(
@commit
.
committed_date
)
}
ago
.commit-info-row
%span
.cgray
=
pluralize
(
@commit
.
parents
.
count
,
"parent"
)
-
@commit
.
parents
.
each
do
|
parent
|
=
link_to
parent
.
id
[
0
...
10
],
project_commit_path
(
@project
,
parent
)
.commit-box
%h3
.commit-title
=
gfm
escape_once
(
@commit
.
title
)
-
if
@commit
.
description
.
present?
%pre
.commit-description
=
gfm
escape_once
(
@commit
.
description
)
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