diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index 35571748118..14ad26bcd6b 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -4,11 +4,16 @@ */ .event-item { 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; color: $list-text-color; + position: relative; &.event-inline { + .profile-icon { + top: 20px; + } + .event-title, .event-item-timestamp { line-height: 40px; @@ -19,22 +24,36 @@ 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 { @include str-truncated(calc(100% - 174px)); font-weight: 600; color: $list-text-color; } - .event-icon { - display: inline-block; - margin: 0 10px; - } - - svg { - height: 16px; - width: 16px; - } - .event-body { margin-right: 174px; @@ -164,7 +183,7 @@ max-width: 100%; } - .avatar { + .profile-icon { display: none; } diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index 98a4dda5b4d..2a98e58a03a 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -1,13 +1,13 @@ - if event.target - if event.action_name == "opened" - .event-icon.open-icon + .profile-icon.open-icon = custom_icon("icon_status_open") - elsif event.action_name == "closed" - .event-icon.closed-icon - = custom_icon("icon_status_closed") + .profile-icon.closed-icon + = custom_icon("icon_status_closed") - else - .event-icon.fork-icon - = custom_icon("code_fork") + .profile-icon.fork-icon + = custom_icon("code_fork") .event-title %span{ class: event.action_name } diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml index 6fb084df374..340d8c61026 100644 --- a/app/views/events/event/_created_project.html.haml +++ b/app/views/events/event/_created_project.html.haml @@ -1,5 +1,5 @@ -.event-icon.open-icon -= custom_icon("icon_status_open") +.profile-icon.open-icon + = custom_icon("icon_status_open") .event-title %span{ class: event.action_name } diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index 755750b88d1..603bed6d705 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -1,4 +1,4 @@ -.event-icon +.profile-icon = custom_icon("comment_o") .event-title diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index be1730541ef..4abda4d9db4 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -1,6 +1,6 @@ - project = event.project -.event-icon +.profile-icon = custom_icon("icon_commit") .event-title