Merge pull request #4591 from Flaburgan/avatar-profile-mobile

Fix avatar display on mobile profile
This commit is contained in:
Fabian Rodriguez 2013-11-18 18:17:34 -08:00
commit d8618f8700
3 changed files with 18 additions and 15 deletions

View file

@ -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)

View file

@ -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;

View file

@ -2,10 +2,6 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
- content_for :page_title do
%h1
diaspora*
.span12
#author_info
= person_image_tag @person, :thumb_medium
@ -15,7 +11,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