diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 21997bb8bd..bc5be6754f 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,12 +7,12 @@ return array( 'names' => array( - 'core.pkg.css' => '6b846f5e', + 'core.pkg.css' => '6cdd937e', 'core.pkg.js' => '8335fe3f', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => '4a93db37', 'differential.pkg.js' => 'eca39a2c', - 'diffusion.pkg.css' => '3783278d', + 'diffusion.pkg.css' => '471bc9eb', 'diffusion.pkg.js' => '077e3ad0', 'maniphest.pkg.css' => 'f88a8402', 'maniphest.pkg.js' => 'd1347a35', @@ -29,7 +29,7 @@ return array( 'rsrc/css/aphront/panel-view.css' => '5846dfa2', 'rsrc/css/aphront/phabricator-nav-view.css' => '9283c2df', 'rsrc/css/aphront/request-failure-view.css' => 'da14df31', - 'rsrc/css/aphront/table-view.css' => 'c117956d', + 'rsrc/css/aphront/table-view.css' => 'b22b7216', 'rsrc/css/aphront/tokenizer.css' => '82ce2142', 'rsrc/css/aphront/tooltip.css' => '9c90229d', 'rsrc/css/aphront/transaction.css' => 'ce491938', @@ -62,7 +62,7 @@ return array( 'rsrc/css/application/differential/revision-list.css' => 'f3c47d33', 'rsrc/css/application/differential/table-of-contents.css' => '6bf8e1d2', 'rsrc/css/application/diffusion/commit-view.css' => '92d1e8f9', - 'rsrc/css/application/diffusion/diffusion-icons.css' => '384a0f7d', + 'rsrc/css/application/diffusion/diffusion-icons.css' => '9c5828da', 'rsrc/css/application/diffusion/diffusion-source.css' => '66fdf661', 'rsrc/css/application/feed/feed.css' => 'dd43ce00', 'rsrc/css/application/files/global-drag-and-drop.css' => '697324ad', @@ -491,7 +491,7 @@ return array( 'aphront-pager-view-css' => '2e3539af', 'aphront-panel-view-css' => '5846dfa2', 'aphront-request-failure-view-css' => 'da14df31', - 'aphront-table-view-css' => 'c117956d', + 'aphront-table-view-css' => 'b22b7216', 'aphront-tokenizer-control-css' => '82ce2142', 'aphront-tooltip-css' => '9c90229d', 'aphront-two-column-view-css' => '16ab3ad2', @@ -514,7 +514,7 @@ return array( 'differential-revision-list-css' => 'f3c47d33', 'differential-table-of-contents-css' => '6bf8e1d2', 'diffusion-commit-view-css' => '92d1e8f9', - 'diffusion-icons-css' => '384a0f7d', + 'diffusion-icons-css' => '9c5828da', 'diffusion-source-css' => '66fdf661', 'diviner-shared-css' => '38813222', 'font-fontawesome' => '73d075c3', diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php index 149b55da46..ce0ae0308d 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php @@ -287,7 +287,7 @@ final class DiffusionRepositoryController extends DiffusionController { } $icon = id(new PHUIIconView()) - ->setIconFont('fa-fork'); + ->setIconFont('fa-code-fork'); $button = new PHUIButtonView(); $button->setText(pht('Show All Branches')); @@ -486,6 +486,8 @@ final class DiffusionRepositoryController extends DiffusionController { $browse_exception, array $handles) { + require_celerity_resource('diffusion-icons-css'); + $request = $this->getRequest(); $viewer = $request->getUser(); $drequest = $this->getDiffusionRequest(); @@ -553,7 +555,10 @@ final class DiffusionRepositoryController extends DiffusionController { ->setHardpointID('locate-control') ->setID('locate-input') ->setLabel(pht('Locate File'))); - $browse_panel->appendChild($form->buildLayoutView()); + $form_box = id(new PHUIBoxView()) + ->addClass('diffusion-locate-file-view') + ->appendChild($form->buildLayoutView()); + $browse_panel->appendChild($form_box); } $browse_panel->appendChild($browse_table); diff --git a/webroot/rsrc/css/aphront/table-view.css b/webroot/rsrc/css/aphront/table-view.css index 0e6005aea2..593c1c241d 100644 --- a/webroot/rsrc/css/aphront/table-view.css +++ b/webroot/rsrc/css/aphront/table-view.css @@ -273,13 +273,5 @@ span.single-display-line-content { } .phui-object-box .aphront-table-view { - border-style: solid; - border-width: 1px 0 0 0; - border-color: {$lightblueborder}; -} - -/* When a table immediately follows a header, remove the top border. */ -.phui-object-box .phui-header-shell + - .aphront-table-wrap .aphront-table-view { border: none; } diff --git a/webroot/rsrc/css/application/diffusion/diffusion-icons.css b/webroot/rsrc/css/application/diffusion/diffusion-icons.css index 21bb73f0d5..77670ad04c 100644 --- a/webroot/rsrc/css/application/diffusion/diffusion-icons.css +++ b/webroot/rsrc/css/application/diffusion/diffusion-icons.css @@ -40,3 +40,7 @@ input.diffusion-clone-uri { text-align: right; color: {$lightgreytext}; } + +.diffusion-locate-file-view { + border-bottom: 1px solid {$thinblueborder}; +}