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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
94d364e8
Commit
94d364e8
authored
Sep 10, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI fixes for commits lists
parent
a30ce866
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
28 deletions
+30
-28
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+11
-1
app/assets/stylesheets/sections/events.scss
app/assets/stylesheets/sections/events.scss
+4
-13
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+0
-7
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+3
-2
app/views/events/_commit.html.haml
app/views/events/_commit.html.haml
+3
-5
app/views/projects/commits/_inline_commit.html.haml
app/views/projects/commits/_inline_commit.html.haml
+9
-0
No files found.
app/assets/stylesheets/sections/commits.scss
View file @
94d364e8
...
@@ -469,7 +469,6 @@ li.commit {
...
@@ -469,7 +469,6 @@ li.commit {
}
}
.commit_short_id
{
.commit_short_id
{
float
:
left
;
min-width
:
65px
;
min-width
:
65px
;
font-family
:
$monospace_font
;
font-family
:
$monospace_font
;
}
}
...
@@ -494,4 +493,15 @@ li.commit {
...
@@ -494,4 +493,15 @@ li.commit {
@extend
.cgray
;
@extend
.cgray
;
}
}
}
}
&
.inline-commit
{
.commit-row-title
{
font-size
:
13px
;
}
.committed_ago
{
float
:
right
;
@extend
.cgray
;
}
}
}
}
app/assets/stylesheets/sections/events.scss
View file @
94d364e8
...
@@ -56,10 +56,6 @@
...
@@ -56,10 +56,6 @@
margin-left
:
35px
;
margin-left
:
35px
;
margin-right
:
100px
;
margin-right
:
100px
;
.commit
p
{
color
:
#666
;
padding-top
:
5px
;
}
.event-info
{
.event-info
{
color
:
#666
;
color
:
#666
;
}
}
...
@@ -107,13 +103,6 @@
...
@@ -107,13 +103,6 @@
}
}
}
}
ul
{
.avatar
{
width
:
18px
;
margin
:
2px
4px
;
}
}
&
:last-child
{
border
:none
}
&
:last-child
{
border
:none
}
.event_commits
{
.event_commits
{
...
@@ -124,12 +113,14 @@
...
@@ -124,12 +113,14 @@
background
:
transparent
;
background
:
transparent
;
padding
:
3px
;
padding
:
3px
;
border
:
none
;
border
:
none
;
font-size
:
12px
;
color
:
#666
;
.commit-row-title
{
font-size
:
12px
;
}
}
}
&
.commits-stat
{
&
.commits-stat
{
display
:
block
;
display
:
block
;
padding
:
3px
;
padding
:
3px
;
margin-top
:
3px
;
&
:hover
{
&
:hover
{
background
:
none
;
background
:
none
;
...
...
app/assets/stylesheets/sections/merge_requests.scss
View file @
94d364e8
...
@@ -64,13 +64,6 @@
...
@@ -64,13 +64,6 @@
margin
:
0
;
margin
:
0
;
padding
:
0
;
padding
:
0
;
padding
:
5px
0
;
padding
:
5px
0
;
.avatar
{
position
:relative
}
.commit-author-name
,
.dash
,
.committed_ago
,
.browse_code_link_holder
{
display
:
none
;
}
list-style
:
none
;
list-style
:
none
;
&
:hover
{
&
:hover
{
background
:
none
;
background
:
none
;
...
...
app/helpers/commits_helper.rb
View file @
94d364e8
...
@@ -56,8 +56,9 @@ module CommitsHelper
...
@@ -56,8 +56,9 @@ module CommitsHelper
end
end
end
end
def
commit_to_html
commit
,
project
def
commit_to_html
(
commit
,
project
,
inline
=
true
)
escape_javascript
(
render
'projects/commits/commit'
,
commit:
commit
,
project:
project
)
unless
commit
.
nil?
template
=
inline
?
"inline_commit"
:
"commit"
escape_javascript
(
render
"projects/commits/
#{
template
}
"
,
commit:
commit
,
project:
project
)
unless
commit
.
nil?
end
end
def
diff_line_content
(
line
)
def
diff_line_content
(
line
)
...
...
app/views/events/_commit.html.haml
View file @
94d364e8
%li
.commit
%li
.commit
%p
.commit-row-title
=
link_to
commit
[
:id
][
0
..
8
],
project_commit_path
(
project
,
commit
[
:id
]),
class:
"commit_short_id"
,
alt:
''
=
link_to
commit
[
:id
][
0
..
8
],
project_commit_path
(
project
,
commit
[
:id
]),
class:
"commit_short_id"
,
alt:
''
%span
=
commit
[
:author
][
:name
]
–
=
gfm
escape_once
(
truncate
(
commit
[
:message
],
length:
70
))
rescue
"--broken encoding"
=
image_tag
gravatar_icon
(
commit
[
:author
][
:email
]),
class:
"avatar"
,
width:
16
=
gfm
escape_once
(
truncate
(
commit
[
:message
],
length:
50
))
rescue
"--broken encoding"
app/views/projects/commits/_inline_commit.html.haml
0 → 100644
View file @
94d364e8
%li
.commit.inline-commit
.commit-row-title
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
project
,
commit
),
class:
"commit_short_id"
=
link_to_gfm
truncate
(
commit
.
title
,
length:
40
),
project_commit_path
(
project
,
commit
.
id
),
class:
"commit-row-message"
%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
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