reshares up top

app/views/reshares/_reshare.mobile.haml

@@ -2,22 +2,34 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-.reshare
-  - if post
-    .content
-      .from
-        = person_image_link(post.author, :size => :thumb_small)
-        = person_link(post.author)
-        .info
-          %span.time{:integer => post.created_at.to_i}
-            = t('ago', :time => time_ago_in_words(post.created_at))
-          %span.via
-            - if post.activity_streams?
-              = t('.via', :link => link_to("#{post.provider_display_name}", post.actor_url)).html_safe
+- if post
+  .photo_area
+    - if post.is_a?(StatusMessage)
+      -if post.photos.size > 0
+        .photo_attachments
+          - if post.photos.size > 1
+            .additional_photo_count
+              = "+ #{post.photos.size-1}"
+          = image_tag post.photos.first.url(:thumb_large), :class => "stream-photo big-stream-photo"
+    - elsif post.activity_streams?
+      = image_tag post.image_url
 
-      - if post.activity_streams?
-        = link_to image_tag(post.image_url, 'data-small-photo' => post.image_url, 'data-full-photo' => post.image_url, :class => 'stream-photo'), post.object_url, :class => "stream-photo-link"
-      - else
-        = render 'status_messages/status_message', :post => post, :photos => post.photos
-  - else
-    = t('.deleted')
+  .content
+    .from
+      = person_image_link(post.author, :size => :thumb_small)
+      = person_link(post.author)
+      .info
+        %span.time{:integer => post.created_at.to_i}
+          = t('ago', :time => time_ago_in_words(post.created_at))
+        %span.via
+          - if post.activity_streams?
+            = t('.via', :link => link_to("#{post.provider_display_name}", post.actor_url)).html_safe
+
+    - if post.activity_streams?
+      = link_to image_tag(post.image_url, 'data-small-photo' => post.image_url, 'data-full-photo' => post.image_url, :class => 'stream-photo'), post.object_url, :class => "stream-photo-link"
+    - else
+      = render 'status_messages/status_message', :post => post, :photos => post.photos
+- else
+  = t('.deleted')
+
+%hr

app/views/shared/_stream_element.mobile.haml

@@ -4,6 +4,9 @@
 
 .stream_element{:data=>{:guid=>post.id}}
 
+  - if post.is_a?(Reshare)
+    = render 'reshares/reshare', :reshare => post, :post => post.root
+
   .photo_area
     - if post.is_a?(StatusMessage)
       -if post.photos.size > 0
@@ -33,9 +36,7 @@
           - if post.activity_streams?
             = t('.via', :link => link_to("#{post.provider_display_name}", post.actor_url)).html_safe
 
-    - if reshare?(post)
-      = render 'reshares/reshare', :reshare => post, :post => post.root
-    - elsif post.is_a?(StatusMessage)
+    - if post.is_a?(StatusMessage)
       = render 'status_messages/status_message', :post => post, :photos => post.photos
 
   .bottom_bar

public/stylesheets/sass/mobile.scss

@@ -15,7 +15,7 @@ a {
 body {
   background: #555555;
   max-width: 100%;
-  margin-top: 45px;
+  margin-top: 55px;
 }
 
 .message {
@@ -28,7 +28,6 @@ body {
 }
 
 .stream {
-  display: inline-block;
   text-align: left;
   max-width: 700px;
 }
@@ -160,19 +159,10 @@ body {
   padding: 0;
   margin: 0;
   img {
+    @include border-radius(3px);
     margin: 0;
     padding: 0; } }
 
-.reshare {
-  .content {
-    border: {
-      left: 3px solid #ccc;
-    }
-    padding: {
-      left: 5px;
-      top: 0px; };
-  }
-}
 
 #main_stream {
   font: {
@@ -223,6 +213,7 @@ body {
 
 #author_info.profile {
   box-shadow: inset 0 -1px 3px #111;
+  margin-top: -10px;
   text-align: left;
 
   h2 {
@@ -370,6 +361,8 @@ footer {
   float: right; }
 
 .stream_element .photo_attachments {
+  @include border-radius(3px);
+
   background: {
     color: #999;
   }
@@ -386,6 +379,7 @@ footer {
   margin-top: 0; }
 
 .photo_area {
+  @include border-radius(3px);
   text-align: center; }
 
 .image_link {