diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -45,7 +45,7 @@ 'rsrc/css/application/config/setup-issue.css' => '22270af2', 'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2', 'rsrc/css/application/conpherence/durable-column.css' => 'e2011d85', - 'rsrc/css/application/conpherence/menu.css' => '9b37a261', + 'rsrc/css/application/conpherence/menu.css' => '2c1c727c', 'rsrc/css/application/conpherence/message-pane.css' => '44154798', 'rsrc/css/application/conpherence/notification.css' => '04a6e10a', 'rsrc/css/application/conpherence/update.css' => '1099a660', @@ -515,7 +515,7 @@ 'config-options-css' => '7fedf08b', 'config-welcome-css' => '6abd79be', 'conpherence-durable-column-view' => 'e2011d85', - 'conpherence-menu-css' => '9b37a261', + 'conpherence-menu-css' => '2c1c727c', 'conpherence-message-pane-css' => '44154798', 'conpherence-notification-css' => '04a6e10a', 'conpherence-thread-manager' => 'bb928342', diff --git a/src/applications/conpherence/view/ConpherenceThreadListView.php b/src/applications/conpherence/view/ConpherenceThreadListView.php --- a/src/applications/conpherence/view/ConpherenceThreadListView.php +++ b/src/applications/conpherence/view/ConpherenceThreadListView.php @@ -111,7 +111,7 @@ array(), array( id(new PHUIIconView()) - ->addClass('mmr') + ->addClass('msr') ->setIconFont($thread->getPolicyIconName($policy_objects)), $data['title'], )); @@ -188,7 +188,8 @@ $menu->addMenuItem($item); } - $header = $this->renderMenuItemHeader(pht('Messages')); + $header = $this->renderMenuItemHeader( + pht('Messages'), 'conpherence-message-list-header'); $menu->addMenuItem($header); foreach ($conpherences as $conpherence) { @@ -208,10 +209,11 @@ return $menu; } - private function renderMenuItemHeader($title) { + private function renderMenuItemHeader($title, $class = null) { $item = id(new PHUIListItemView()) ->setType(PHUIListItemView::TYPE_LABEL) - ->setName($title); + ->setName($title) + ->addClass($class); return $item; } diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css --- a/webroot/rsrc/css/application/conpherence/menu.css +++ b/webroot/rsrc/css/application/conpherence/menu.css @@ -44,7 +44,11 @@ } .conpherence-menu-pane.phabricator-side-menu .phui-list-item-type-label { - padding: 8px 0 6px 8px; + padding: 10px 0 9px 8px; +} + +.conpherence-menu-pane .conpherence-message-list-header { + margin-top: 12px; } .device-desktop .conpherence-layout .conpherence-menu-pane { @@ -93,7 +97,7 @@ .conpherence-menu .conpherence-menu-item-view { display: block; - height: 38px; + height: 36px; overflow: hidden; position: relative; text-decoration: none; @@ -105,6 +109,10 @@ border-left: 3px solid {$sky}; } +.conpherence-menu .phui-list-item-type-link .phui-list-item-href { + padding: 8px 0 8px 8px; +} + .device-desktop .conpherence-menu .conpherence-selected.conpherence-menu-item-view:hover { background-color: {$hoverselectedgrey}; @@ -119,7 +127,7 @@ } .conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-image { - top: 5px; + top: 4px; left: 6px; display: block; position: absolute; @@ -131,7 +139,7 @@ .conpherence-menu .conpherence-menu-item-view .conpherence-menu-item-title { display: block; - margin-top: 10px; + margin-top: 9px; margin-left: 40px; text-align: left; font-weight: bold; @@ -151,7 +159,7 @@ .conpherence-menu-item-unread-count { position: absolute; right: 4px; - top: 11px; + top: 10px; background: {$blue}; border-radius: 2px; color: #fff;