From e344f57df11640028b4df3f9af5f0792da56db9c Mon Sep 17 00:00:00 2001 From: Chad Little Date: Fri, 25 Jan 2013 15:48:04 -0800 Subject: [PATCH] Conpherence CSS tweaks. Summary: Just a rough pass at the CSS on Conpherence. Need a second pass for the widgets. Test Plan: Reload Conpherence, Chrome, FF Reviewers: btrahan, epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4661 --- src/__celerity_resource_map__.php | 15 +++++++++---- .../controller/ConpherenceViewController.php | 2 +- .../application/conpherence/header-pane.css | 21 +++++++++++++----- .../rsrc/css/application/conpherence/menu.css | 7 ++++-- .../application/conpherence/message-pane.css | 9 ++++---- .../application/conpherence/widget-pane.css | 3 ++- webroot/rsrc/image/actions/edit.png | Bin 0 -> 410 bytes 7 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 webroot/rsrc/image/actions/edit.png diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index ed3ad5943c..3493867d34 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -7,6 +7,13 @@ */ celerity_register_resource_map(array( + '/rsrc/image/actions/edit.png' => + array( + 'hash' => 'ae90914d120ac3838ddc633b480343f3', + 'uri' => '/res/ae90914d/rsrc/image/actions/edit.png', + 'disk' => '/rsrc/image/actions/edit.png', + 'type' => 'png', + ), '/rsrc/image/avatar.png' => array( 'hash' => '1c5f255071537f05406adee86717ff27', @@ -727,7 +734,7 @@ celerity_register_resource_map(array( ), 'conpherence-header-pane-css' => array( - 'uri' => '/res/e50e02c8/rsrc/css/application/conpherence/header-pane.css', + 'uri' => '/res/4b8aebd2/rsrc/css/application/conpherence/header-pane.css', 'type' => 'css', 'requires' => array( @@ -736,7 +743,7 @@ celerity_register_resource_map(array( ), 'conpherence-menu-css' => array( - 'uri' => '/res/02b20456/rsrc/css/application/conpherence/menu.css', + 'uri' => '/res/0dc6b412/rsrc/css/application/conpherence/menu.css', 'type' => 'css', 'requires' => array( @@ -745,7 +752,7 @@ celerity_register_resource_map(array( ), 'conpherence-message-pane-css' => array( - 'uri' => '/res/799dc191/rsrc/css/application/conpherence/message-pane.css', + 'uri' => '/res/cbae8840/rsrc/css/application/conpherence/message-pane.css', 'type' => 'css', 'requires' => array( @@ -763,7 +770,7 @@ celerity_register_resource_map(array( ), 'conpherence-widget-pane-css' => array( - 'uri' => '/res/7af40cac/rsrc/css/application/conpherence/widget-pane.css', + 'uri' => '/res/b3e6a558/rsrc/css/application/conpherence/widget-pane.css', 'type' => 'css', 'requires' => array( diff --git a/src/applications/conpherence/controller/ConpherenceViewController.php b/src/applications/conpherence/controller/ConpherenceViewController.php index 173b3c5c47..531f08d55c 100644 --- a/src/applications/conpherence/controller/ConpherenceViewController.php +++ b/src/applications/conpherence/controller/ConpherenceViewController.php @@ -75,7 +75,7 @@ final class ConpherenceViewController extends 'class' => 'edit', 'href' => $edit_href, ), - pht('edit...') + '' ). phutil_render_tag( 'div', diff --git a/webroot/rsrc/css/application/conpherence/header-pane.css b/webroot/rsrc/css/application/conpherence/header-pane.css index 37acd45523..d007091de3 100644 --- a/webroot/rsrc/css/application/conpherence/header-pane.css +++ b/webroot/rsrc/css/application/conpherence/header-pane.css @@ -2,21 +2,29 @@ * @provides conpherence-header-pane-css */ +#conpherence-main-pane { + position: relative; +} + .conpherence-header-pane { border-bottom: 1px solid #ccc; background: #fff; - height: 50px; + height: 80px; width: 100%; } .conpherence-header-pane .edit { - position: relative; float: right; margin: 16px 16px 0px 0px; + height: 50px; + width: 50px; + background-image: url('/rsrc/image/actions/edit.png'); } .conpherence-header-pane .header-image { position: absolute; + top: 15px; + left: 15px; height: 50px; width: 50px; } @@ -24,16 +32,17 @@ .conpherence-header-pane .title { position: relative; font-size: 16px; - left: 62px; - top: 6px; + font-weight: bold; + left: 77px; + top: 21px; max-width: 80%; overflow-x: auto; } .conpherence-header-pane .subtitle { position: relative; - left: 62px; - top: 6px; + left: 77px; + top: 21px; color: #bfbfbf; max-width: 80%; } diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css index 07417b8be9..0558de8204 100644 --- a/webroot/rsrc/css/application/conpherence/menu.css +++ b/webroot/rsrc/css/application/conpherence/menu.css @@ -3,9 +3,12 @@ */ .no-conpherences-menu-item { - color: #ffffff; + color: #a1a5a9; border-top: solid 1px #3B3D3E; - padding: 20px 0px 20px 66px; + padding: 20px 0; + margin: 0px auto; + width: 320px; + text-align: center; } .conpherence-menu .phabricator-nav-column-background, diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css index 25975815c3..06153875e3 100644 --- a/webroot/rsrc/css/application/conpherence/message-pane.css +++ b/webroot/rsrc/css/application/conpherence/message-pane.css @@ -15,9 +15,10 @@ position: fixed; left: 320px; right: 321px; - top: 94px; + top: 124px; bottom: 225px; overflow-y: auto; + box-shadow: inset 1px 5px 5px rgba(0,0,0,0.1); } .conpherence-message-pane .phabricator-form-view { @@ -46,8 +47,7 @@ } .conpherence-message-pane .phabricator-transaction-view { - margin: 1em 1.25em 1em 1.25em; - display: block; + margin: 10px 0 10px 15px; } .conpherence-message-pane .phabricator-transaction-detail { @@ -67,8 +67,7 @@ } .conpherence-message-pane .conpherence-edited .phabricator-transaction-content { - font-size: 12px; - padding: 0em 1em 0em 1em; + padding: 0 1em 0 1em; margin-top: -4px; } diff --git a/webroot/rsrc/css/application/conpherence/widget-pane.css b/webroot/rsrc/css/application/conpherence/widget-pane.css index 9c5a3c0c8f..224adc2db5 100644 --- a/webroot/rsrc/css/application/conpherence/widget-pane.css +++ b/webroot/rsrc/css/application/conpherence/widget-pane.css @@ -5,12 +5,13 @@ .conpherence-widget-pane { position: fixed; right: 0px; - top: 94px; + top: 125px; width: 320px; height: 100%; border-width: 0 0 0 1px; border-color: #CCC; border-style: solid; + background: url('/rsrc/image/texture/dust_background.jpg'); } .conpherence-widget-pane .aphront-form-input { diff --git a/webroot/rsrc/image/actions/edit.png b/webroot/rsrc/image/actions/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..b12c39f62cd433570afdfa99c736df907ae14614 GIT binary patch literal 410 zcmV;L0cHM)P)hj^` z@8sz5_4fJe?)2Z|?$X)l+~Mux=kVG93g=FZjT$G90d<;TzB z@bdT2*XQZ%^Yirh#?RvI@Ab&gc!6D(b(wV z1I_Ot1