nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix page width on people view (BS3 regression)

Browse source
This commit is contained in:
augier 2015-07-24 20:13:53 +02:00
parent 97c9561ab7
commit 00674fee74
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/mobile/mobile.scss
View file

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

30
app/views/people/show.mobile.haml
View file

@ -15,19 +15,19 @@
.bottom_bar .bottom_bar
- if !@person.tag_string.blank? && user_signed_in? - if !@person.tag_string.blank? && user_signed_in?
= Diaspora::Taggable.format_tags(@person.tag_string) = 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 - 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)