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
Jérome Perrin
gitlab-ce
Commits
ad25dac8
Commit
ad25dac8
authored
Apr 14, 2012
by
Arthur Schreiber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change the design a bit to look more like before.
parent
d9ba277e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
11 deletions
+30
-11
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+21
-2
app/views/commits/show.html.haml
app/views/commits/show.html.haml
+9
-9
No files found.
app/assets/stylesheets/sections/commits.scss
View file @
ad25dac8
.commit-head
{
.commit-head
{
@extend
.well
;
@extend
.main_box
;
@extend
.clearfix
;
padding
:
14px
;
padding
:
14px
;
padding-bottom
:
8px
;
padding-bottom
:
8px
;
...
@@ -17,9 +16,29 @@
...
@@ -17,9 +16,29 @@
}
}
.commit-description
{
.commit-description
{
font-size
:
14px
;
padding
:
0px
;
padding-bottom
:
4px
;
border
:
none
;
background-color
:
white
;
background-color
:
white
;
}
}
.commit-info
{
@extend
.middle_box_content
;
@extend
.clearfix
;
padding-bottom
:
8px
;
padding-top
:
8px
;
margin-left
:
-14px
;
margin-right
:
-14px
;
margin-bottom
:
-8px
;
.author
.name
,
.committer
.name
{
font-weight
:
bold
;
}
}
.sha-block
{
.sha-block
{
float
:
right
;
float
:
right
;
margin-left
:
10px
margin-left
:
10px
...
...
app/views/commits/show.html.haml
View file @
ad25dac8
...
@@ -5,23 +5,23 @@
...
@@ -5,23 +5,23 @@
-
if
@commit
.
description
.
present?
-
if
@commit
.
description
.
present?
%pre
.commit-description
%pre
.commit-description
=
commit_msg_with_link_to_issues
(
@project
,
@commit
.
description
)
=
commit_msg_with_link_to_issues
(
@project
,
@commit
.
description
)
%span
.sha-block
commit
%code
=
@commit
.
id
%span
.sha-block
=
pluralize
(
@commit
.
parents
.
count
,
"parent"
)
-
@commit
.
parents
.
each
do
|
parent
|
%code
=
link_to
parent
.
id
,
project_commit_path
(
@project
,
parent
)
.commit-info
.commit-info
%span
.sha-block
commit
%code
=
@commit
.
id
%span
.sha-block
=
pluralize
(
@commit
.
parents
.
count
,
"parent"
)
-
@commit
.
parents
.
each
do
|
parent
|
%code
=
link_to
parent
.
id
,
project_commit_path
(
@project
,
parent
)
.author
.author
=
image_tag
gravatar_icon
(
@commit
.
author_email
,
24
),
:class
=>
"avatar"
,
:height
=>
24
,
:width
=>
24
=
image_tag
gravatar_icon
(
@commit
.
author_email
,
24
),
:class
=>
"avatar"
,
:height
=>
24
,
:width
=>
24
=
@commit
.
author_name
%span
.name
=
@commit
.
author_name
authored
authored
%time
{
title:
@commit
.
authored_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
%time
{
title:
@commit
.
authored_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
#{
time_ago_in_words
(
@commit
.
authored_date
)
}
ago
#{
time_ago_in_words
(
@commit
.
authored_date
)
}
ago
-
if
@commit
.
different_committer?
-
if
@commit
.
different_committer?
.committer
.committer
=
@commit
.
committer_name
%span
.name
=
@commit
.
committer_name
committed
committed
%time
{
title:
@commit
.
committed_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
%time
{
title:
@commit
.
committed_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
#{
time_ago_in_words
(
@commit
.
committed_date
)
}
ago
#{
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