From a79e4b786ea364d3d210540be0852ea3221475cc Mon Sep 17 00:00:00 2001 From: Chad Little Date: Mon, 12 Dec 2016 09:04:03 -0800 Subject: [PATCH] Restrict hover styles in action list to only href Summary: We're currently applying these styles to labels, restrict them to only list elements that have an href. Test Plan: Test a label, an anchor, and a button as an action item. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D17031 --- resources/celerity/map.php | 6 +++--- src/view/layout/PhabricatorActionView.php | 4 ++++ webroot/rsrc/css/phui/phui-two-column-view.css | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 432d76abd3..686bb008cb 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ return array( 'names' => array( 'conpherence.pkg.css' => '0b64e988', 'conpherence.pkg.js' => '6249a1cf', - 'core.pkg.css' => '1ef46ae8', + 'core.pkg.css' => 'e18bf0da', 'core.pkg.js' => 'e4260032', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'a4ba74b5', @@ -165,7 +165,7 @@ return array( 'rsrc/css/phui/phui-status.css' => 'd5263e49', 'rsrc/css/phui/phui-tag-view.css' => '6bbd83e2', 'rsrc/css/phui/phui-timeline-view.css' => 'bc523970', - 'rsrc/css/phui/phui-two-column-view.css' => 'ee61d056', + 'rsrc/css/phui/phui-two-column-view.css' => 'f662d744', 'rsrc/css/phui/workboards/phui-workboard-color.css' => 'b60ef38a', 'rsrc/css/phui/workboards/phui-workboard.css' => '16441d5e', 'rsrc/css/phui/workboards/phui-workcard.css' => '0c62d7c5', @@ -882,7 +882,7 @@ return array( 'phui-tag-view-css' => '6bbd83e2', 'phui-theme-css' => '798c69b8', 'phui-timeline-view-css' => 'bc523970', - 'phui-two-column-view-css' => 'ee61d056', + 'phui-two-column-view-css' => 'f662d744', 'phui-workboard-color-css' => 'b60ef38a', 'phui-workboard-view-css' => '16441d5e', 'phui-workcard-view-css' => '0c62d7c5', diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php index 493f8c3dbd..8788529945 100644 --- a/src/view/layout/PhabricatorActionView.php +++ b/src/view/layout/PhabricatorActionView.php @@ -271,6 +271,10 @@ final class PhabricatorActionView extends AphrontView { $classes[] = 'phabricator-action-view-submenu'; } + if ($this->getHref()) { + $classes[] = 'phabricator-action-view-href'; + } + $style = array(); if ($this->hidden) { diff --git a/webroot/rsrc/css/phui/phui-two-column-view.css b/webroot/rsrc/css/phui/phui-two-column-view.css index aea567d025..a486231a63 100644 --- a/webroot/rsrc/css/phui/phui-two-column-view.css +++ b/webroot/rsrc/css/phui/phui-two-column-view.css @@ -164,7 +164,7 @@ padding: 5px 4px 5px 28px; } -.device-desktop .phui-two-column-properties .phabricator-action-view:hover +.device-desktop .phui-two-column-properties .phabricator-action-view-href:hover .phabricator-action-view-item { text-decoration: none; background-color: rgba({$alphablue}, .08); @@ -172,7 +172,7 @@ border-radius: 3px; } -.device-desktop .phui-two-column-properties .phabricator-action-view:hover +.device-desktop .phui-two-column-properties .phabricator-action-view-href:hover .phabricator-action-view-icon { color: {$sky}; }