revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-24 06:20:56 +01:00
Code Issues Releases Wiki Activity

Allow phui-closed-tag to be readable on hover

Browse source 
Summary: In general these are fairly readable, but if not it cleans up on hover (and hover card).

Test Plan: tested a closed task in my sandbox

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D9158
This commit is contained in:
Chad Little 2014-05-16 21:51:28 -07:00
parent 31cd9b2169
commit 697e47459e
4 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/celerity/map.php
View file

@ -7,7 +7,7 @@
return array( return array(
'names' => 'names' =>
array( array(
'core.pkg.css' => '7c4a7aa4', 'core.pkg.css' => '59ea1706',
'core.pkg.js' => 'b2ed04a2', 'core.pkg.js' => 'b2ed04a2',
'darkconsole.pkg.js' => 'ca8671ce', 'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => '4b8686e3', 'differential.pkg.css' => '4b8686e3',
@ -143,7 +143,7 @@ return array(
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
'rsrc/css/phui/phui-spacing.css' => '042804d6', 'rsrc/css/phui/phui-spacing.css' => '042804d6',
'rsrc/css/phui/phui-status.css' => '2f562399', '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-text.css' => '23e9b4b7',
'rsrc/css/phui/phui-timeline-view.css' => '15ff2a9f', 'rsrc/css/phui/phui-timeline-view.css' => '15ff2a9f',
'rsrc/css/phui/phui-workboard-view.css' => '2bf82d00', 'rsrc/css/phui/phui-workboard-view.css' => '2bf82d00',
@ -778,7 +778,7 @@ return array(
'phui-remarkup-preview-css' => '19ad512b', 'phui-remarkup-preview-css' => '19ad512b',
'phui-spacing-css' => '042804d6', 'phui-spacing-css' => '042804d6',
'phui-status-list-view-css' => '2f562399', 'phui-status-list-view-css' => '2f562399',
'phui-tag-view-css' => '295d81c4', 'phui-tag-view-css' => '5d09d99e',
'phui-text-css' => '23e9b4b7', 'phui-text-css' => '23e9b4b7',
'phui-timeline-view-css' => '15ff2a9f', 'phui-timeline-view-css' => '15ff2a9f',
'phui-workboard-view-css' => '2bf82d00', 'phui-workboard-view-css' => '2bf82d00',

2
src/infrastructure/markup/rule/PhabricatorRemarkupRuleObject.php
View file

@ -65,6 +65,7 @@ abstract class PhabricatorRemarkupRuleObject
protected function renderObjectEmbed($object, $handle, $options) { protected function renderObjectEmbed($object, $handle, $options) {
$name = $handle->getFullName(); $name = $handle->getFullName();
$href = $handle->getURI(); $href = $handle->getURI();
$status_closed = PhabricatorObjectHandleStatus::STATUS_CLOSED;
if ($this->getEngine()->isTextMode()) { if ($this->getEngine()->isTextMode()) {
return $name.' <'.PhabricatorEnv::getProductionURI($href).'>'; return $name.' <'.PhabricatorEnv::getProductionURI($href).'>';
@ -72,6 +73,7 @@ abstract class PhabricatorRemarkupRuleObject
$attr = array( $attr = array(
'phid' => $handle->getPHID(), 'phid' => $handle->getPHID(),
'closed' => ($handle->getStatus() == $status_closed),
); );
return $this->renderHovertag($name, $href, $attr); return $this->renderHovertag($name, $href, $attr);

13
src/view/phui/PHUITagView.php
View file

@ -101,10 +101,6 @@ final class PHUITagView extends AphrontView {
'phui-tag-type-'.$this->type, 'phui-tag-type-'.$this->type,
); );
if ($this->closed) {
$classes[] = 'phui-tag-state-closed';
}
$color = null; $color = null;
if ($this->backgroundColor) { if ($this->backgroundColor) {
$color = 'phui-tag-color-'.$this->backgroundColor; $color = 'phui-tag-color-'.$this->backgroundColor;
@ -136,6 +132,15 @@ final class PHUITagView extends AphrontView {
), ),
array($dot, $this->name)); array($dot, $this->name));
if ($this->closed) {
$content = phutil_tag(
'span',
array(
'class' => 'phui-tag-core-closed',
),
$content);
}
if ($this->phid) { if ($this->phid) {
Javelin::initBehavior('phabricator-hovercards'); Javelin::initBehavior('phabricator-hovercards');

10
webroot/rsrc/css/phui/phui-tag-view.css
View file

@ -13,8 +13,13 @@ a.phui-tag-view:hover {
text-decoration: none; text-decoration: none;
} }
.phui-tag-state-closed .phui-tag-core { .phui-tag-core-closed {
text-decoration: line-through; text-decoration: line-through;
color: rgba(0,0,0,0.5);
}
.phui-tag-core-closed:hover {
text-decoration: none;
} }
.phui-tag-core { .phui-tag-core {
@ -57,7 +62,8 @@ a.phui-tag-view:hover {
.phui-tag-type-object, .phui-tag-type-object,
a.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; color: #000000;
} }