Merge pull request #2982 from diasp/2912-message-overflows

Handle many users in a message #2912[ci skip]

app/views/conversations/_show.haml

@@ -3,21 +3,15 @@
 -#   the COPYRIGHT file.
 
 .conversation_participants
-  .span-14.last
-    .right
-      = link_to(image_tag('deletelabel.png'), conversation_visibility_path(conversation), :method => 'delete', :confirm => "#{t('.delete')}?", :title => t('.delete'))
+  .right
+    = link_to(image_tag('deletelabel.png'), conversation_visibility_path(conversation), :method => 'delete', :confirm => "#{t('.delete')}?", :title => t('.delete'))
 
-    %h3{ :class => direction_for(conversation.subject) }
-      = conversation.subject
+  %h3{ :class => direction_for(conversation.subject) }
+    = conversation.subject
 
-    - for participant in conversation.participants
-      = person_image_link(participant)
+  - for participant in conversation.participants
+    = person_image_link(participant)
 
-%br
-%br
-%br
-%br
-%br
 .span-15.last
   .stream
     = render :partial => 'messages/message', :collection => conversation.messages

public/stylesheets/sass/application.sass

@@ -1847,7 +1847,7 @@ ul#press_logos
   :z-index 3
   :background
     :color $background
-  :position fixed
+  :position relative
   :margin
     :bottom 10px
 
@@ -1873,6 +1873,10 @@ ul#press_logos
   :line
     :height 0
 
+  a img
+    :margin
+      :bottom 4px
+
   .conversation_controls
     a
       :margin
@@ -1883,7 +1887,7 @@ ul#press_logos
 
   :border
     :bottom 1px solid #ddd
-  :padding 15px
+  :padding 10px
     :top 101px
     :bottom 10px
   :width 560px