diff options
-rw-r--r-- | web/react/components/mention_list.jsx | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post_right.scss | 13 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--right.scss | 6 |
3 files changed, 13 insertions, 8 deletions
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx index 25834b9e5..ba2c53612 100644 --- a/web/react/components/mention_list.jsx +++ b/web/react/components/mention_list.jsx @@ -137,7 +137,7 @@ module.exports = React.createClass({ return ( <div className="mentions--top" style={{height: height, width: width, bottom: bottom, left: left}}> - <div ref="mentionlist" className="mentions-box" style={{maxHeight: max_height, height: height, width: width}}> + <div ref="mentionlist" className="mentions-box" style={{height: height, width: width}}> { mentions } </div> </div> diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index 0d3e75689..8816393c8 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -21,10 +21,21 @@ } .post-create__container { - margin-top: 1em; + margin-top: 10px; + .textarea-wrapper { + min-height: 100px; + } .custom-textarea { min-height: 100px; } + .msg-typing { + color: #555; + float: left; + padding-top: 17px; + } + .post-create-footer { + padding-top: 10px; + } } } diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index 7a91caec9..a0e82fd2f 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -27,12 +27,6 @@ margin: 3px 0 0; } } - .post-create__container { - margin-top: 10px; - .post-create-footer { - padding-top: 10px; - } - } .sidebar__overlay { width: 100%; height: 100%; |