From b750c0a218aae63318c9bbf0501637b208ee6bfa Mon Sep 17 00:00:00 2001 From: Chad Little Date: Tue, 18 Oct 2016 21:13:53 -0700 Subject: [PATCH] Allow tablet breakpoint in Conpherence to have persistent participant pane Summary: tablet viewpoints here are wide enough to support the participant column, go ahead and give it dedicated space. Test Plan: review tablet, desktop, and mobile breakpoints in conpherence with column toggled on and off Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D16724 --- resources/celerity/map.php | 10 +++++----- .../css/application/conpherence/message-pane.css | 12 ++++++++++++ .../css/application/conpherence/participant-pane.css | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 9f13ec0351..51e462010e 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'conpherence.pkg.css' => '6412a825', + 'conpherence.pkg.css' => 'fabab894', 'conpherence.pkg.js' => 'cbe4d9be', 'core.pkg.css' => 'b99bbf5e', 'core.pkg.js' => '2d9fc958', @@ -49,9 +49,9 @@ return array( 'rsrc/css/application/conpherence/durable-column.css' => 'd82e130c', 'rsrc/css/application/conpherence/header-pane.css' => '1c81cda6', 'rsrc/css/application/conpherence/menu.css' => '4f51db5a', - 'rsrc/css/application/conpherence/message-pane.css' => 'b80f1675', + 'rsrc/css/application/conpherence/message-pane.css' => 'b499f371', 'rsrc/css/application/conpherence/notification.css' => '965db05b', - 'rsrc/css/application/conpherence/participant-pane.css' => '7bba0b56', + 'rsrc/css/application/conpherence/participant-pane.css' => 'ac1baaa8', 'rsrc/css/application/conpherence/transaction.css' => '85129c68', 'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4', 'rsrc/css/application/countdown/timer.css' => '16c52f5c', @@ -619,9 +619,9 @@ return array( 'conpherence-durable-column-view' => 'd82e130c', 'conpherence-header-pane-css' => '1c81cda6', 'conpherence-menu-css' => '4f51db5a', - 'conpherence-message-pane-css' => 'b80f1675', + 'conpherence-message-pane-css' => 'b499f371', 'conpherence-notification-css' => '965db05b', - 'conpherence-participant-pane-css' => '7bba0b56', + 'conpherence-participant-pane-css' => 'ac1baaa8', 'conpherence-thread-manager' => '358c717b', 'conpherence-transaction-css' => '85129c68', 'd3' => 'a11a5ff2', diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css index dd1eccfc80..db82a4a336 100644 --- a/webroot/rsrc/css/application/conpherence/message-pane.css +++ b/webroot/rsrc/css/application/conpherence/message-pane.css @@ -82,6 +82,12 @@ } .device .conpherence-message-pane .conpherence-messages { + left: 0; + bottom: 44px; + box-shadow: none; +} + +.device-phone .conpherence-message-pane .conpherence-messages { left: 0; right: 0; bottom: 44px; @@ -186,6 +192,12 @@ } .device .conpherence-message-pane .phui-form-view { + left: 0; + height: 34px; + width: auto; +} + +.device-phone .conpherence-message-pane .phui-form-view { left: 0; right: 0; height: 34px; diff --git a/webroot/rsrc/css/application/conpherence/participant-pane.css b/webroot/rsrc/css/application/conpherence/participant-pane.css index 94bedce84d..c72d098226 100644 --- a/webroot/rsrc/css/application/conpherence/participant-pane.css +++ b/webroot/rsrc/css/application/conpherence/participant-pane.css @@ -15,7 +15,7 @@ -webkit-overflow-scrolling: touch; } -.device .conpherence-participant-pane { +.device-phone .conpherence-participant-pane { background-color: {$page.background}; }