From 00674fee74069edcf4b992d7eb402e4d1701d2db Mon Sep 17 00:00:00 2001
From: augier <christophe@c-henry.fr>
Date: Fri, 24 Jul 2015 20:13:53 +0200
Subject: [PATCH] Fix page width on people view (BS3 regression)
---
app/assets/stylesheets/mobile/mobile.scss | 3 +--
app/views/people/show.mobile.haml | 30 +++++++++++------------
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index f2d094d62b..235e496b70 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -312,8 +312,7 @@ h3 { margin-top: 0; }
}
.header-full-width {
- margin: -10px;
- margin-bottom: 1.5rem;
+ margin: -10px -10px 0;
padding-top: 5px;
background-color: #fff;
border-bottom: 1px solid #aaa;
diff --git a/app/views/people/show.mobile.haml b/app/views/people/show.mobile.haml
index 11b914cb5e..0086c44522 100644
--- a/app/views/people/show.mobile.haml
+++ b/app/views/people/show.mobile.haml
@@ -15,19 +15,19 @@
.bottom_bar
- if !@person.tag_string.blank? && user_signed_in?
= Diaspora::Taggable.format_tags(@person.tag_string)
-
-.col-md-12.profile_stream
- - if @stream.stream_posts.length > 0
- - if @post_type == :photos
- = render 'photos/index', photos: @stream.stream_posts
+.row
+ .col-md-12.profile_stream
+ - if @stream.stream_posts.length > 0
+ - if @post_type == :photos
+ = render 'photos/index', photos: @stream.stream_posts
+ - else
+ #main_stream.stream
+ = render 'shared/stream', posts: @stream.stream_posts
+ = render 'shared/stream_more_button'
- else
- #main_stream.stream
- = render 'shared/stream', posts: @stream.stream_posts
- = render 'shared/stream_more_button'
- - else
- #main_stream
- .dull
- - if @block.present?
- = t('.ignoring', name: @person.first_name)
- - elsif user_signed_in? && (current_user.person != @person)
- = t('.has_not_shared_with_you_yet', name: @person.first_name)
+ #main_stream
+ .dull
+ - if @block.present?
+ = t('.ignoring', name: @person.first_name)
+ - elsif user_signed_in? && (current_user.person != @person)
+ = t('.has_not_shared_with_you_yet', name: @person.first_name)
--
GitLab