Unverified Commit 7457f254 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff

Replace last_author with last-author

parent 9fa032e4
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
&:hover:not(.selected), &.selected { &:hover:not(.selected), &.selected {
.subject, .subject,
.last_author, .last-author,
.last_message { .last_message {
color: $white; color: $white;
} }
...@@ -86,14 +86,14 @@ ...@@ -86,14 +86,14 @@
&.unread { background-color: $background-grey; } &.unread { background-color: $background-grey; }
&.selected { background-color: $brand-primary; } &.selected { background-color: $brand-primary; }
.last_author, .last_message { .last-author, .last_message {
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.last_author { color: $text-dark-grey; } .last-author { color: $text-dark-grey; }
.message-count, .unread-message-count { .message-count, .unread-message-count {
margin-left: 3px; margin-left: 3px;
......
...@@ -486,7 +486,7 @@ select { ...@@ -486,7 +486,7 @@ select {
margin-bottom: 5px; margin-bottom: 5px;
} }
.last_author { .last-author {
position: relative; position: relative;
margin: 10px 10px 2px; margin: 10px 10px 2px;
float: right; float: right;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
= conversation.subject = conversation.subject
.timestamp .timestamp
= timeago(conversation.updated_at) = timeago(conversation.updated_at)
.last_author .last-author
- if conversation.last_author.present? - if conversation.last_author.present?
= conversation.last_author.name = conversation.last_author.name
.last_message .last_message
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
= render partial: "conversation_subject", = render partial: "conversation_subject",
locals: { conversation: conversation, unread_count: visibility.unread } locals: { conversation: conversation, unread_count: visibility.unread }
.last_author .last-author
.timestamp .timestamp
= timeago(conversation.updated_at) = timeago(conversation.updated_at)
......
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