Merge pull request #6670 from Flaburgan/fix-horizontal-scrolling-mobile

Fix horizontal scrolling on mobile profile
This commit is contained in:
Steffen van Bergerem 2016-05-04 01:24:56 +02:00
commit 87da8f96d9
3 changed files with 16 additions and 18 deletions

View file

@ -325,10 +325,11 @@ footer {
}
.header-full-width {
margin: -10px -10px 0;
padding-top: 5px;
background-color: #fff;
border-bottom: 1px solid #aaa;
margin: -10px; // Counter the #main padding
margin-bottom: 10px;
padding-top: 5px;
}
#author_info {

View file

@ -15,17 +15,15 @@
.bottom-bar
- if !@person.tag_string.blank? && user_signed_in?
= Diaspora::Taggable.format_tags(@person.tag_string)
.row
.col-md-12.profile_stream
- if @post_type == :photos
- if @post_type == :photos
= render "photos/index", photos: @posts
- else
- else
#main_stream
- if @stream.stream_posts.length > 0
#main_stream.stream
= render "shared/stream", posts: @stream.stream_posts
= render "shared/stream_more_button"
- else
#main_stream
.dull
- if user_signed_in? && (current_user.person != @person)
= t(".has_not_shared_with_you_yet", name: @person.first_name)

View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
.row
#main_stream
- for photo in photos
.col-xs-12.col-sm-4
= link_to image_tag(photo.url(:thumb_large)), person_photo_path(photo.author, photo), class: "thumbnail"