From 76b151eb7db4f53ae0c82e5684d1d19e42d5cda1 Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Sat, 16 Nov 2013 01:55:16 -0800
Subject: [PATCH 1/2] Fix avatar display on mobile profile

---
 Changelog.md                           |  1 +
 app/assets/stylesheets/mobile.css.scss | 26 ++++++++++++++++----------
 app/views/people/show.mobile.haml      |  4 ++--
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ab27d20c2..9e98bd313 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -35,6 +35,7 @@
 * Force comments sort order in mobile spv [#4578](https://github.com/diaspora/diaspora/pull/4578)
 * Fix getting started page for mobile [#4536](https://github.com/diaspora/diaspora/pull/4536)
 * Refactor mobile header, fix [#4579](https://github.com/diaspora/diaspora/issues/4579)
+* Fix avatar display on mobile profile [#4591](https://github.com/diaspora/diaspora/pull/4591)
 
 ## Features
 * Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)
diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss
index bb45effd4..9ad5927f7 100644
--- a/app/assets/stylesheets/mobile.css.scss
+++ b/app/assets/stylesheets/mobile.css.scss
@@ -288,25 +288,31 @@ body {
   img {
     height: 90px;
     width: 90px;
-    margin: {
-      right: 10px;
-    }
-    position: absolute;
+    margin-right: 10px;
+    float: left;
   }
+  
   .content {
-    padding: {
-      left: 100px;
-    };
+    padding-left: 100px;
   }
 
   .description {
     font: {
       weight: normal;
-      size: small; };
-    color: $text-grey; } }
+      size: small;
+    };
+    color: $text-grey;
+  }
+}
+
+.profile_stream {
+  clear: both;
+  padding-top: 12px;
+}
 
 .right {
-  float: right; }
+  float: right;
+}
 
 header {
   position: fixed;
diff --git a/app/views/people/show.mobile.haml b/app/views/people/show.mobile.haml
index 381578ded..957a7519c 100644
--- a/app/views/people/show.mobile.haml
+++ b/app/views/people/show.mobile.haml
@@ -2,7 +2,7 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-- content_for :page_title do
+- content_for :page_title do -#TODO that's useless, isn't it?
   %h1
     diaspora*
 
@@ -15,7 +15,7 @@
       %span.description
         = @person.diaspora_handle
 
-.span12
+.span12.profile_stream
   - if @stream.stream_posts.length > 0
     - if @post_type == :photos
       = render 'photos/index', :photos => @stream.stream_posts

From 85eb584e66adb57afcb10ebfd910b0687687492d Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Sat, 16 Nov 2013 15:40:03 -0800
Subject: [PATCH 2/2] Remove useless :page_title indication from people/show

---
 app/views/people/show.mobile.haml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/views/people/show.mobile.haml b/app/views/people/show.mobile.haml
index 957a7519c..f7fdd3233 100644
--- a/app/views/people/show.mobile.haml
+++ b/app/views/people/show.mobile.haml
@@ -2,10 +2,6 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-- content_for :page_title do -#TODO that's useless, isn't it?
-  %h1
-    diaspora*
-
 .span12
   #author_info
     = person_image_tag @person, :thumb_medium