BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
c7011c88
Commit
c7011c88
authored
Apr 10, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use avatars instead of icons in activity view
parent
9c576cc7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
24 deletions
+43
-24
events.scss
app/assets/stylesheets/pages/events.scss
+8
-5
_common.html.haml
app/views/events/event/_common.html.haml
+14
-10
_created_project.html.haml
app/views/events/event/_created_project.html.haml
+6
-2
_note.html.haml
app/views/events/event/_note.html.haml
+6
-2
_push.html.haml
app/views/events/event/_push.html.haml
+9
-5
No files found.
app/assets/stylesheets/pages/events.scss
View file @
c7011c88
...
...
@@ -10,10 +10,14 @@
position
:
relative
;
&
.event-inline
{
.
profile-icon
{
.
system-note-image
{
top
:
20px
;
}
.user-avatar
{
top
:
14px
;
}
.event-title
,
.event-item-timestamp
{
line-height
:
40px
;
...
...
@@ -24,7 +28,7 @@
color
:
$gl-text-color
;
}
.
profile-icon
{
.
system-note-image
{
position
:
absolute
;
left
:
0
;
top
:
14px
;
...
...
@@ -128,8 +132,7 @@
li
{
&
.commit
{
background
:
transparent
;
padding
:
3px
;
padding-left
:
0
;
padding
:
0
;
border
:
none
;
.commit-row-title
{
...
...
@@ -183,7 +186,7 @@
max-width
:
100%
;
}
.
profile-icon
{
.
system-note-image
{
display
:
none
;
}
...
...
app/views/events/event/_common.html.haml
View file @
c7011c88
-
if
event
.
target
-
if
event
.
action_name
==
"opened"
.profile-icon.open-icon
=
custom_icon
(
"icon_status_open"
)
-
elsif
event
.
action_name
==
"closed"
.profile-icon.closed-icon
=
custom_icon
(
"icon_status_closed"
)
-
else
.profile-icon.fork-icon
=
custom_icon
(
"icon_code_fork"
)
-
if
current_path?
(
'dashboard#activity'
)
.system-note-image.user-avatar
=
author_avatar
(
event
,
size:
32
)
-
else
-
if
event
.
target
-
if
event
.
action_name
==
"opened"
.system-note-image.open-icon
=
custom_icon
(
"icon_status_open"
)
-
elsif
event
.
action_name
==
"closed"
.system-note-image.closed-icon
=
custom_icon
(
"icon_status_closed"
)
-
else
.system-note-image.fork-icon
=
custom_icon
(
"icon_code_fork"
)
.event-title
%span
.author_name
=
link_to_author
event
...
...
app/views/events/event/_created_project.html.haml
View file @
c7011c88
.profile-icon.open-icon
=
custom_icon
(
"icon_status_open"
)
-
if
current_path?
(
'dashboard#activity'
)
.system-note-image.user-avatar
=
author_avatar
(
event
,
size:
32
)
-
else
.system-note-image.open-icon
=
custom_icon
(
"icon_status_open"
)
.event-title
%span
.author_name
=
link_to_author
event
...
...
app/views/events/event/_note.html.haml
View file @
c7011c88
.profile-icon
=
custom_icon
(
"icon_comment_o"
)
-
if
current_path?
(
'dashboard#activity'
)
.system-note-image.user-avatar
=
author_avatar
(
event
,
size:
32
)
-
else
.system-note-image
=
custom_icon
(
"icon_comment_o"
)
.event-title
%span
.author_name
=
link_to_author
event
...
...
app/views/events/event/_push.html.haml
View file @
c7011c88
-
project
=
event
.
project
.profile-icon
-
if
event
.
action_name
==
"deleted"
=
custom_icon
(
"trash_o"
)
-
else
=
custom_icon
(
"icon_commit"
)
-
if
current_path?
(
'dashboard#activity'
)
.system-note-image.user-avatar
=
author_avatar
(
event
,
size:
32
)
-
else
.system-note-image
-
if
event
.
action_name
==
"deleted"
=
custom_icon
(
"trash_o"
)
-
else
=
custom_icon
(
"icon_commit"
)
.event-title
%span
.author_name
=
link_to_author
event
...
...
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