summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-08-18 08:56:24 -0400
committerChristopher Speller <crspeller@gmail.com>2015-08-18 08:56:24 -0400
commit4805608cc9cf79277f37b94bbe38398816469884 (patch)
tree167962b7f56a4213dc0c945b33ed446fac9c5891 /web/react/components
parent390cb47ec37c0bbddb829cae9cefeb8e0e97b7a1 (diff)
parentf68a8c8de3bbaf0179023e12da89c6f22f5b21a7 (diff)
downloadchat-4805608cc9cf79277f37b94bbe38398816469884.tar.gz
chat-4805608cc9cf79277f37b94bbe38398816469884.tar.bz2
chat-4805608cc9cf79277f37b94bbe38398816469884.zip
Merge pull request #391 from asaadmahmoodspin/master
Multiple UI changes
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/get_link_modal.jsx2
-rw-r--r--web/react/components/post_list.jsx3
-rw-r--r--web/react/components/sidebar.jsx2
3 files changed, 5 insertions, 2 deletions
diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx
index ea22ad0f3..a01b57b26 100644
--- a/web/react/components/get_link_modal.jsx
+++ b/web/react/components/get_link_modal.jsx
@@ -34,7 +34,7 @@ module.exports = React.createClass({
var copyLinkConfirm = null;
if (this.state.copiedLink) {
- copyLinkConfirm = <p className='copy-link-confirm'>Link copied to clipboard.</p>;
+ copyLinkConfirm = <p className='alert alert-success copy-link-confirm'><i className="fa fa-check"></i> Link copied to clipboard.</p>;
}
if (currentUser != null) {
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index fa74d4295..8c76eb82c 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -42,6 +42,9 @@ module.exports = React.createClass({
utils.changeCss('.modal .modal-header', 'background: ' + user.props.theme+';');
utils.changeCss('.mention', 'background: ' + user.props.theme+';');
utils.changeCss('.mention-link', 'color: ' + user.props.theme+';');
+ utils.changeCss('.mention-link', 'color: ' + user.props.theme+';');
+ utils.changeCss('.mention-link', 'color: ' + user.props.theme+';');
+ utils.changeCss('.search-item-container:hover', 'background: ' + utils.changeOpacity(user.props.theme, 0.05) +';');
utils.changeCss('@media(max-width: 768px){.search-bar__container', 'background: ' + user.props.theme+';}');
}
if (user.props.theme != '#000000' && user.props.theme != '#585858') {
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index a8496b385..6735bd6e5 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -366,8 +366,8 @@ module.exports = React.createClass({
<li key={channel.name} ref={channel.name} className={linkClass}>
<a className={'sidebar-channel ' + titleClass} href={href} onClick={clickHandler}>
{status}
- {badge}
{channel.display_name}
+ {badge}
</a>
</li>
);