diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -73,7 +73,7 @@ 'rsrc/css/application/diffusion/diffusion-icons.css' => '23b31a1b', 'rsrc/css/application/diffusion/diffusion-readme.css' => 'b68a76e4', 'rsrc/css/application/diffusion/diffusion-repository.css' => 'b89e8c6c', - 'rsrc/css/application/diffusion/diffusion.css' => 'db8bbf58', + 'rsrc/css/application/diffusion/diffusion.css' => 'e46232d6', 'rsrc/css/application/feed/feed.css' => 'd8b6e3f8', 'rsrc/css/application/files/global-drag-and-drop.css' => '1d2713a4', 'rsrc/css/application/flag/flag.css' => '2b77be8d', @@ -567,7 +567,7 @@ 'differential-revision-history-css' => '8aa3eac5', 'differential-revision-list-css' => '93d2df7d', 'differential-table-of-contents-css' => 'bba788b9', - 'diffusion-css' => 'db8bbf58', + 'diffusion-css' => 'e46232d6', 'diffusion-icons-css' => '23b31a1b', 'diffusion-readme-css' => 'b68a76e4', 'diffusion-repository-css' => 'b89e8c6c', diff --git a/src/applications/diffusion/view/DiffusionCommitGraphView.php b/src/applications/diffusion/view/DiffusionCommitGraphView.php --- a/src/applications/diffusion/view/DiffusionCommitGraphView.php +++ b/src/applications/diffusion/view/DiffusionCommitGraphView.php @@ -164,29 +164,22 @@ $item_date = phabricator_date($item_epoch, $viewer); if ($item_date !== $last_date) { $last_date = $item_date; - $date_view = phutil_tag( - 'div', - array( - 'class' => 'diffusion-commit-graph-date-header', - ), - $item_date); + $header = $item_date; } else { - $date_view = null; + $header = null; } - $item_view = idx($views, $hash); - if ($item_view) { - $list_view = id(new PHUIObjectItemListView()) - ->setFlush(true) - ->addItem($item_view); - } else { - $list_view = null; + $item_view = $views[$hash]; + + $list_view = id(new PHUIObjectItemListView()) + ->setFlush(true) + ->addItem($item_view); + + if ($header !== null) { + $list_view->setHeader($header); } - $rows[] = array( - $date_view, - $list_view, - ); + $rows[] = $list_view; } return $rows; diff --git a/webroot/rsrc/css/application/diffusion/diffusion.css b/webroot/rsrc/css/application/diffusion/diffusion.css --- a/webroot/rsrc/css/application/diffusion/diffusion.css +++ b/webroot/rsrc/css/application/diffusion/diffusion.css @@ -102,10 +102,6 @@ color: {$darkbluetext}; } -.diffusion-history-list .diffusion-differential-tag { - margin-left: 4px; -} - /* - Branch Styles ----------------------------------------------------------*/ .diffusion-branch-list .phui-oi-attribute a { @@ -238,8 +234,9 @@ display: block; } -.diffusion-commit-graph-date-header { +.diffusion-commit-graph-table .phui-oi-list-header { color: {$darkgreytext}; font-weight: bold; - padding: 4px 0; + padding: 4px 4px; + font-size: {$normalfontsize}; }