diff --git a/resources/celerity/map.php b/resources/celerity/map.php index eb619a05f4..027855553b 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'ab6cb6b8', + 'core.pkg.css' => 'bb7485ba', 'core.pkg.js' => '573e6664', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '2de124c9', @@ -141,7 +141,7 @@ return array( 'rsrc/css/phui/phui-info-view.css' => '6d7c3509', 'rsrc/css/phui/phui-list.css' => '9da2aa00', 'rsrc/css/phui/phui-object-box.css' => '407eaf5a', - 'rsrc/css/phui/phui-object-item-list-view.css' => 'bbc929b3', + 'rsrc/css/phui/phui-object-item-list-view.css' => '0d484a97', 'rsrc/css/phui/phui-pager.css' => 'bea33d23', 'rsrc/css/phui/phui-pinboard-view.css' => '2495140e', 'rsrc/css/phui/phui-profile-menu.css' => 'fa814ef9', @@ -817,7 +817,7 @@ return array( 'phui-inline-comment-view-css' => '0fdb3667', 'phui-list-view-css' => '9da2aa00', 'phui-object-box-css' => '407eaf5a', - 'phui-object-item-list-view-css' => 'bbc929b3', + 'phui-object-item-list-view-css' => '0d484a97', 'phui-pager-css' => 'bea33d23', 'phui-pinboard-view-css' => '2495140e', 'phui-profile-menu-css' => 'fa814ef9', diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php index c0d7b003b2..1ee02debac 100644 --- a/src/applications/project/controller/PhabricatorProjectProfileController.php +++ b/src/applications/project/controller/PhabricatorProjectProfileController.php @@ -49,12 +49,14 @@ final class PhabricatorProjectProfileController ->setUser($viewer) ->setProject($project) ->setLimit(5) + ->setBackground(PHUIBoxView::GREY) ->setUserPHIDs($project->getMemberPHIDs()); $watcher_list = id(new PhabricatorProjectWatcherListView()) ->setUser($viewer) ->setProject($project) ->setLimit(5) + ->setBackground(PHUIBoxView::GREY) ->setUserPHIDs($project->getWatcherPHIDs()); $nav = $this->getProfileMenu(); diff --git a/src/applications/project/view/PhabricatorProjectUserListView.php b/src/applications/project/view/PhabricatorProjectUserListView.php index fe1a2c0f82..58c9a4ae0e 100644 --- a/src/applications/project/view/PhabricatorProjectUserListView.php +++ b/src/applications/project/view/PhabricatorProjectUserListView.php @@ -5,6 +5,7 @@ abstract class PhabricatorProjectUserListView extends AphrontView { private $project; private $userPHIDs; private $limit; + private $background; public function setProject(PhabricatorProject $project) { $this->project = $project; @@ -33,6 +34,11 @@ abstract class PhabricatorProjectUserListView extends AphrontView { return $this->limit; } + public function setBackground($color) { + $this->background = $color; + return $this; + } + abstract protected function canEditList(); abstract protected function getNoDataString(); abstract protected function getRemoveURI($phid); @@ -80,7 +86,7 @@ abstract class PhabricatorProjectUserListView extends AphrontView { ->setImageURI($handle->getImageURI()); $icon = id(new PHUIIconView()) - ->setIconFont($handle->getIcon().' grey'); + ->setIconFont($handle->getIcon().' lightbluetext'); $subtitle = $handle->getSubtitle(); @@ -125,10 +131,15 @@ abstract class PhabricatorProjectUserListView extends AphrontView { ->setHref("/project/members/{$id}/")); } - return id(new PHUIObjectBoxView()) + $box = id(new PHUIObjectBoxView()) ->setHeader($header) - ->setObjectList($list) - ->setBackground(PHUIBoxView::GREY); + ->setObjectList($list); + + if ($this->background) { + $box->setBackground($this->background); + } + + return $box; } } diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css index 6b63bf263b..b1e718cc6a 100644 --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -735,10 +735,9 @@ ul.phui-object-item-list-view .phui-object-item-selected .phui-object-item-image { width: 40px; height: 40px; - box-shadow: inset 0 0 0 1px rgba(55,55,55,.15); border-radius: 3px; background-size: 100%; - margin: 6px; + margin: 8px 6px; position: absolute; }