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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
860e3ab5
Commit
860e3ab5
authored
May 19, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Event feed: Icons for some events
parent
1e4d15b4
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
2 deletions
+11
-2
app/assets/images/event_mr_merged.png
app/assets/images/event_mr_merged.png
+0
-0
app/assets/images/event_push.png
app/assets/images/event_push.png
+0
-0
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+7
-0
app/assets/stylesheets/ui_basic.scss
app/assets/stylesheets/ui_basic.scss
+0
-1
app/assets/stylesheets/ui_mars.scss
app/assets/stylesheets/ui_mars.scss
+0
-1
app/views/events/_event_merge_request.html.haml
app/views/events/_event_merge_request.html.haml
+2
-0
app/views/events/_event_push.html.haml
app/views/events/_event_push.html.haml
+2
-0
No files found.
app/assets/images/event_mr_merged.png
0 → 100644
View file @
860e3ab5
463 Bytes
app/assets/images/event_push.png
0 → 100644
View file @
860e3ab5
632 Bytes
app/assets/stylesheets/common.scss
View file @
860e3ab5
...
@@ -645,6 +645,13 @@ p.time {
...
@@ -645,6 +645,13 @@ p.time {
.avatar
{
.avatar
{
width
:
32px
;
width
:
32px
;
}
}
.event_icon
{
float
:right
;
margin-right
:
2px
;
img
{
width
:
20px
;
}
}
ul
{
ul
{
margin-left
:
50px
;
margin-left
:
50px
;
margin-bottom
:
5px
;
margin-bottom
:
5px
;
...
...
app/assets/stylesheets/ui_basic.scss
View file @
860e3ab5
...
@@ -83,7 +83,6 @@
...
@@ -83,7 +83,6 @@
.project_name
{
.project_name
{
float
:left
;
float
:left
;
width
:
360px
;
margin
:
0
;
margin
:
0
;
margin-right
:
30px
;
margin-right
:
30px
;
font-size
:
20px
;
font-size
:
20px
;
...
...
app/assets/stylesheets/ui_mars.scss
View file @
860e3ab5
...
@@ -97,7 +97,6 @@
...
@@ -97,7 +97,6 @@
}
}
.project_name
{
.project_name
{
float
:left
;
float
:left
;
width
:
360px
;
margin
:
0
;
margin
:
0
;
margin-right
:
30px
;
margin-right
:
30px
;
font-size
:
20px
;
font-size
:
20px
;
...
...
app/views/events/_event_merge_request.html.haml
View file @
860e3ab5
-
if
event
.
action_name
==
"merged"
.event_icon
=
image_tag
"event_mr_merged.png"
=
image_tag
gravatar_icon
(
event
.
author_email
),
:class
=>
"avatar"
=
image_tag
gravatar_icon
(
event
.
author_email
),
:class
=>
"avatar"
%strong
#{
event
.
author_name
}
%strong
#{
event
.
author_name
}
%span
.event_label
=
event
.
action_name
%span
.event_label
=
event
.
action_name
...
...
app/views/events/_event_push.html.haml
View file @
860e3ab5
%div
%div
.event_icon
=
image_tag
"event_push.png"
=
image_tag
gravatar_icon
(
event
.
author_email
),
:class
=>
"avatar"
=
image_tag
gravatar_icon
(
event
.
author_email
),
:class
=>
"avatar"
%strong
#{
event
.
author_name
}
%strong
#{
event
.
author_name
}
%span
.event_label
=
event
.
push_action_name
%span
.event_label
=
event
.
push_action_name
=
event
.
ref_type
=
link_to
project_commits_path
(
event
.
project
,
:ref
=>
event
.
ref_name
)
do
=
link_to
project_commits_path
(
event
.
project
,
:ref
=>
event
.
ref_name
)
do
%strong
=
event
.
ref_name
%strong
=
event
.
ref_name
at
at
...
...
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