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
494cd02b
Commit
494cd02b
authored
Jul 17, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Colored labels for events on dashboard
parent
a3bb9ca1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
8 deletions
+19
-8
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+14
-3
app/views/events/_event_issue.html.haml
app/views/events/_event_issue.html.haml
+2
-2
app/views/events/_event_merge_request.html.haml
app/views/events/_event_merge_request.html.haml
+2
-2
app/views/events/_event_push.html.haml
app/views/events/_event_push.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
494cd02b
...
...
@@ -303,9 +303,20 @@ table.no-borders {
}
.event_label
{
background
:
#FCEEC1
;
padding
:
2px
2px
0
;
font-family
:
monospace
;
@extend
.label
;
background-color
:
#999
;
&
.pushed
{
background-color
:
#3A87AD
;
}
&
.opened
{
background-color
:
#468847
;
}
&
.closed
{
background-color
:
#B94A48
;
}
}
img
.avatar
{
...
...
app/views/events/_event_issue.html.haml
View file @
494cd02b
=
image_tag
gravatar_icon
(
event
.
author_email
),
:class
=>
"avatar"
%strong
#{
event
.
author_name
}
%span
.event_label
=
event
.
action_name
issue
%span
.event_label
{
:class
=>
event
.
action_name
}
=
event
.
action_name
issue
=
link_to
project_issue_path
(
event
.
project
,
event
.
issue
)
do
%strong
=
truncate
event
.
issue_title
at
...
...
app/views/events/_event_merge_request.html.haml
View file @
494cd02b
...
...
@@ -2,8 +2,8 @@
.event_icon
=
image_tag
"event_mr_merged.png"
=
image_tag
gravatar_icon
(
event
.
author_email
),
:class
=>
"avatar"
%strong
#{
event
.
author_name
}
%span
.event_label
=
event
.
action_name
merge request
%span
.event_label
{
:class
=>
event
.
action_name
}
=
event
.
action_name
merge request
=
link_to
project_merge_request_path
(
event
.
project
,
event
.
merge_request
)
do
%strong
=
truncate
event
.
merge_request_title
at
...
...
app/views/events/_event_push.html.haml
View file @
494cd02b
...
...
@@ -2,7 +2,7 @@
.event_icon
=
image_tag
"event_push.png"
=
image_tag
gravatar_icon
(
event
.
author_email
),
:class
=>
"avatar"
%strong
#{
event
.
author_name
}
%span
.event_label
=
event
.
push_action_name
%span
.event_label
.pushed
=
event
.
push_action_name
=
event
.
ref_type
=
link_to
project_commits_path
(
event
.
project
,
:ref
=>
event
.
ref_name
)
do
%strong
=
event
.
ref_name
...
...
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