diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 59fd851a1c..5a92509bba 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'adb53fe7', + 'core.pkg.css' => '8be366b7', 'core.pkg.js' => '65e04767', 'darkconsole.pkg.js' => '8ab24e01', 'differential.pkg.css' => '8af45893', @@ -137,7 +137,7 @@ return array( 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', 'rsrc/css/phui/phui-list.css' => '53deb25c', 'rsrc/css/phui/phui-object-box.css' => 'b8b7fd78', - 'rsrc/css/phui/phui-object-item-list-view.css' => 'ace03f3e', + 'rsrc/css/phui/phui-object-item-list-view.css' => '2670a4a9', 'rsrc/css/phui/phui-pinboard-view.css' => '3dd4a269', 'rsrc/css/phui/phui-property-list-view.css' => '51480060', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', @@ -785,7 +785,7 @@ return array( 'phui-info-panel-css' => '27ea50a1', 'phui-list-view-css' => '53deb25c', 'phui-object-box-css' => 'b8b7fd78', - 'phui-object-item-list-view-css' => 'ace03f3e', + 'phui-object-item-list-view-css' => '2670a4a9', 'phui-pinboard-view-css' => '3dd4a269', 'phui-property-list-view-css' => '51480060', 'phui-remarkup-preview-css' => '19ad512b', diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php index 812615fa45..5a2e4dd79d 100644 --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -778,7 +778,6 @@ final class DifferentialRevisionViewController extends DifferentialController { $user = $this->getRequest()->getUser(); $view = id(new DifferentialRevisionListView()) - ->setHeader(pht('Open Revisions Affecting These Files')) ->setRevisions($revisions) ->setUser($user); @@ -786,7 +785,9 @@ final class DifferentialRevisionViewController extends DifferentialController { $handles = $this->loadViewerHandles($phids); $view->setHandles($handles); - return $view; + return id(new PHUIObjectBoxView()) + ->setHeaderText(pht('Open Revisions Affecting These Files')) + ->appendChild($view); } diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php index 5f390f9ded..956819aead 100644 --- a/src/applications/differential/view/DifferentialRevisionListView.php +++ b/src/applications/differential/view/DifferentialRevisionListView.php @@ -179,16 +179,9 @@ final class DifferentialRevisionListView extends AphrontView { $list->addItem($item); } + $list->setHeader($this->header); $list->setNoDataString($this->noDataString); - - if ($this->header) { - $list->setFlush(true); - $list = id(new PHUIObjectBoxView()) - ->setHeaderText($this->header) - ->appendChild($list); - } - return $list; } diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php index 84ea0fe721..e7785ad267 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseController.php @@ -208,7 +208,6 @@ abstract class DiffusionBrowseController extends DiffusionController { } $view = id(new DifferentialRevisionListView()) - ->setHeader(pht('Pending Differential Revisions')) ->setRevisions($revisions) ->setUser($user); @@ -216,7 +215,9 @@ abstract class DiffusionBrowseController extends DiffusionController { $handles = $this->loadViewerHandles($phids); $view->setHandles($handles); - return $view; + return id(new PHUIObjectBoxView()) + ->setHeaderText(pht('Pending Differential Revisions')) + ->appendChild($view); } } 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 8be1231128..13a312fb4d 100644 --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -61,10 +61,6 @@ ul.phui-object-item-list-view { margin: 0 0 4px 0; } -.phui-object-box .phui-object-list-flush .phui-object-item { - margin: 0; -} - .phui-object-item-name { font-weight: bold; padding: 8px 8px 0;