summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-08-18 11:58:15 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-08-18 11:58:15 +0500
commitf68a8c8de3bbaf0179023e12da89c6f22f5b21a7 (patch)
tree39bcd4725e376cd708b7ff002847217e015a4c02 /web/react
parenta5bff83558c737645c4a3d516047403f69080c2d (diff)
downloadchat-f68a8c8de3bbaf0179023e12da89c6f22f5b21a7.tar.gz
chat-f68a8c8de3bbaf0179023e12da89c6f22f5b21a7.tar.bz2
chat-f68a8c8de3bbaf0179023e12da89c6f22f5b21a7.zip
Multiple UI changes
Diffstat (limited to 'web/react')
-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
-rw-r--r--web/react/utils/utils.jsx14
4 files changed, 19 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 83f806b79..35d43314b 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 80e3632c7..cf6da7984 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -363,8 +363,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>
);
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 7591c138f..0de40b40c 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -855,6 +855,20 @@ module.exports.changeColor =function(col, amt) {
return (usePound?"#":"") + String("000000" + (g | (b << 8) | (r << 16)).toString(16)).slice(-6);
};
+module.exports.changeOpacity = function(oldColor, opacity) {
+
+ var col = oldColor;
+ if (col[0] === '#') {
+ col = col.slice(1);
+ }
+
+ var r = parseInt(col.substring(0, 2), 16);
+ var g = parseInt(col.substring(2, 4), 16);
+ var b = parseInt(col.substring(4, 6), 16);
+
+ return 'rgba(' + r + ',' + g + ',' + b + ',' + opacity + ')';
+};
+
module.exports.getFullName = function(user) {
if (user.first_name && user.last_name) {
return user.first_name + " " + user.last_name;