Merge pull request #1745 from ticho/unread-message-count-css-fix

Correctly space unread and total message counts in conversations list

app/views/conversations/_conversation.haml

@@ -7,11 +7,11 @@
     = person_image_tag(conversation.author)
 
     .subject
+      .message_count
+        = conversation.messages.size
       - if unread_counts[conversation.id].to_i > 0
         .unread_message_count
           = unread_counts[conversation.id].to_i
-      .message_count
-        = conversation.messages.size
 
       %div{ :class => direction_for(conversation.subject) }
         = conversation.subject[0..30]

public/stylesheets/sass/application.sass

@@ -2498,12 +2498,13 @@ ul.show_comments,
   .message_count
     @include border-radius(5px)
 
-    :right 10px
+    :float right
+    :right 0px
+    :padding 0 5px
+    :position relative
     :background
       :color #999
     :color #eee
-    :position absolute
-    :padding 0 5px
     :font
       :size 12px
       :weight normal
@@ -2511,12 +2512,13 @@ ul.show_comments,
   .unread_message_count
     @include border-radius(5px)
 
-    :right 30px
+    :float right
+    :right 5px
+    :padding 0 5px
+    :position relative
     :background
       :color #b11
     :color #eee
-    :position absolute
-    :padding 0 5px
     :font
       :size 12px
       :weight normal