From 9f4a3226ea9a9bb9610faa3fcd38e2d568aaa70a Mon Sep 17 00:00:00 2001 From: Chad Little Date: Mon, 12 Jan 2015 08:21:17 -0800 Subject: [PATCH] Clean up feedback from D11340 Summary: Ref D11340, I missed the comments being to excited to land. Test Plan: Shrink window to mobile view, click on action menu. Reviewers: btrahan, epriestley Reviewed By: epriestley Subscribers: Korvin, epriestley Differential Revision: https://secure.phabricator.com/D11347 --- resources/celerity/map.php | 6 +++--- src/view/phui/PHUIButtonView.php | 21 --------------------- src/view/phui/PHUIObjectBoxView.php | 6 +++--- webroot/rsrc/css/phui/phui-header-view.css | 4 ---- 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 9de1d87b45..1caf088992 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '2b129813', + 'core.pkg.css' => 'b99369cc', 'core.pkg.js' => '61af8961', 'darkconsole.pkg.js' => '8ab24e01', 'differential.pkg.css' => '8af45893', @@ -130,7 +130,7 @@ return array( 'rsrc/css/phui/phui-fontkit.css' => '9c3d2dce', 'rsrc/css/phui/phui-form-view.css' => 'aad06f2a', 'rsrc/css/phui/phui-form.css' => '9aecbda1', - 'rsrc/css/phui/phui-header-view.css' => '0873d56f', + 'rsrc/css/phui/phui-header-view.css' => 'c936b5b9', 'rsrc/css/phui/phui-icon.css' => 'a013a63d', 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', @@ -774,7 +774,7 @@ return array( 'phui-fontkit-css' => '9c3d2dce', 'phui-form-css' => '9aecbda1', 'phui-form-view-css' => 'aad06f2a', - 'phui-header-view-css' => '0873d56f', + 'phui-header-view-css' => 'c936b5b9', 'phui-icon-view-css' => 'a013a63d', 'phui-image-mask-css' => '5a8b09c8', 'phui-info-panel-css' => '27ea50a1', diff --git a/src/view/phui/PHUIButtonView.php b/src/view/phui/PHUIButtonView.php index 3671337535..e0019f7edf 100644 --- a/src/view/phui/PHUIButtonView.php +++ b/src/view/phui/PHUIButtonView.php @@ -22,9 +22,6 @@ final class PHUIButtonView extends AphrontTagView { private $title = null; private $disabled; private $name; - private $id; - private $sigil; - private $meta; public function setName($name) { $this->name = $name; @@ -85,21 +82,6 @@ final class PHUIButtonView extends AphrontTagView { return $this; } - public function setID($id) { - $this->id = $id; - return $this; - } - - public function setSigil($sigil) { - $this->sigil = $sigil; - return $this; - } - - public function setMeta($meta) { - $this->meta = $meta; - return $this; - } - public function getTagName() { return $this->tag; } @@ -136,9 +118,6 @@ final class PHUIButtonView extends AphrontTagView { 'href' => $this->href, 'name' => $this->name, 'title' => $this->title, - 'id' => $this->id, - 'sigil' => $this->sigil, - 'meta' => $this->meta, ); } diff --git a/src/view/phui/PHUIObjectBoxView.php b/src/view/phui/PHUIObjectBoxView.php index c6601281d2..50615a96c5 100644 --- a/src/view/phui/PHUIObjectBoxView.php +++ b/src/view/phui/PHUIObjectBoxView.php @@ -170,7 +170,7 @@ final class PHUIObjectBoxView extends AphrontView { $meta = array( 'map' => array( $this->actionListID => 'phabricator-action-list-toggle', - $icon_id => 'phui-mobile-action-menu-open', + $icon_id => 'phuix-dropdown-open', ),); $mobile_menu = id(new PHUIButtonView()) ->setTag('a') @@ -179,8 +179,8 @@ final class PHUIObjectBoxView extends AphrontView { ->setIcon($icon) ->addClass('phui-mobile-menu') ->setID($icon_id) - ->setSigil('jx-toggle-class') - ->setMeta($meta); + ->addSigil('jx-toggle-class') + ->setMetadata($meta); $header->addActionLink($mobile_menu); } diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css index 6b8b0e6bc5..48c48a6fcc 100644 --- a/webroot/rsrc/css/phui/phui-header-view.css +++ b/webroot/rsrc/css/phui/phui-header-view.css @@ -146,7 +146,3 @@ body.device-phone .phui-header-view { .device .phui-header-action-links .phui-mobile-menu { display: inline-block; } - -.phui-mobile-action-menu-open { - background: white !important; -}