nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace last_author with last-author

Browse source
This commit is contained in:
Steffen van Bergerem 2017-08-30 12:22:09 +02:00 committed by Benjamin Neff
parent 9fa032e4c9
commit 7457f254c1
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/conversations.scss
View file

@ -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 @@
&.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;

2
app/assets/stylesheets/mobile/mobile.scss
View file

@ -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;

2
app/views/conversations/_conversation.haml
View file

@ -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

2
app/views/conversations/_conversation.mobile.haml
View file

@ -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)