Commit 32bb33f7 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Change color of icons

parent 63345756
...@@ -4,11 +4,16 @@ ...@@ -4,11 +4,16 @@
*/ */
.event-item { .event-item {
font-size: $gl-font-size; font-size: $gl-font-size;
padding: $gl-padding 0; padding: $gl-padding-top 0 $gl-padding-top ($gl-avatar-size + $gl-padding-top);
border-bottom: 1px solid $white-normal; border-bottom: 1px solid $white-normal;
color: $list-text-color; color: $list-text-color;
position: relative;
&.event-inline { &.event-inline {
.profile-icon {
top: 20px;
}
.event-title, .event-title,
.event-item-timestamp { .event-item-timestamp {
line-height: 40px; line-height: 40px;
...@@ -19,22 +24,36 @@ ...@@ -19,22 +24,36 @@
color: $gl-text-color; color: $gl-text-color;
} }
.profile-icon {
position: absolute;
left: 0;
top: 14px;
svg {
width: 20px;
height: auto;
fill: $gl-text-color-secondary;
}
&.open-icon svg {
fill: $green-300;
}
&.closed-icon svg {
fill: $red-300;
}
&.fork-icon svg {
fill: $blue-300;
}
}
.event-title { .event-title {
@include str-truncated(calc(100% - 174px)); @include str-truncated(calc(100% - 174px));
font-weight: 600; font-weight: 600;
color: $list-text-color; color: $list-text-color;
} }
.event-icon {
display: inline-block;
margin: 0 10px;
}
svg {
height: 16px;
width: 16px;
}
.event-body { .event-body {
margin-right: 174px; margin-right: 174px;
...@@ -164,7 +183,7 @@ ...@@ -164,7 +183,7 @@
max-width: 100%; max-width: 100%;
} }
.avatar { .profile-icon {
display: none; display: none;
} }
......
- if event.target - if event.target
- if event.action_name == "opened" - if event.action_name == "opened"
.event-icon.open-icon .profile-icon.open-icon
= custom_icon("icon_status_open") = custom_icon("icon_status_open")
- elsif event.action_name == "closed" - elsif event.action_name == "closed"
.event-icon.closed-icon .profile-icon.closed-icon
= custom_icon("icon_status_closed") = custom_icon("icon_status_closed")
- else - else
.event-icon.fork-icon .profile-icon.fork-icon
= custom_icon("code_fork") = custom_icon("code_fork")
.event-title .event-title
%span{ class: event.action_name } %span{ class: event.action_name }
......
.event-icon.open-icon .profile-icon.open-icon
= custom_icon("icon_status_open") = custom_icon("icon_status_open")
.event-title .event-title
%span{ class: event.action_name } %span{ class: event.action_name }
......
.event-icon .profile-icon
= custom_icon("comment_o") = custom_icon("comment_o")
.event-title .event-title
......
- project = event.project - project = event.project
.event-icon .profile-icon
= custom_icon("icon_commit") = custom_icon("icon_commit")
.event-title .event-title
......
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