From 25fdacd46a4dc5f5166607777bbbcfd3cea87a63 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 13 Nov 2015 11:59:15 +0500
Subject: [PATCH 1/2] UI changes for Direct messages and Bad connection

---
 config/config.json                            | 2 +-
 web/react/components/more_direct_channels.jsx | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/config.json b/config/config.json
index a927620b5c..dc35a369d0 100644
--- a/config/config.json
+++ b/config/config.json
@@ -9,7 +9,7 @@
         "EnableOutgoingWebhooks": true,
         "EnablePostUsernameOverride": false,
         "EnablePostIconOverride": false,
-        "EnableTesting": false,
+        "EnableTesting": true,
         "EnableSecurityFixAlert": true
     },
     "TeamSettings": {
diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx
index 40deb37f28..d1265f67eb 100644
--- a/web/react/components/more_direct_channels.jsx
+++ b/web/react/components/more_direct_channels.jsx
@@ -50,6 +50,10 @@ export default class MoreDirectChannels extends React.Component {
     handleFilterChange() {
         const filter = ReactDOM.findDOMNode(this.refs.filter).value;
 
+        if ($(window).width() > 768) {
+            $(ReactDOM.findDOMNode(this.refs.userList)).scrollTop(0);
+        }
+
         if (filter !== this.state.filter) {
             this.setState({filter});
         }

From e16faf45de24898b250227833d20d154e4d9c0c8 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 13 Nov 2015 12:21:43 +0500
Subject: [PATCH 2/2] Updating bad connection css

---
 config/config.json                      | 2 +-
 web/sass-files/sass/partials/_post.scss | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/config.json b/config/config.json
index dc35a369d0..a927620b5c 100644
--- a/config/config.json
+++ b/config/config.json
@@ -9,7 +9,7 @@
         "EnableOutgoingWebhooks": true,
         "EnablePostUsernameOverride": false,
         "EnablePostIconOverride": false,
-        "EnableTesting": true,
+        "EnableTesting": false,
         "EnableSecurityFixAlert": true
     },
     "TeamSettings": {
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 36f6f445ee..ae02ccb4cb 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -16,7 +16,8 @@
 }
 
 .bad-connection {
-	background-color: rgb(255, 255, 172) !important;
+	background: #ffffac !important;
+	color: #D04444 !important;
 }
 
 .textarea-div {