Merge pull request #6247 from AugierLe42e/bs3-regression-profile-stream

Fix page width on people view (BS3 regression)

app/assets/stylesheets/mobile/mobile.scss

@@ -312,8 +312,7 @@ h3 {  margin-top: 0; }
 }
 
 .header-full-width {
-  margin: -10px;
+  margin: -10px -10px 0;
-  margin-bottom: 1.5rem;
   padding-top: 5px;
   background-color: #fff;
   border-bottom: 1px solid #aaa;

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)
-
+.row
-.col-md-12.profile_stream
+  .col-md-12.profile_stream
-  - if @stream.stream_posts.length > 0
+    - if @stream.stream_posts.length > 0
-    - if @post_type == :photos
+      - if @post_type == :photos
-      = render 'photos/index', photos: @stream.stream_posts
+        = 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
+      #main_stream
-        = render 'shared/stream', posts: @stream.stream_posts
+        .dull
-        = render 'shared/stream_more_button'
+        - if @block.present?
-  - else
+          = t('.ignoring', name: @person.first_name)
-    #main_stream
+        - elsif user_signed_in? && (current_user.person != @person)
-      .dull
+          = t('.has_not_shared_with_you_yet', name: @person.first_name)
-      - 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)