From e9c7310e836f3fdbafc6d41af3973c6b8031ff55 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 14 Apr 2015 14:56:35 -0700
Subject: [PATCH] Fix Conpherence scroll behavior in Firefox/Chrome

Summary: Ref T7825.

Test Plan:
  - In Firefox, Chrome, and Safari:
    - With a mouse and no mouse:
      - Sent messages in Conpherence.
      - Scrolled up and down in a thread.

Reviewers: chad, btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T7825

Differential Revision: https://secure.phabricator.com/D12416
---
 resources/celerity/map.php                                | 4 ++--
 webroot/rsrc/css/application/conpherence/message-pane.css | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index dcf0c7bcae..5f9bbd0898 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -45,7 +45,7 @@ return array(
     'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
     'rsrc/css/application/conpherence/durable-column.css' => '51c1e074',
     'rsrc/css/application/conpherence/menu.css' => 'f389e048',
-    'rsrc/css/application/conpherence/message-pane.css' => '00ceda0c',
+    'rsrc/css/application/conpherence/message-pane.css' => '75c23c74',
     'rsrc/css/application/conpherence/notification.css' => '72178795',
     'rsrc/css/application/conpherence/transaction.css' => '25138b7f',
     'rsrc/css/application/conpherence/update.css' => '1099a660',
@@ -517,7 +517,7 @@ return array(
     'config-welcome-css' => '6abd79be',
     'conpherence-durable-column-view' => '51c1e074',
     'conpherence-menu-css' => 'f389e048',
-    'conpherence-message-pane-css' => '00ceda0c',
+    'conpherence-message-pane-css' => '75c23c74',
     'conpherence-notification-css' => '72178795',
     'conpherence-thread-manager' => '0a5192c4',
     'conpherence-transaction-css' => '25138b7f',
diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css
index 47b33da8cc..91591e580c 100644
--- a/webroot/rsrc/css/application/conpherence/message-pane.css
+++ b/webroot/rsrc/css/application/conpherence/message-pane.css
@@ -56,9 +56,15 @@
   right: 241px;
   top: 76px;
   bottom: 172px;
+  overflow-x: hidden;
+  overflow-y: auto;
   -webkit-overflow-scrolling: touch;
 }
 
+.conpherence-messages.jx-scrollbar-frame {
+  overflow-y: hidden;
+}
+
 .conpherence-messages .jx-scrollbar-content > .conpherence-edited:first-child {
   padding-top: 20px;
 }