BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit c7011c88 by Annabel Dunstone Gray
Options

Use avatars instead of icons in activity view

parent 9c576cc7
Showing with 43 additions and 24 deletions
app/assets/stylesheets/pages/events.scss
...@@ -10,10 +10,14 @@ ...@@ -10,10 +10,14 @@
position: relative; position: relative;
&.event-inline { &.event-inline {
.profile-icon { .system-note-image {
top: 20px; top: 20px;
} }
.user-avatar {
top: 14px;
}
.event-title, .event-title,
.event-item-timestamp { .event-item-timestamp {
line-height: 40px; line-height: 40px;
...@@ -24,7 +28,7 @@ ...@@ -24,7 +28,7 @@
color: $gl-text-color; color: $gl-text-color;
} }
.profile-icon { .system-note-image {
position: absolute; position: absolute;
left: 0; left: 0;
top: 14px; top: 14px;
...@@ -128,8 +132,7 @@ ...@@ -128,8 +132,7 @@
li { li {
&.commit { &.commit {
background: transparent; background: transparent;
padding: 3px; padding: 0;
padding-left: 0;
border: none; border: none;
.commit-row-title { .commit-row-title {
...@@ -183,7 +186,7 @@ ...@@ -183,7 +186,7 @@
max-width: 100%; max-width: 100%;
} }
.profile-icon { .system-note-image {
display: none; display: none;
} }
......
app/views/events/event/_common.html.haml
- if event.target - if current_path?('dashboard#activity')
- if event.action_name == "opened" .system-note-image.user-avatar
.profile-icon.open-icon = author_avatar(event, size: 32)
= custom_icon("icon_status_open") - else
- elsif event.action_name == "closed" - if event.target
.profile-icon.closed-icon - if event.action_name == "opened"
= custom_icon("icon_status_closed") .system-note-image.open-icon
- else = custom_icon("icon_status_open")
.profile-icon.fork-icon - elsif event.action_name == "closed"
= custom_icon("icon_code_fork") .system-note-image.closed-icon
= custom_icon("icon_status_closed")
- else
.system-note-image.fork-icon
= custom_icon("icon_code_fork")
.event-title .event-title
%span.author_name= link_to_author event %span.author_name= link_to_author event
......
app/views/events/event/_created_project.html.haml
.profile-icon.open-icon - if current_path?('dashboard#activity')
= custom_icon("icon_status_open") .system-note-image.user-avatar
= author_avatar(event, size: 32)
- else
.system-note-image.open-icon
= custom_icon("icon_status_open")
.event-title .event-title
%span.author_name= link_to_author event %span.author_name= link_to_author event
......
app/views/events/event/_note.html.haml
.profile-icon - if current_path?('dashboard#activity')
= custom_icon("icon_comment_o") .system-note-image.user-avatar
= author_avatar(event, size: 32)
- else
.system-note-image
= custom_icon("icon_comment_o")
.event-title .event-title
%span.author_name= link_to_author event %span.author_name= link_to_author event
......
app/views/events/event/_push.html.haml
- project = event.project - project = event.project
.profile-icon - if current_path?('dashboard#activity')
- if event.action_name == "deleted" .system-note-image.user-avatar
= custom_icon("trash_o") = author_avatar(event, size: 32)
- else - else
= custom_icon("icon_commit") .system-note-image
- if event.action_name == "deleted"
= custom_icon("trash_o")
- else
= custom_icon("icon_commit")
.event-title .event-title
%span.author_name= link_to_author event %span.author_name= link_to_author event
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment