From e2d195e03ab074844a499a448946ebf79e37476f Mon Sep 17 00:00:00 2001 From: Chad Little Date: Sat, 9 Jul 2016 13:53:57 -0700 Subject: [PATCH] Fix mobile menu for files in Differential Changesets Summary: Fixes T11305, Ref T7754. Makes this menu dropdown act like actions and collapse to a fa-bars menu. Test Plan: View on mobile, desktop, browser. Click an action, spawn new page. {F1717953} Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Maniphest Tasks: T7754, T11305 Differential Revision: https://secure.phabricator.com/D16265 --- resources/celerity/map.php | 12 +++++------ .../view/DifferentialChangesetListView.php | 20 +++++++++---------- .../differential/changeset-view.css | 9 +++------ 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 6dcf3f3c9a..0aa02f6894 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -10,7 +10,7 @@ return array( 'core.pkg.css' => '4e7e9bde', 'core.pkg.js' => '13c7e56a', 'darkconsole.pkg.js' => 'e7393ebb', - 'differential.pkg.css' => '3e81ae60', + 'differential.pkg.css' => '3fb7f532', 'differential.pkg.js' => '634399e9', 'diffusion.pkg.css' => '91c5d3a6', 'diffusion.pkg.js' => '84c8f8fd', @@ -57,7 +57,7 @@ return array( 'rsrc/css/application/dashboard/dashboard.css' => 'bc6f2127', 'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a', 'rsrc/css/application/differential/add-comment.css' => 'c47f8c40', - 'rsrc/css/application/differential/changeset-view.css' => '37792573', + 'rsrc/css/application/differential/changeset-view.css' => '9ef7d354', 'rsrc/css/application/differential/core.css' => '5b7b8ff4', 'rsrc/css/application/differential/phui-inline-comment.css' => '5953c28e', 'rsrc/css/application/differential/revision-comment.css' => '14b8565a', @@ -555,7 +555,7 @@ return array( 'conpherence-update-css' => 'faf6be09', 'conpherence-widget-pane-css' => '775eaaba', 'd3' => 'a11a5ff2', - 'differential-changeset-view-css' => '37792573', + 'differential-changeset-view-css' => '9ef7d354', 'differential-core-view-css' => '5b7b8ff4', 'differential-inline-comment-editor' => '64a5550f', 'differential-revision-add-comment-css' => 'c47f8c40', @@ -1143,9 +1143,6 @@ return array( 'javelin-dom', 'javelin-workflow', ), - 37792573 => array( - 'phui-inline-comment-view-css', - ), '3ab51e2c' => array( 'javelin-behavior', 'javelin-behavior-device', @@ -1678,6 +1675,9 @@ return array( 'phabricator-phtize', 'changeset-view-manager', ), + '9ef7d354' => array( + 'phui-inline-comment-view-css', + ), '9f36c42d' => array( 'javelin-behavior', 'javelin-stratcom', diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php index f0c611c609..533f579b0a 100644 --- a/src/applications/differential/view/DifferentialChangesetListView.php +++ b/src/applications/differential/view/DifferentialChangesetListView.php @@ -342,18 +342,16 @@ final class DifferentialChangesetListView extends AphrontView { } $meta['containerID'] = $detail->getID(); - $caret = phutil_tag('span', array('class' => 'caret'), ''); - return javelin_tag( - 'a', - array( - 'class' => 'button grey dropdown', - 'meta' => $meta, - 'href' => idx($meta, 'detailURI', '#'), - 'target' => '_blank', - 'sigil' => 'differential-view-options', - ), - array(pht('View Options'), $caret)); + return id(new PHUIButtonView()) + ->setTag('a') + ->setText(pht('View Options')) + ->setIcon('fa-bars') + ->setColor(PHUIButtonView::GREY) + ->setHref(idx($meta, 'detailURI', '#')) + ->setMetadata($meta) + ->addSigil('differential-view-options'); + } } diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css index 2cedb39db5..9474553f28 100644 --- a/webroot/rsrc/css/application/differential/changeset-view.css +++ b/webroot/rsrc/css/application/differential/changeset-view.css @@ -348,12 +348,9 @@ td.cov-I { margin-right: 12px; } -.device-phone .differential-changeset-buttons { - float: none; - margin: 0 0 8px 4px; -} - -.differential-changeset-buttons a.button { +.device-phone .differential-changeset-buttons .button .phui-button-text { + visibility: hidden; + width: 0; margin-left: 8px; }