Merge pull request #934 from asaadmahmoodspin/ui-improvements

Multiple UI Improvements

8 files changed, 51 insertions, 21 deletions

diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 67414dc3b..aba63b91c 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -138,7 +138,8 @@ module.exports = {
             newMessageSeparator: '#FF8800',
             linkColor: '#2389d7',
             buttonBg: '#2389d7',
-            buttonColor: '#FFFFFF'
+            buttonColor: '#FFFFFF',
+            mentionHighlightBg: '#fff2bb'
         },
         organization: {
             type: 'Organization',
@@ -159,7 +160,8 @@ module.exports = {
             newMessageSeparator: '#FF8800',
             linkColor: '#2f81b7',
             buttonBg: '#1dacfc',
-            buttonColor: '#FFFFFF'
+            buttonColor: '#FFFFFF',
+            mentionHighlightBg: '#fff2bb'
         },
         mattermostDark: {
             type: 'Mattermost Dark',
@@ -180,15 +182,16 @@ module.exports = {
             newMessageSeparator: '#5de5da',
             linkColor: '#A4FFEB',
             buttonBg: '#4CBBA4',
-            buttonColor: '#FFFFFF'
+            buttonColor: '#FFFFFF',
+            mentionHighlightBg: '#338886'
         },
         windows10: {
             type: 'Windows Dark',
             sidebarBg: '#171717',
-            sidebarText: '#eee',
+            sidebarText: '#999',
             sidebarUnreadText: '#fff',
             sidebarTextHoverBg: '#302e30',
-            sidebarTextHoverColor: '#fff',
+            sidebarTextHoverColor: '#999',
             sidebarTextActiveBg: '#484748',
             sidebarTextActiveColor: '#FFFFFF',
             sidebarHeaderBg: '#1f1f1f',
@@ -201,7 +204,8 @@ module.exports = {
             newMessageSeparator: '#CC992D',
             linkColor: '#0177e7',
             buttonBg: '#0177e7',
-            buttonColor: '#FFFFFF'
+            buttonColor: '#FFFFFF',
+            mentionHighlightBg: '#276198'
         }
     },
     THEME_ELEMENTS: [
@@ -263,7 +267,7 @@ module.exports = {
         },
         {
             id: 'newMessageSeparator',
-            uiName: 'New message separator'
+            uiName: 'New Message Separator'
         },
         {
             id: 'linkColor',
@@ -273,10 +277,13 @@ module.exports = {
             id: 'buttonBg',
             uiName: 'Button BG'
         },
-
         {
             id: 'buttonColor',
             uiName: 'Button Text'
+        },
+        {
+            id: 'mentionHighlightBg',
+            uiName: 'Mention Highlight BG'
         }
     ]
 };
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 307a311ab..b51d71254 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -468,6 +468,7 @@ export function applyTheme(theme) {
         changeCss('.date-separator .separator__text, .new-separator .separator__text', 'background:' + theme.centerChannelBg, 1);
         changeCss('.post-image__column .post-image__details', 'background:' + theme.centerChannelBg, 1);
         changeCss('.sidebar--right, .dropdown-menu, .popover', 'background:' + theme.centerChannelBg, 1);
+        changeCss('.search-bar__container .search__form .search-bar, .form-control', 'background:' + theme.centerChannelBg, 1);
     }
 
     if (theme.centerChannelColor) {
@@ -491,20 +492,21 @@ export function applyTheme(theme) {
         changeCss('.post-image__column', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 2);
         changeCss('.post-image__column .post-image__details', 'color:' + theme.centerChannelColor, 2);
         changeCss('.post-image__column a, .post-image__column a:hover, .post-image__column a:focus', 'color:' + theme.centerChannelColor, 1);
-        changeCss('.search-bar__container .search__form .search-bar', 'background: transparent; color:' + theme.centerChannelColor, 1);
+        changeCss('.search-bar__container .search__form .search-bar, .form-control', 'color:' + theme.centerChannelColor, 2);
         changeCss('@media(max-width: 768px){.search-bar__container .search__form .search-bar', 'background:' + changeOpacity(theme.centerChannelColor, 0.2) + '; color: inherit;', 1);
-        changeCss('.search-bar__container .search__form', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
+        changeCss('.search-bar__container .search__form, .form-control', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
+        changeCss('.form-control:focus', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.3), 1);
         changeCss('.channel-intro .channel-intro__content', 'background:' + changeOpacity(theme.centerChannelColor, 0.05), 1);
         changeCss('.date-separator .separator__text', 'color:' + theme.centerChannelColor, 2);
         changeCss('.date-separator .separator__hr, .modal-footer, .modal .custom-textarea, .post-right__container .post.post--root hr, .search-item-container', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
         changeCss('.modal .custom-textarea:focus', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.3), 1);
         changeCss('.channel-intro, .settings-modal .settings-table .settings-content .divider-dark, hr, .settings-modal .settings-table .settings-links', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
         changeCss('.post.current--user .post-body, .post.post--comment.other--root.current--user .post-comment', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
-        changeCss('.post.current--user .post-body, .post.post--comment.other--root.current--user .post-comment, .post.post--comment.other--root .post-comment, .post.same--root .post-body', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.07), 2);
+        changeCss('.post.current--user .post-body, .post.post--comment.other--root.current--user .post-comment, .post.post--comment.other--root .post-comment, .post.same--root .post-body, .modal .more-channel-table tbody>tr td, .member-div:first-child, .member-div', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.1), 2);
         changeCss('@media(max-width: 1440px){.post.same--root', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.07), 2);
         changeCss('@media(max-width: 1440px){.post.same--root', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.07), 2);
         changeCss('@media(max-width: 1800px){.inner__wrap.move--left .post.post--comment.same--root', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.07), 2);
-        changeCss('.post:hover, .sidebar--right .sidebar--right__header, .settings-modal .settings-table .settings-content .section-min:hover', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
+        changeCss('.post:hover, .modal .more-channel-table tbody>tr:hover td, .sidebar--right .sidebar--right__header, .settings-modal .settings-table .settings-content .section-min:hover', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
         changeCss('.date-separator.hovered--before:after, .date-separator.hovered--after:before, .new-separator.hovered--after:before, .new-separator.hovered--before:after', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
         changeCss('.command-name:hover, .mentions-name:hover, .mentions-focus, .dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover', 'background:' + changeOpacity(theme.centerChannelColor, 0.15), 1);
         changeCss('.post.current--user:hover .post-body ', 'background: none;', 1);
@@ -529,6 +531,10 @@ export function applyTheme(theme) {
     if (theme.buttonColor) {
         changeCss('.btn.btn-primary', 'color:' + theme.buttonColor, 2);
     }
+
+    if (theme.mentionHighlightBg) {
+        changeCss('.mention-highlight, .search-highlight', 'background:' + theme.mentionHighlightBg, 1);
+    }
 }
 export function changeCss(className, classValue, classRepeat) {
     // we need invisible container to store additional css definitions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 841db7c5a..4237ee1fa 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -97,6 +97,9 @@ a:focus, a:hover {
 
 .form-control {
   @include border-radius(2px);
+  &:focus {
+    @include box-shadow(none);
+  }
   &.no-resize {
     resize: none;
   }
@@ -120,6 +123,10 @@ a:focus, a:hover {
   z-index: 100;
 }
 
+.nav>li>a:focus, .nav>li>a:hover {
+  background: transparent;
+}
+
 .btn {
   @include single-transition(all, 0.25s, ease-in);
   @include border-radius(1px);
diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index a2bd0dcea..fb74eb4f5 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -57,5 +57,11 @@
 
 .mention-highlight {
 	background-color:#fff2bb;
-	color: #333;
+	a {
+		color: inherit;
+		text-decoration: underline;
+		&:hover, &:active {
+			color: inherit;
+		}
+	}
 }
\ No newline at end of file
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 96b26f251..2722333a4 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -144,11 +144,10 @@
 			font-size: 0.9em;
 			overflow: hidden;
 			text-overflow: ellipsis;
-			color: #999;
+			@include opacity(0.8);
 			margin: 5px 0;
 		}
 		.more-channel-name {
-			color: #444;
 			font-weight: 600;
 			font-size: 0.95em;
 		}
diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss
index bcb8b5eac..a7b1ab190 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -104,7 +104,13 @@
 	padding: 10px;
 }
 
-.search-highlight.theme, .search-highlight {
+.search-highlight {
 	background-color: #FFF2BB;
-	color: #333;
+	a {
+		color: inherit;
+		text-decoration: underline;
+		&:hover, &:active {
+			color: inherit;
+		}
+	}
 }
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 42475efd5..9369cc097 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -240,10 +240,6 @@
     margin-right:5px;
 }
 
-.member-list-holder {
-    background-color:#fff;
-}
-
 .member-div {
     border-bottom:1px solid lightgrey;
     position:relative;
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index 924f0718a..47235eb50 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -12,6 +12,9 @@
     &.padding--less {
         padding-top: 50px;
     }
+    .form-control:focus {
+        @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6));
+    }
 
     h1, h2, h3, h4, h5, h6, p {
         line-height: 1.3;