Page MenuHomePhabricator
Files F15410852

D8839.diff
No OneTemporary
Actions

D8839.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -144,7 +144,7 @@
'rsrc/css/phui/phui-status.css' => '2f562399',
'rsrc/css/phui/phui-tag-view.css' => '295d81c4',
'rsrc/css/phui/phui-text.css' => '23e9b4b7',
- 'rsrc/css/phui/phui-timeline-view.css' => '66803fc3',
+ 'rsrc/css/phui/phui-timeline-view.css' => '7a502670',
'rsrc/css/phui/phui-workboard-view.css' => '84f2c272',
'rsrc/css/phui/phui-workpanel-view.css' => '97b69459',
'rsrc/css/sprite-actions.css' => '969ad0e5',
@@ -764,7 +764,7 @@
'phui-status-list-view-css' => '2f562399',
'phui-tag-view-css' => '295d81c4',
'phui-text-css' => '23e9b4b7',
- 'phui-timeline-view-css' => '66803fc3',
+ 'phui-timeline-view-css' => '7a502670',
'phui-workboard-view-css' => '84f2c272',
'phui-workpanel-view-css' => '97b69459',
'policy-css' => '957ea14c',
diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php
--- a/src/applications/differential/storage/DifferentialTransaction.php
+++ b/src/applications/differential/storage/DifferentialTransaction.php
@@ -351,11 +351,11 @@
case self::TYPE_ACTION:
switch ($this->getNewValue()) {
case DifferentialAction::ACTION_CLOSE:
- return 'fa-check-square-o';
- case DifferentialAction::ACTION_ACCEPT:
return 'fa-check';
+ case DifferentialAction::ACTION_ACCEPT:
+ return 'fa-check-circle';
case DifferentialAction::ACTION_REJECT:
- return 'fa-times';
+ return 'fa-times-circle';
case DifferentialAction::ACTION_ABANDON:
return 'fa-plane';
case DifferentialAction::ACTION_RETHINK:
diff --git a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
--- a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
+++ b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
@@ -102,7 +102,7 @@
'duplicate' => array(
'name' => pht('Duplicate'),
'name.full' => pht('Closed, Duplicate'),
- 'transaction.icon' => 'delete',
+ 'transaction.icon' => 'fa-times',
'special' => ManiphestTaskStatus::SPECIAL_DUPLICATE,
'closed' => true,
),
@@ -110,7 +110,7 @@
'name' => pht('Spite'),
'name.full' => pht('Closed, Spite'),
'name.action' => pht('Spited'),
- 'transaction.icon' => 'dislike',
+ 'transaction.icon' => 'fa-thumbs-o-down',
'silly' => true,
'closed' => true,
'prefixes' => array(
@@ -157,7 +157,7 @@
and it must be a closed status.
- `transaction.icon` //Optional string.// Allows you to choose a different
icon to use for this status when showing status changes in the transaction
- log.
+ log. Please see UIExamples, Icons and Images for a list.
- `transaction.color` //Optional string.// Allows you to choose a different
color to use for this status when showing status changes in the transaction
log.
diff --git a/src/applications/maniphest/storage/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php
--- a/src/applications/maniphest/storage/ManiphestTransaction.php
+++ b/src/applications/maniphest/storage/ManiphestTransaction.php
@@ -263,7 +263,7 @@
}
if (ManiphestTaskStatus::isClosedStatus($new)) {
- return 'fa-check-square-o';
+ return 'fa-check';
} else {
return 'fa-pencil';
}
@@ -280,7 +280,6 @@
case self::TYPE_PRIORITY:
if ($old == ManiphestTaskPriority::getDefaultPriority()) {
return 'fa-arrow-right';
- return pht('Triaged');
} else if ($old > $new) {
return 'fa-arrow-down';
} else {
diff --git a/webroot/rsrc/css/phui/phui-timeline-view.css b/webroot/rsrc/css/phui/phui-timeline-view.css
--- a/webroot/rsrc/css/phui/phui-timeline-view.css
+++ b/webroot/rsrc/css/phui/phui-timeline-view.css
@@ -190,12 +190,13 @@
background-color: {$lightblueborder};
top: 0;
left: 0;
+ text-align: center;
}
-.phui-timeline-icon {
- position: absolute;
- left: 9px;
- top: -5px;
+.phui-icon-view.phui-timeline-icon:before {
+ position: relative;
+ top: 4px;
+ margin: 0;
}
.phui-timeline-minor-event .phui-timeline-icon-fill {
@@ -204,11 +205,6 @@
border-radius: 3px;
}
-.phui-timeline-minor-event .phui-timeline-icon {
- top: -5px;
- left: 7px;
-}
-
.phui-timeline-extra,
.phui-timeline-extra .phabricator-content-source-view {
font-size: 11px;

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 20, 8:34 AM (2 d, 17 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7705762
Default Alt Text
D8839.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility