From 61f5461e6de9e36375e0aaadaab52b2511d22133 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Tue, 3 Dec 2013 21:48:03 -0800
Subject: [PATCH] Fix Conpherence CSS (mostly revert)

Summary: Fixes D7669

Test Plan: test many participants and many threads in Conpherence, mobile and desktop.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: Korvin, epriestley, aran

Differential Revision: https://secure.phabricator.com/D7696
---
 src/__celerity_resource_map__.php                        | 6 +++---
 webroot/rsrc/css/application/conpherence/menu.css        | 9 ++++++++-
 .../rsrc/css/application/conpherence/message-pane.css    | 4 +++-
 webroot/rsrc/css/application/conpherence/widget-pane.css | 8 ++++++--
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index f5501e895d..b3280faf28 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -993,7 +993,7 @@ celerity_register_resource_map(array(
   ),
   'conpherence-menu-css' =>
   array(
-    'uri' => '/res/4c356703/rsrc/css/application/conpherence/menu.css',
+    'uri' => '/res/cd61e53d/rsrc/css/application/conpherence/menu.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -1002,7 +1002,7 @@ celerity_register_resource_map(array(
   ),
   'conpherence-message-pane-css' =>
   array(
-    'uri' => '/res/3627d418/rsrc/css/application/conpherence/message-pane.css',
+    'uri' => '/res/d3ccc391/rsrc/css/application/conpherence/message-pane.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -1029,7 +1029,7 @@ celerity_register_resource_map(array(
   ),
   'conpherence-widget-pane-css' =>
   array(
-    'uri' => '/res/b80fc69c/rsrc/css/application/conpherence/widget-pane.css',
+    'uri' => '/res/a1ebb7cc/rsrc/css/application/conpherence/widget-pane.css',
     'type' => 'css',
     'requires' =>
     array(
diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css
index c562301add..9a3b858e45 100644
--- a/webroot/rsrc/css/application/conpherence/menu.css
+++ b/webroot/rsrc/css/application/conpherence/menu.css
@@ -3,7 +3,12 @@
  */
 
 .conpherence-layout {
-  position: relative;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  top: 44px;
+  background: #fff;
 }
 
 .conpherence-layout .conpherence-no-threads {
@@ -32,6 +37,8 @@
   position: absolute;
   overflow-x: hidden;
   overflow-y: auto;
+  top: 0;
+  bottom: 0;
 }
 
 .device-desktop .conpherence-layout .conpherence-menu-pane,
diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css
index c6ad4e9a3c..6f7d633d3b 100644
--- a/webroot/rsrc/css/application/conpherence/message-pane.css
+++ b/webroot/rsrc/css/application/conpherence/message-pane.css
@@ -13,7 +13,6 @@
   bottom: 0px;
   min-width: 300px;
   width: auto;
-  background: #fff;
 }
 
 .device .conpherence-message-pane,
@@ -136,6 +135,9 @@
   margin: 5px 15px;
   min-height: auto;
 }
+.device-phone .conpherence-message-pane .date-marker {
+  margin: 5px 0;
+}
 .conpherence-message-pane .date-marker .date {
   position: relative;
   top: -8px;
diff --git a/webroot/rsrc/css/application/conpherence/widget-pane.css b/webroot/rsrc/css/application/conpherence/widget-pane.css
index d564e41e9c..c39e97a94c 100644
--- a/webroot/rsrc/css/application/conpherence/widget-pane.css
+++ b/webroot/rsrc/css/application/conpherence/widget-pane.css
@@ -6,13 +6,13 @@
 .loading .widgets-loading-mask {
   position: fixed;
   right: 0px;
+  top: 76px;
+  bottom: 0;
   width: 240px;
   border-width: 0 0 0 1px;
   border-color: {$lightblueborder};
   border-style: solid;
   overflow-y: auto;
-  background: #fff;
-  height: 100%;
   -webkit-overflow-scrolling: touch;
 }
 
@@ -68,7 +68,10 @@
 }
 
 .conpherence-widget-pane .widgets-body {
+  position: fixed;
   overflow-y: auto;
+  bottom: 0;
+  top: 76px;
   width: 100%;
 }
 
@@ -77,6 +80,7 @@
 }
 
 .device-desktop .conpherence-widget-pane .widgets-body {
+  top: 108px;
   width: 240px;
 }