diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index ba4a652635..6404df7d5e 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/cae40b18/rsrc/css/application/conpherence/menu.css', + 'uri' => '/res/4c356703/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/150f96d4/rsrc/css/application/conpherence/message-pane.css', + 'uri' => '/res/3627d418/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/13478b94/rsrc/css/application/conpherence/widget-pane.css', + 'uri' => '/res/b80fc69c/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 08a5700332..c562301add 100644 --- a/webroot/rsrc/css/application/conpherence/menu.css +++ b/webroot/rsrc/css/application/conpherence/menu.css @@ -3,12 +3,7 @@ */ .conpherence-layout { - position: fixed; - bottom: 0; - left: 0; - right: 0; - top: 44px; - background: #fff; + position: relative; } .conpherence-layout .conpherence-no-threads { @@ -37,16 +32,17 @@ position: absolute; overflow-x: hidden; overflow-y: auto; - top: 0; - bottom: 0; } + .device-desktop .conpherence-layout .conpherence-menu-pane, .device-desktop .conpherence-layout .phabricator-nav-column-background { width: 280px; } + .device .conpherence-menu-pane { top: 41px; } + .device .conpherence-role-list .conpherence-menu-pane { top: 0px; } diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css index 2910805fff..c6ad4e9a3c 100644 --- a/webroot/rsrc/css/application/conpherence/message-pane.css +++ b/webroot/rsrc/css/application/conpherence/message-pane.css @@ -13,6 +13,7 @@ bottom: 0px; min-width: 300px; width: auto; + background: #fff; } .device .conpherence-message-pane, diff --git a/webroot/rsrc/css/application/conpherence/widget-pane.css b/webroot/rsrc/css/application/conpherence/widget-pane.css index 7a2e2d818d..d564e41e9c 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: 0px; width: 240px; border-width: 0 0 0 1px; - border-color: #CCC; + border-color: {$lightblueborder}; border-style: solid; overflow-y: auto; + background: #fff; + height: 100%; -webkit-overflow-scrolling: touch; } @@ -68,11 +68,8 @@ } .conpherence-widget-pane .widgets-body { - position: fixed; overflow-y: auto; - bottom: 0px; width: 100%; - top: 76px; } #widgets-settings { @@ -80,7 +77,6 @@ } .device-desktop .conpherence-widget-pane .widgets-body { - top: 108px; width: 240px; }