From 98f7e751c7b76e7b2c323037fea81283df74c899 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Fri, 9 Sep 2016 20:53:40 -0700 Subject: [PATCH] Fix thread list in Conpherence when scrollbar is present Summary: This label is too wide when a !!wild scrollbar appears!! Test Plan: shrink height of tall thread list in Conpherence, see no wrapping. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D16536 --- resources/celerity/map.php | 10 +++++----- webroot/rsrc/css/application/conpherence/menu.css | 2 +- .../rsrc/css/application/conpherence/message-pane.css | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 7174bedd18..fe5f77b0e1 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'conpherence.pkg.css' => '06803437', + 'conpherence.pkg.css' => '1659749c', 'core.pkg.css' => '1ca373de', 'core.pkg.js' => '1d376fa9', 'darkconsole.pkg.js' => 'e7393ebb', @@ -46,8 +46,8 @@ return array( 'rsrc/css/application/config/setup-issue.css' => 'f794cfc3', 'rsrc/css/application/config/unhandled-exception.css' => '4c96257a', 'rsrc/css/application/conpherence/durable-column.css' => '194ac487', - 'rsrc/css/application/conpherence/menu.css' => '4c959efa', - 'rsrc/css/application/conpherence/message-pane.css' => '029bd52f', + 'rsrc/css/application/conpherence/menu.css' => '67235d90', + 'rsrc/css/application/conpherence/message-pane.css' => '97f3f6cf', 'rsrc/css/application/conpherence/notification.css' => '6cdcc253', 'rsrc/css/application/conpherence/transaction.css' => '2c71247c', 'rsrc/css/application/conpherence/update.css' => 'faf6be09', @@ -615,8 +615,8 @@ return array( 'config-options-css' => '0ede4c9b', 'config-page-css' => '8798e14f', 'conpherence-durable-column-view' => '194ac487', - 'conpherence-menu-css' => '4c959efa', - 'conpherence-message-pane-css' => '029bd52f', + 'conpherence-menu-css' => '67235d90', + 'conpherence-message-pane-css' => '97f3f6cf', 'conpherence-notification-css' => '6cdcc253', 'conpherence-thread-manager' => '01774ab2', 'conpherence-transaction-css' => '2c71247c', diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css index 58b41a7fd5..9cdd48cf90 100644 --- a/webroot/rsrc/css/application/conpherence/menu.css +++ b/webroot/rsrc/css/application/conpherence/menu.css @@ -174,7 +174,7 @@ color: {$darkbluetext}; text-shadow: 0px 1px 1px #fff; overflow: hidden; - width: 175px; + width: 165px; text-overflow: ellipsis; } diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css index 0f8a64d818..993e2fa905 100644 --- a/webroot/rsrc/css/application/conpherence/message-pane.css +++ b/webroot/rsrc/css/application/conpherence/message-pane.css @@ -74,8 +74,7 @@ padding-top: 20px; } -.conpherence-messages > .jx-scrollbar-content .conpherence-edited:last-child, -.conpherence-messages > .conpherence-edited:last-child { +.conpherence-messages .jx-scrollbar-content .conpherence-edited:last-child { padding-bottom: 20px; }