Merge pull request #391 from asaadmahmoodspin/master

Multiple UI changes

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 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>
             );
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 2312fe225..32793809d 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -857,6 +857,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;