touch up message inbox view

app/views/conversations/_show.haml

@@ -2,27 +2,23 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   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'))
 
-.span-16.last
-  .conversation_participants
-    .span-9
-      %h3{ :class => direction_for(conversation.subject) }
-        = conversation.subject
+    %h3{ :class => direction_for(conversation.subject) }
+      = conversation.subject
 
-      .conversation_controls
-        = link_to (image_tag('reply.png', :height => 14, :width => 14) + ' ' + t('.reply')), '#', :id => 'reply_to_conversation'
-        = link_to (image_tag('deletelabel.png') + ' ' + t('.delete').downcase), conversation_visibility_path(conversation), :method => 'delete', :confirm => t('are_you_sure')
-
-    .span-6.avatars.last
-      - for participant in conversation.participants
-        = person_image_link(participant)
+    - for participant in conversation.participants
+      = person_image_link(participant)
 
 %br
 %br
 %br
 %br
 %br
-.span-16.last
+.span-15.last
   .stream
     = render :partial => 'messages/message', :collection => conversation.messages
 

app/views/conversations/index.haml

@@ -33,11 +33,14 @@
         %i
           = t('.no_messages')
 
-#conversation_show.span-16.prepend-8.last
-  - if @conversation
-    = render 'conversations/show', :conversation => @conversation
-  - else
-    #no_conversation_text
-      = t('.no_conversation_selected')
-    #no_conversation_controls
-      = link_to t('.create_a_new_message'), new_conversation_path, :rel => 'facebox'
+
+.span-15.prepend-9.last
+  .stream_container
+    #conversation_show
+      - if @conversation
+        = render 'conversations/show', :conversation => @conversation
+      - else
+        #no_conversation_text
+          = t('.no_conversation_selected')
+        #no_conversation_controls
+          = link_to t('.create_a_new_message'), new_conversation_path, :rel => 'facebox'

public/stylesheets/sass/application.sass

@@ -2378,14 +2378,21 @@ ul.show_comments,
   :margin
     :bottom 10px
 
-  :-webkit-box-shadow 0 3px 3px -3px #333
-  :-moz-box-shadow 0 3px 3px -3px #333
-  :box-shadow 0 3px 3px -3px #333
+  :-webkit-box-shadow 0 2px 3px -3px #666
+  :-moz-box-shadow 0 2px 3px -3px #666
+  :box-shadow 0 2px 3px -3px #666
+
+  .right
+    :top 118px
+    :right 5px
 
   h3
     :margin 0
       :top 6px
       :bottom 0px
+    :padding
+      :bottom 10px
+
   .avatar
     :height 30px
     :width 30px
@@ -2402,10 +2409,11 @@ ul.show_comments,
       :bottom 10px
 
   :border
-    :bottom 1px solid #666
-  :padding 20px
-    :top 110px
+    :bottom 1px solid #ddd
+  :padding 15px
+    :top 101px
     :bottom 10px
+  :width 560px
   :margin
     :top -100px
 
@@ -2496,20 +2504,10 @@ ul.show_comments,
   :height 100%
   :overflow-y auto
   :overflow-x none
-  :background
-    :color #f3f3f3
 
 #left_pane
   :position fixed
-  :width 320px
-  :background
-    :color #ddd
-
-  :-webkit-box-shadow 2px 2px 5px -1px #999
-
-  :border
-    :right 1px solid #999
-  :z-index 4
+  :width 337px
 
   h3
     :padding
@@ -2519,7 +2517,7 @@ ul.show_comments,
 
   #left_pane_header
     :padding 10px
-    :height 22px
+    :height 55px
     :border
       :bottom 1px solid #ddd