diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 5893124d30..fa1ba81d14 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ return array( 'names' => array( - 'core.pkg.css' => '7c4a7aa4', + 'core.pkg.css' => '59ea1706', 'core.pkg.js' => 'b2ed04a2', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => '4b8686e3', @@ -143,7 +143,7 @@ return array( 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', 'rsrc/css/phui/phui-spacing.css' => '042804d6', 'rsrc/css/phui/phui-status.css' => '2f562399', - 'rsrc/css/phui/phui-tag-view.css' => '295d81c4', + 'rsrc/css/phui/phui-tag-view.css' => '5d09d99e', 'rsrc/css/phui/phui-text.css' => '23e9b4b7', 'rsrc/css/phui/phui-timeline-view.css' => '15ff2a9f', 'rsrc/css/phui/phui-workboard-view.css' => '2bf82d00', @@ -778,7 +778,7 @@ return array( 'phui-remarkup-preview-css' => '19ad512b', 'phui-spacing-css' => '042804d6', 'phui-status-list-view-css' => '2f562399', - 'phui-tag-view-css' => '295d81c4', + 'phui-tag-view-css' => '5d09d99e', 'phui-text-css' => '23e9b4b7', 'phui-timeline-view-css' => '15ff2a9f', 'phui-workboard-view-css' => '2bf82d00', diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleObject.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleObject.php index 0d9c940685..c427c69330 100644 --- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleObject.php +++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleObject.php @@ -65,6 +65,7 @@ abstract class PhabricatorRemarkupRuleObject protected function renderObjectEmbed($object, $handle, $options) { $name = $handle->getFullName(); $href = $handle->getURI(); + $status_closed = PhabricatorObjectHandleStatus::STATUS_CLOSED; if ($this->getEngine()->isTextMode()) { return $name.' <'.PhabricatorEnv::getProductionURI($href).'>'; @@ -72,6 +73,7 @@ abstract class PhabricatorRemarkupRuleObject $attr = array( 'phid' => $handle->getPHID(), + 'closed' => ($handle->getStatus() == $status_closed), ); return $this->renderHovertag($name, $href, $attr); diff --git a/src/view/phui/PHUITagView.php b/src/view/phui/PHUITagView.php index b84b63b570..5c8c469601 100644 --- a/src/view/phui/PHUITagView.php +++ b/src/view/phui/PHUITagView.php @@ -101,10 +101,6 @@ final class PHUITagView extends AphrontView { 'phui-tag-type-'.$this->type, ); - if ($this->closed) { - $classes[] = 'phui-tag-state-closed'; - } - $color = null; if ($this->backgroundColor) { $color = 'phui-tag-color-'.$this->backgroundColor; @@ -136,6 +132,15 @@ final class PHUITagView extends AphrontView { ), array($dot, $this->name)); + if ($this->closed) { + $content = phutil_tag( + 'span', + array( + 'class' => 'phui-tag-core-closed', + ), + $content); + } + if ($this->phid) { Javelin::initBehavior('phabricator-hovercards'); diff --git a/webroot/rsrc/css/phui/phui-tag-view.css b/webroot/rsrc/css/phui/phui-tag-view.css index db028c8be6..feafcbfd0d 100644 --- a/webroot/rsrc/css/phui/phui-tag-view.css +++ b/webroot/rsrc/css/phui/phui-tag-view.css @@ -13,8 +13,13 @@ a.phui-tag-view:hover { text-decoration: none; } -.phui-tag-state-closed .phui-tag-core { +.phui-tag-core-closed { text-decoration: line-through; + color: rgba(0,0,0,0.5); +} + +.phui-tag-core-closed:hover { + text-decoration: none; } .phui-tag-core { @@ -57,7 +62,8 @@ a.phui-tag-view:hover { .phui-tag-type-object, a.phui-tag-type-object, -a.phui-tag-type-object:link { +a.phui-tag-type-object:link, +.phui-tag-core-closed .phui-tag-color-object { color: #000000; }