diff --git a/app/views/conversations/_show.haml b/app/views/conversations/_show.haml index 3ff60e33e..50ecf0a28 100644 --- a/app/views/conversations/_show.haml +++ b/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 diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 4e48ee7ea..673820577 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -1831,7 +1831,7 @@ ul#press_logos :z-index 3 :background :color $background - :position fixed + :position relative :margin :bottom 10px @@ -1857,6 +1857,10 @@ ul#press_logos :line :height 0 + a img + :margin + :bottom 4px + .conversation_controls a :margin @@ -1867,7 +1871,7 @@ ul#press_logos :border :bottom 1px solid #ddd - :padding 15px + :padding 10px :top 101px :bottom 10px :width 560px