From 9ba430cca9e3721f95702cb6118c7c4099dc7c51 Mon Sep 17 00:00:00 2001 From: epriestley Date: Sat, 7 Mar 2015 09:54:22 -0800 Subject: [PATCH] Fix Conpherence durable scrollbar with no USB devices Summary: Ref T7014. When no devices are connected, we don't meaningfully activate `JX.Scrollbar` (by design), but there was no fallback overflow CSS. Also massage a couple of other CSS things to get sliiightly less broken behavior. Test Plan: - Disconnected USB devices; scrolled. - Connected USB devices; scrolled. Reviewers: btrahan, chad Reviewed By: chad Subscribers: epriestley Maniphest Tasks: T7014 Differential Revision: https://secure.phabricator.com/D12008 --- resources/celerity/map.php | 4 ++-- .../application/conpherence/durable-column.css | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 250f4ce3c7..b6a870abd9 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -44,7 +44,7 @@ return array( 'rsrc/css/application/config/config-welcome.css' => '6abd79be', 'rsrc/css/application/config/setup-issue.css' => '22270af2', 'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2', - 'rsrc/css/application/conpherence/durable-column.css' => '3b836442', + 'rsrc/css/application/conpherence/durable-column.css' => '1ef6ae75', 'rsrc/css/application/conpherence/menu.css' => 'c6ac5299', 'rsrc/css/application/conpherence/message-pane.css' => '5930260a', 'rsrc/css/application/conpherence/notification.css' => '04a6e10a', @@ -512,7 +512,7 @@ return array( 'changeset-view-manager' => 'fce415a0', 'config-options-css' => '7fedf08b', 'config-welcome-css' => '6abd79be', - 'conpherence-durable-column-view' => '3b836442', + 'conpherence-durable-column-view' => '1ef6ae75', 'conpherence-menu-css' => 'c6ac5299', 'conpherence-message-pane-css' => '5930260a', 'conpherence-notification-css' => '04a6e10a', diff --git a/webroot/rsrc/css/application/conpherence/durable-column.css b/webroot/rsrc/css/application/conpherence/durable-column.css index 4a305e85af..ec21650eef 100644 --- a/webroot/rsrc/css/application/conpherence/durable-column.css +++ b/webroot/rsrc/css/application/conpherence/durable-column.css @@ -70,20 +70,28 @@ .conpherence-durable-column-main { position: absolute; top: 44px; - bottom: 144px; + bottom: 136px; left: 0; right: 0; - overflow: hidden; + overflow-x: hidden; + overflow-y: auto; } .conpherence-durable-column-transactions { - padding: 8px 12px; + padding: 8px 12px 0; } .conpherence-durable-column-transactions .phabricator-transaction-view { background: none; margin: 0 10px 0 0; - padding: 0; + padding: 4px 0; + min-height: 0; +} + +.conpherence-durable-column-transactions + .phabricator-transaction-view + .conpherence-message { + word-wrap: break-word; } .conpherence-durable-column-transactions .phabricator-transaction-detail {