diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-08-13 20:03:40 +0500 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2015-08-18 08:59:27 -0400 |
commit | 7e2da89590bcdf4081b18c8ce4e0b2b244f671de (patch) | |
tree | 3d897c252863b5309546b5f8145949d6ff312dfe | |
parent | 265cf7d9f4f5e0f467fea290dfcd0a8b779c5c47 (diff) | |
download | chat-7e2da89590bcdf4081b18c8ce4e0b2b244f671de.tar.gz chat-7e2da89590bcdf4081b18c8ce4e0b2b244f671de.tar.bz2 chat-7e2da89590bcdf4081b18c8ce4e0b2b244f671de.zip |
MM-319 - Minor ui changes
-rw-r--r-- | web/react/components/post_body.jsx | 2 | ||||
-rw-r--r-- | web/react/components/post_right.jsx | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 33 |
3 files changed, 17 insertions, 20 deletions
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index 77a8fd7b5..7abf38838 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -63,7 +63,7 @@ module.exports = React.createClass({ var loading; if (post.state === Constants.POST_FAILED) { postClass += " post-fail"; - loading = <a className="post-retry pull-right" href="#" onClick={this.props.retryPost}>Retry</a>; + loading = <a className="theme post-retry pull-right" href="#" onClick={this.props.retryPost}>Retry</a>; } else if (post.state === Constants.POST_LOADING) { postClass += " post-waiting"; loading = <img className="post-loading-gif pull-right" src="/static/images/load.gif"/>; diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index 364cbf1b3..decb5fc2d 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -191,7 +191,7 @@ CommentPost = React.createClass({ var postClass = ''; if (post.state === Constants.POST_FAILED) { postClass += ' post-fail'; - loading = <a className='post-retry pull-right' href='#' onClick={this.retryComment}>Retry</a>; + loading = <a className='theme post-retry pull-right' href='#' onClick={this.retryComment}>Retry</a>; } else if (post.state === Constants.POST_LOADING) { postClass += ' post-waiting'; loading = <img className='post-loading-gif pull-right' src='/static/images/load.gif'/>; diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 1beebeac6..e665be6b9 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -315,6 +315,21 @@ body.ios { font-size: 0.97em; white-space: pre-wrap; } + + .post-loading-gif { + height:10px; + width:10px; + margin-top:6px; + } + + .post-fail { + color: #D58A8A; + } + + .post-waiting { + color: #999; + } + .comment-icon__container { margin-left: 7px; fill: $primary-color; @@ -461,21 +476,3 @@ body.ios { } } } - -.post-waiting { - color:lightgrey; -} - -.post-loading-gif { - height:10px; - width:10px; - margin-top:6px; -} - -.post-fail { - color:red; -} - -.post-retry { - color:darkgrey; -} |