Adding mention highlight setting and improving search highlight too

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,7 +182,8 @@ module.exports = {
             newMessageSeparator: '#5de5da',
             linkColor: '#A4FFEB',
             buttonBg: '#4CBBA4',
-            buttonColor: '#FFFFFF'
+            buttonColor: '#FFFFFF',
+            mentionHighlightBg: '#338886'
         },
         windows10: {
             type: 'Windows Dark',
@@ -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'
         }
     ]
 };

web/react/utils/utils.jsx

@@ -530,6 +530,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

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;
+		}
+	}
 }

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;
+		}
+	}
 }