Merge pull request #6247 from AugierLe42e/bs3-regression-profile-stream
Fix page width on people view (BS3 regression)
This commit is contained in:
commit
1aebf74a3f
2 changed files with 16 additions and 17 deletions
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
.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
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue