diff options
-rw-r--r-- | web/react/components/post_info.jsx | 9 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 4 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post_right.scss | 15 |
3 files changed, 25 insertions, 3 deletions
diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx index c44223b1f..d1d516816 100644 --- a/web/react/components/post_info.jsx +++ b/web/react/components/post_info.jsx @@ -14,9 +14,17 @@ export default class PostInfo extends React.Component { constructor(props) { super(props); + this.dropdownPosition = this.dropdownPosition.bind(this); this.handlePermalink = this.handlePermalink.bind(this); this.removePost = this.removePost.bind(this); } + dropdownPosition(e) { + var position = $('#post-list').height() - $(e.target).offset().top; + var dropdown = $(e.target).next('.dropdown-menu'); + if (position < dropdown.height()) { + dropdown.addClass('bottom'); + } + } createDropdown() { var post = this.props.post; var isOwner = UserStore.getCurrentId() === post.user_id; @@ -133,6 +141,7 @@ export default class PostInfo extends React.Component { type='button' data-toggle='dropdown' aria-expanded='false' + onClick={this.dropdownPosition} /> <ul className='dropdown-menu' diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 323691d89..5d0985fc0 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -396,8 +396,8 @@ body.ios { .post-list__content { display: table-cell; vertical-align: bottom; - > div:last-child { - .dropdown-menu { + .dropdown-menu { + &.bottom { top: auto; bottom: 25px; } diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index bd3d60622..01be9e288 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -11,7 +11,15 @@ .post-right-comments-container { position: relative; - padding: 0.7em 0 0; + + .post { + + &:first-child { + padding-top: 15px; + } + + } + } .post { @@ -19,6 +27,11 @@ &.post--root { padding-bottom: 1.2em; border-bottom: 1px solid #ddd; + + .post__body { + background: transparent !important; + } + } .post__header { |