From 7457f254c1dc1cac905e311a6f5f27b0e9e09684 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Wed, 30 Aug 2017 12:22:09 +0200
Subject: [PATCH] Replace last_author with last-author
---
app/assets/stylesheets/conversations.scss | 6 +++---
app/assets/stylesheets/mobile/mobile.scss | 2 +-
app/views/conversations/_conversation.haml | 2 +-
app/views/conversations/_conversation.mobile.haml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss
index 3e3b77bdb5..ca4d61976b 100644
--- a/app/assets/stylesheets/conversations.scss
+++ b/app/assets/stylesheets/conversations.scss
@@ -65,7 +65,7 @@
&:hover:not(.selected), &.selected {
.subject,
- .last_author,
+ .last-author,
.last_message {
color: $white;
}
@@ -86,14 +86,14 @@
&.unread { background-color: $background-grey; }
&.selected { background-color: $brand-primary; }
- .last_author, .last_message {
+ .last-author, .last_message {
font-size: 12px;
line-height: 15px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
- .last_author { color: $text-dark-grey; }
+ .last-author { color: $text-dark-grey; }
.message-count, .unread-message-count {
margin-left: 3px;
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index 3361f188a5..4520aa2343 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -486,7 +486,7 @@ select {
margin-bottom: 5px;
}
-.last_author {
+.last-author {
position: relative;
margin: 10px 10px 2px;
float: right;
diff --git a/app/views/conversations/_conversation.haml b/app/views/conversations/_conversation.haml
index b9bbd1ceb4..68e4a47461 100644
--- a/app/views/conversations/_conversation.haml
+++ b/app/views/conversations/_conversation.haml
@@ -26,7 +26,7 @@
= conversation.subject
.timestamp
= timeago(conversation.updated_at)
- .last_author
+ .last-author
- if conversation.last_author.present?
= conversation.last_author.name
.last_message
diff --git a/app/views/conversations/_conversation.mobile.haml b/app/views/conversations/_conversation.mobile.haml
index b2836af1a2..2952d33ada 100644
--- a/app/views/conversations/_conversation.mobile.haml
+++ b/app/views/conversations/_conversation.mobile.haml
@@ -9,7 +9,7 @@
= render partial: "conversation_subject",
locals: { conversation: conversation, unread_count: visibility.unread }
- .last_author
+ .last-author
.timestamp
= timeago(conversation.updated_at)
--
GitLab