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
Boxiang Sun
gitlab-ce
Commits
a30ce866
Commit
a30ce866
authored
Sep 10, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve commits list UI
parent
fa17712c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
58 additions
and
75 deletions
+58
-75
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+46
-62
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+11
-13
app/views/projects/commits/_commits.html.haml
app/views/projects/commits/_commits.html.haml
+1
-0
No files found.
app/assets/stylesheets/sections/commits.scss
View file @
a30ce866
...
@@ -345,46 +345,6 @@
...
@@ -345,46 +345,6 @@
}
}
/**
* COMMIT ROW
*/
.commit
{
.browse_code_link_holder
{
float
:
right
;
}
.committed_ago
{
float
:
right
;
@extend
.cgray
;
}
.notes_count
{
float
:
right
;
margin-right
:
10px
;
}
code
{
background
:
#FCEEC1
;
color
:
$style_color
;
}
.commit_short_id
{
float
:
left
;
@extend
.lined
;
min-width
:
65px
;
font-family
:
$monospace_font
;
}
.row_title
{
font-weight
:
bold
;
color
:
#444
;
&
:hover
{
color
:
#444
;
text-decoration
:
underline
;
}
}
}
.file-stats
a
{
.file-stats
a
{
color
:
$style_color
;
color
:
$style_color
;
}
}
...
@@ -472,24 +432,6 @@
...
@@ -472,24 +432,6 @@
line-height
:
2
;
line-height
:
2
;
}
}
li
.commit
{
.avatar
{
width
:
24px
;
top
:
-5px
;
margin-right
:
5px
;
margin-left
:
10px
;
}
code
{
padding
:
2px
2px
0
;
margin-top
:
-2px
;
&
:hover
{
color
:
black
;
border
:
1px
solid
#ccc
;
}
}
}
.commit-breadcrumb
{
.commit-breadcrumb
{
padding
:
0
;
padding
:
0
;
}
}
...
@@ -506,8 +448,50 @@ li.commit {
...
@@ -506,8 +448,50 @@ li.commit {
}
}
}
}
.commits-row
{
.lists-separator
{
padding-bottom
:
10px
;
margin
:
10px
0
;
margin-bottom
:
10px
;
border-top
:
1px
dashed
#CCC
;
border-bottom
:
1px
solid
#DDD
;
}
/**
* COMMIT ROW
*/
li
.commit
{
padding
:
8px
;
.commit-row-title
{
font-size
:
14px
;
margin-bottom
:
2px
;
.notes_count
{
float
:
right
;
margin-right
:
10px
;
}
.commit_short_id
{
float
:
left
;
min-width
:
65px
;
font-family
:
$monospace_font
;
}
.commit-row-message
{
color
:
#555
;
font-weight
:
bolder
;
&
:hover
{
color
:
#444
;
text-decoration
:
underline
;
}
}
}
.commit-row-info
{
a
{
color
:
#777
;
}
.committed_ago
{
float
:
right
;
@extend
.cgray
;
}
}
}
}
app/views/projects/commits/_commit.html.haml
View file @
a30ce866
%li
.commit
%li
.commit
.browse_code_link_holder
.commit-row-title
%p
%strong
=
link_to
"Browse Code »"
,
project_tree_path
(
project
,
commit
),
class:
"right"
%p
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
project
,
commit
),
class:
"commit_short_id"
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
project
,
commit
),
class:
"commit_short_id"
=
commit_author_link
(
commit
,
avatar:
true
,
size:
24
)
=
link_to_gfm
truncate
(
commit
.
title
,
length:
70
),
project_commit_path
(
project
,
commit
.
id
),
class:
"row_title"
=
link_to_gfm
truncate
(
commit
.
title
,
length:
70
),
project_commit_path
(
project
,
commit
.
id
),
class:
"commit-row-message"
=
link_to
"Browse Code »"
,
project_tree_path
(
project
,
commit
),
class:
"pull-right"
%time
.committed_ago
{
datetime:
commit
.
committed_date
,
title:
commit
.
committed_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)
}
.notes_count
=
time_ago_in_words
(
commit
.
committed_date
)
ago
%span
.notes_count
-
notes
=
project
.
notes
.
for_commit_id
(
commit
.
id
)
-
notes
=
project
.
notes
.
for_commit_id
(
commit
.
id
)
-
if
notes
.
any?
-
if
notes
.
any?
%span
.badge.badge-info
%span
.badge.badge-info
%i
.icon-comment
%i
.icon-comment
=
notes
.
count
=
notes
.
count
.commit-row-info
=
commit_author_link
(
commit
,
avatar:
true
,
size:
16
)
%time
.committed_ago
{
datetime:
commit
.
committed_date
,
title:
commit
.
committed_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)
}
=
time_ago_in_words
(
commit
.
committed_date
)
ago
app/views/projects/commits/_commits.html.haml
View file @
a30ce866
...
@@ -8,3 +8,4 @@
...
@@ -8,3 +8,4 @@
.span10
.span10
%ul
.well-list
%ul
.well-list
=
render
commits
,
project:
@project
=
render
commits
,
project:
@project
%hr
.lists-separator
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