Multiple UI Improvements

web/react/utils/constants.jsx

@@ -166,29 +166,6 @@ export default {
     UPDATE_TYPING_MS: 5000,
     THEMES: {
         default: {
-            type: 'Mattermost',
-            sidebarBg: '#fafafa',
-            sidebarText: '#333333',
-            sidebarUnreadText: '#333333',
-            sidebarTextHoverBg: '#e6f2fa',
-            sidebarTextActiveBorder: '#378FD2',
-            sidebarTextActiveColor: '#111111',
-            sidebarHeaderBg: '#2389d7',
-            sidebarHeaderTextColor: '#ffffff',
-            onlineIndicator: '#7DBE00',
-            mentionBj: '#2389d7',
-            mentionColor: '#ffffff',
-            centerChannelBg: '#ffffff',
-            centerChannelColor: '#333333',
-            newMessageSeparator: '#FF8800',
-            linkColor: '#2389d7',
-            buttonBg: '#2389d7',
-            buttonColor: '#FFFFFF',
-            mentionHighlightBg: '#fff2bb',
-            mentionHighlightLink: '#2f81b7',
-            codeTheme: 'github'
-        },
-        organization: {
             type: 'Organization',
             sidebarBg: '#2071a7',
             sidebarText: '#fff',
@@ -211,6 +188,29 @@ export default {
             mentionHighlightLink: '#2f81b7',
             codeTheme: 'github'
         },
+        mattermost: {
+            type: 'Mattermost',
+            sidebarBg: '#fafafa',
+            sidebarText: '#333333',
+            sidebarUnreadText: '#333333',
+            sidebarTextHoverBg: '#e6f2fa',
+            sidebarTextActiveBorder: '#378FD2',
+            sidebarTextActiveColor: '#111111',
+            sidebarHeaderBg: '#2389d7',
+            sidebarHeaderTextColor: '#ffffff',
+            onlineIndicator: '#7DBE00',
+            mentionBj: '#2389d7',
+            mentionColor: '#ffffff',
+            centerChannelBg: '#ffffff',
+            centerChannelColor: '#333333',
+            newMessageSeparator: '#FF8800',
+            linkColor: '#2389d7',
+            buttonBg: '#2389d7',
+            buttonColor: '#FFFFFF',
+            mentionHighlightBg: '#fff2bb',
+            mentionHighlightLink: '#2f81b7',
+            codeTheme: 'github'
+        },
         mattermostDark: {
             type: 'Mattermost Dark',
             sidebarBg: '#1B2C3E',