From 8e9ceb9a2bafe425a6d35f824282db20e70d54a7 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Tue, 2 Jun 2015 23:33:42 +0200
Subject: [PATCH] Improve no message text and delete icon for conversations,
 fix regressions

---
 app/assets/stylesheets/conversations.scss            | 8 +++++---
 app/assets/stylesheets/new_styles/_interactions.scss | 2 +-
 app/views/conversations/_message.haml                | 6 +++---
 app/views/conversations/_messages.haml               | 5 ++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss
index af563a625..747852691 100644
--- a/app/assets/stylesheets/conversations.scss
+++ b/app/assets/stylesheets/conversations.scss
@@ -144,11 +144,12 @@
 
     .hide_conversation, .delete_conversation {
       display: block;
-      margin-top: 25px;
+      margin-top: 15px;
       margin-left: 10px;
     }
 
     .avatar {
+      display: inline;
       height: 30px;
       width: 30px;
     }
@@ -224,10 +225,11 @@
 
 #no_conversations,
 #no_conversation_text {
+  color: $gray-light;
+  font-size: $font-size-h4;
   font-weight: bold;
-  color: #ccc;
+  padding: 50px 0;
   text-align: center;
-  margin-top: 100px;
 }
 
 #no_conversation_text {
diff --git a/app/assets/stylesheets/new_styles/_interactions.scss b/app/assets/stylesheets/new_styles/_interactions.scss
index 28b3655f5..e221496e1 100644
--- a/app/assets/stylesheets/new_styles/_interactions.scss
+++ b/app/assets/stylesheets/new_styles/_interactions.scss
@@ -13,7 +13,7 @@
     }
 
     &.hide_conversation i {
-      font-size: $line-height-base*1.5;
+      font-size: $line-height-computed*1.5;
     }
 
     &.delete_conversation i {
diff --git a/app/views/conversations/_message.haml b/app/views/conversations/_message.haml
index 34a8341cd..c225aa1f4 100644
--- a/app/views/conversations/_message.haml
+++ b/app/views/conversations/_message.haml
@@ -4,9 +4,9 @@
 
 .stream_element{:data=>{:guid=>message.id}, :id => ('first_unread' if @first_unread_message_id == message.id)}
   .media
-    .col-xs-1
-      = person_image_link(message.author, :size => :thumb_small)
-    .col-xs-11
+    .media-left
+      = person_image_link(message.author, size: :thumb_small, class: "media-object")
+    .media-body
       = person_link(message.author, :class => 'author from')
       = timeago(message.created_at)
 
diff --git a/app/views/conversations/_messages.haml b/app/views/conversations/_messages.haml
index 280d15080..43580d158 100644
--- a/app/views/conversations/_messages.haml
+++ b/app/views/conversations/_messages.haml
@@ -3,10 +3,9 @@
 
   .stream_element.new_message
     .media
-      .col-xs-1
+      .media-left
         = owner_image_tag(:thumb_small)
-
-      .col-xs-11
+      .media-body
         = form_for [conversation, Message.new], html: {class: "control-group"} do |message|
           = message.text_area :text, rows: 5, tabindex: 1, class: "form-control form-group"
           = message.submit t("conversations.show.reply").capitalize,