Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15418414
D8827.id20947.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
18 KB
Referenced Files
None
Subscribers
None
D8827.id20947.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' => '17905388',
+ 'rsrc/css/phui/phui-timeline-view.css' => 'cf44375f',
'rsrc/css/phui/phui-workboard-view.css' => '84f2c272',
'rsrc/css/phui/phui-workpanel-view.css' => '97b69459',
'rsrc/css/sprite-actions.css' => '969ad0e5',
@@ -767,7 +767,7 @@
'phui-status-list-view-css' => '2f562399',
'phui-tag-view-css' => '295d81c4',
'phui-text-css' => '23e9b4b7',
- 'phui-timeline-view-css' => '17905388',
+ 'phui-timeline-view-css' => 'cf44375f',
'phui-workboard-view-css' => '84f2c272',
'phui-workpanel-view-css' => '97b69459',
'policy-css' => '957ea14c',
diff --git a/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php b/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php
--- a/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php
+++ b/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php
@@ -41,9 +41,9 @@
switch ($this->getTransactionType()) {
case self::TYPE_ENABLE:
if ($new) {
- return 'new';
+ return 'gh-plus';
} else {
- return 'delete';
+ return 'gh-remove';
}
}
diff --git a/src/applications/config/storage/PhabricatorConfigTransaction.php b/src/applications/config/storage/PhabricatorConfigTransaction.php
--- a/src/applications/config/storage/PhabricatorConfigTransaction.php
+++ b/src/applications/config/storage/PhabricatorConfigTransaction.php
@@ -59,7 +59,7 @@
public function getIcon() {
switch ($this->getTransactionType()) {
case self::TYPE_EDIT:
- return 'edit';
+ return 'gh-pencil';
}
return parent::getIcon();
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
@@ -335,39 +335,39 @@
public function getIcon() {
switch ($this->getTransactionType()) {
case self::TYPE_INLINE:
- return 'comment';
+ return 'gh-comments';
case self::TYPE_UPDATE:
- return 'refresh';
+ return 'gh-repeat';
case self::TYPE_STATUS:
switch ($this->getNewValue()) {
case ArcanistDifferentialRevisionStatus::ACCEPTED:
- return 'enable';
+ return 'gh-ok';
case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
- return 'delete';
+ return 'gh-remove';
case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
- return 'refresh';
+ return 'gh-repeat';
}
break;
case self::TYPE_ACTION:
switch ($this->getNewValue()) {
case DifferentialAction::ACTION_CLOSE:
- return 'ok';
+ return 'gh-check';
case DifferentialAction::ACTION_ACCEPT:
- return 'enable';
+ return 'gh-ok';
case DifferentialAction::ACTION_REJECT:
case DifferentialAction::ACTION_ABANDON:
- return 'delete';
+ return 'gh-remove';
case DifferentialAction::ACTION_RETHINK:
- return 'disable';
+ return 'gh-headphones';
case DifferentialAction::ACTION_REQUEST:
- return 'refresh';
+ return 'gh-refresh';
case DifferentialAction::ACTION_RECLAIM:
case DifferentialAction::ACTION_REOPEN:
- return 'new';
+ return 'gh-bullhorn';
case DifferentialAction::ACTION_RESIGN:
- return 'undo';
+ return 'gh-log_out';
case DifferentialAction::ACTION_CLAIM:
- return 'user';
+ return 'gh-user';
}
}
diff --git a/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php b/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php
--- a/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php
+++ b/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php
@@ -25,7 +25,7 @@
switch ($this->getTransactionType()) {
case self::TYPE_NAME:
if ($old === null) {
- return 'create';
+ return 'gh-plus';
}
break;
}
diff --git a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php
--- a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php
+++ b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php
@@ -37,7 +37,7 @@
switch ($this->getTransactionType()) {
case self::TYPE_CREATE:
- return 'create';
+ return 'gh-plus';
}
return parent::getIcon();
diff --git a/src/applications/herald/storage/HeraldRuleTransaction.php b/src/applications/herald/storage/HeraldRuleTransaction.php
--- a/src/applications/herald/storage/HeraldRuleTransaction.php
+++ b/src/applications/herald/storage/HeraldRuleTransaction.php
@@ -57,9 +57,9 @@
switch ($this->getTransactionType()) {
case self::TYPE_DISABLE:
if ($new) {
- return 'disable';
+ return 'gh-pause';
} else {
- return 'enable';
+ return 'gh-play';
}
}
diff --git a/src/applications/macro/storage/PhabricatorMacroTransaction.php b/src/applications/macro/storage/PhabricatorMacroTransaction.php
--- a/src/applications/macro/storage/PhabricatorMacroTransaction.php
+++ b/src/applications/macro/storage/PhabricatorMacroTransaction.php
@@ -255,21 +255,21 @@
switch ($this->getTransactionType()) {
case PhabricatorMacroTransactionType::TYPE_NAME:
- return 'edit';
+ return 'gh-pencil';
case PhabricatorMacroTransactionType::TYPE_FILE:
if ($old === null) {
- return 'create';
+ return 'gh-plus';
} else {
- return 'edit';
+ return 'gh-pencil';
}
case PhabricatorMacroTransactionType::TYPE_DISABLED:
if ($new) {
- return 'delete';
+ return 'gh-remove';
} else {
- return 'undo';
+ return 'fa-undo';
}
case PhabricatorMacroTransactionType::TYPE_AUDIO:
- return 'herald';
+ return 'gh-headphones';
}
return parent::getIcon();
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
@@ -244,17 +244,17 @@
switch ($this->getTransactionType()) {
case self::TYPE_OWNER:
- return 'user';
+ return 'gh-user';
case self::TYPE_CCS:
- return 'meta-mta';
+ return 'gh-envelope';
case self::TYPE_TITLE:
if ($old === null) {
- return 'create';
+ return 'gh-pencil';
}
- return 'edit';
+ return 'gh-pencil';
case self::TYPE_STATUS:
$action = ManiphestTaskStatus::getStatusIcon($new);
@@ -263,33 +263,33 @@
}
if (ManiphestTaskStatus::isClosedStatus($new)) {
- return 'check';
+ return 'gh-ok';
} else {
- return 'edit';
+ return 'gh-pencil';
}
case self::TYPE_DESCRIPTION:
- return 'edit';
+ return 'gh-pencil';
case self::TYPE_PROJECTS:
- return 'project';
+ return 'gh-briefcase';
case self::TYPE_PROJECT_COLUMN:
- return 'workboard';
+ return 'fa-trello';
case self::TYPE_PRIORITY:
if ($old == ManiphestTaskPriority::getDefaultPriority()) {
- return 'normal-priority';
+ return 'gh-arrow-right';
return pht('Triaged');
} else if ($old > $new) {
- return 'lower-priority';
+ return 'gh-arrow-down';
} else {
- return 'raise-priority';
+ return 'gh-arrow-up';
}
case self::TYPE_EDGE:
case self::TYPE_ATTACH:
- return 'attach';
+ return 'gh-link';
}
diff --git a/src/applications/paste/storage/PhabricatorPasteTransaction.php b/src/applications/paste/storage/PhabricatorPasteTransaction.php
--- a/src/applications/paste/storage/PhabricatorPasteTransaction.php
+++ b/src/applications/paste/storage/PhabricatorPasteTransaction.php
@@ -44,11 +44,11 @@
public function getIcon() {
switch ($this->getTransactionType()) {
case self::TYPE_CREATE:
- return 'create';
+ return 'gh-plus';
break;
case self::TYPE_TITLE:
case self::TYPE_LANGUAGE:
- return 'edit';
+ return 'gh-pencil';
break;
}
return parent::getIcon();
diff --git a/src/applications/pholio/storage/PholioTransaction.php b/src/applications/pholio/storage/PholioTransaction.php
--- a/src/applications/pholio/storage/PholioTransaction.php
+++ b/src/applications/pholio/storage/PholioTransaction.php
@@ -63,16 +63,16 @@
public function getIcon() {
switch ($this->getTransactionType()) {
case PholioTransactionType::TYPE_INLINE:
- return 'comment';
+ return 'gh-comments';
case PholioTransactionType::TYPE_NAME:
case PholioTransactionType::TYPE_DESCRIPTION:
case PholioTransactionType::TYPE_IMAGE_NAME:
case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
- return 'edit';
+ return 'gh-pencil';
case PholioTransactionType::TYPE_IMAGE_FILE:
case PholioTransactionType::TYPE_IMAGE_REPLACE:
- return 'attach';
+ return 'gh-picture';
}
return parent::getIcon();
diff --git a/src/applications/ponder/storage/PonderQuestionTransaction.php b/src/applications/ponder/storage/PonderQuestionTransaction.php
--- a/src/applications/ponder/storage/PonderQuestionTransaction.php
+++ b/src/applications/ponder/storage/PonderQuestionTransaction.php
@@ -91,16 +91,16 @@
switch ($this->getTransactionType()) {
case self::TYPE_TITLE:
case self::TYPE_CONTENT:
- return 'edit';
+ return 'gh-pencil';
case self::TYPE_STATUS:
switch ($new) {
case PonderQuestionStatus::STATUS_OPEN:
- return 'enable';
+ return 'gh-ok-sign';
case PonderQuestionStatus::STATUS_CLOSED:
- return 'disable';
+ return 'gh-remove-sign';
}
case self::TYPE_ANSWERS:
- return 'new';
+ return 'gh-plus';
}
return parent::getIcon();
diff --git a/src/applications/releeph/storage/ReleephProductTransaction.php b/src/applications/releeph/storage/ReleephProductTransaction.php
--- a/src/applications/releeph/storage/ReleephProductTransaction.php
+++ b/src/applications/releeph/storage/ReleephProductTransaction.php
@@ -37,9 +37,9 @@
switch ($this->getTransactionType()) {
case self::TYPE_ACTIVE:
if ($new) {
- return 'edit';
+ return 'gh-pencil';
} else {
- return 'delete';
+ return 'gh-remove';
}
break;
}
diff --git a/src/applications/repository/storage/PhabricatorRepositoryTransaction.php b/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
--- a/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
@@ -89,7 +89,7 @@
public function getIcon() {
switch ($this->getTransactionType()) {
case self::TYPE_VCS:
- return 'create';
+ return 'gh-plus';
}
return parent::getIcon();
}
diff --git a/src/applications/slowvote/storage/PhabricatorSlowvoteTransaction.php b/src/applications/slowvote/storage/PhabricatorSlowvoteTransaction.php
--- a/src/applications/slowvote/storage/PhabricatorSlowvoteTransaction.php
+++ b/src/applications/slowvote/storage/PhabricatorSlowvoteTransaction.php
@@ -85,10 +85,16 @@
switch ($this->getTransactionType()) {
case PhabricatorSlowvoteTransaction::TYPE_QUESTION:
+ if ($old === null) {
+ return 'gh-plus';
+ } else {
+ return 'gh-pencil';
+ }
case PhabricatorSlowvoteTransaction::TYPE_DESCRIPTION:
case PhabricatorSlowvoteTransaction::TYPE_RESPONSES:
+ return 'gh-pencil';
case PhabricatorSlowvoteTransaction::TYPE_SHUFFLE:
- return 'edit';
+ return 'gh-refresh';
}
return parent::getIcon();
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -324,20 +324,20 @@
public function getIcon() {
switch ($this->getTransactionType()) {
case PhabricatorTransactions::TYPE_COMMENT:
- return 'comment';
+ return 'gh-comments';
case PhabricatorTransactions::TYPE_SUBSCRIBERS:
- return 'message';
+ return 'gh-envelope';
case PhabricatorTransactions::TYPE_VIEW_POLICY:
case PhabricatorTransactions::TYPE_EDIT_POLICY:
case PhabricatorTransactions::TYPE_JOIN_POLICY:
- return 'lock';
+ return 'gh-lock';
case PhabricatorTransactions::TYPE_EDGE:
- return 'link';
+ return 'gh-link';
case PhabricatorTransactions::TYPE_BUILDABLE:
- return 'wrench';
+ return 'gh-wrench';
}
- return 'edit';
+ return 'gh-pencil';
}
public function getColor() {
diff --git a/src/applications/uiexample/examples/PHUIIconExample.php b/src/applications/uiexample/examples/PHUIIconExample.php
--- a/src/applications/uiexample/examples/PHUIIconExample.php
+++ b/src/applications/uiexample/examples/PHUIIconExample.php
@@ -629,22 +629,21 @@
foreach ($glyphs as $glyph) {
$gicons[] = id(new PHUIIconView())
->addClass('phui-example-icon-name')
- ->setHalfling($glyph)
+ ->setIconFont($glyph)
->setText($glyph);
}
$cicons = array();
foreach ($colors as $color) {
$cicons[] = id(new PHUIIconView())
->addClass('phui-example-icon-transform')
- ->setHalfling('gh-tag '.$color)
+ ->setIconFont('gh-tag '.$color)
->setText(pht('gh-tag %s', $color));
}
$ficons = array();
foreach ($fas as $fa) {
-
$ficons[] = id(new PHUIIconView())
->addClass('phui-example-icon-name')
- ->setFontAwesome($fa)
+ ->setIconFont($fa)
->setText($fa);
}
diff --git a/src/view/phui/PHUIIconView.php b/src/view/phui/PHUIIconView.php
--- a/src/view/phui/PHUIIconView.php
+++ b/src/view/phui/PHUIIconView.php
@@ -23,8 +23,7 @@
private $spriteIcon;
private $spriteSheet;
- private $halfling;
- private $fontAwesome;
+ private $iconFont;
public function setHref($href) {
$this->href = $href;
@@ -56,13 +55,8 @@
return $this;
}
- public function setHalfling($hf) {
- $this->halfling = $hf;
- return $this;
- }
-
- public function setFontAwesome($fa) {
- $this->fontAwesome = $fa;
+ public function setIconFont($icon) {
+ $this->iconFont = $icon;
return $this;
}
@@ -86,17 +80,16 @@
$classes[] = 'sprite-'.$this->spriteSheet;
$classes[] = $this->spriteSheet.'-'.$this->spriteIcon;
- } elseif ($this->halfling) {
+ } elseif ($this->iconFont) {
require_celerity_resource('phui-font-icon-base-css');
- require_celerity_resource('font-glyphicons-halflings');
- $classes[] = 'phui-font-gh';
- $classes[] = $this->halfling;
-
- } elseif ($this->fontAwesome) {
- require_celerity_resource('phui-font-icon-base-css');
- require_celerity_resource('font-fontawesome');
- $classes[] = 'phui-font-fa';
- $classes[] = $this->fontAwesome;
+ if (!strncmp($this->iconFont, 'gh-', 3)) {
+ $classes[] = 'phui-font-gh';
+ require_celerity_resource('font-glyphicons-halflings');
+ } else {
+ $classes[] = 'phui-font-fa';
+ require_celerity_resource('font-fontawesome');
+ }
+ $classes[] = $this->iconFont;
} else {
if ($this->headSize) {
diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
--- a/src/view/phui/PHUITimelineEventView.php
+++ b/src/view/phui/PHUITimelineEventView.php
@@ -175,18 +175,16 @@
$fill_classes[] = 'phui-timeline-icon-fill-'.$this->color;
}
+ $icon = id(new PHUIIconView())
+ ->setIconFont($this->icon.' white')
+ ->addClass('phui-timeline-icon');
+
$icon = phutil_tag(
'span',
array(
'class' => implode(' ', $fill_classes),
),
- phutil_tag(
- 'span',
- array(
- 'class' => 'phui-timeline-icon sprite-icons '.
- 'icons-'.$this->icon.'-white',
- ),
- ''));
+ $icon);
}
$token = null;
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
@@ -193,10 +193,8 @@
.phui-timeline-icon {
position: absolute;
- left: 8px;
- top: 8px;
- height: 14px;
- width: 14px;
+ left: 9px;
+ top: -3px;
}
.phui-timeline-minor-event .phui-timeline-icon-fill {
@@ -206,8 +204,13 @@
}
.phui-timeline-minor-event .phui-timeline-icon {
- top: 6px;
- left: 6px;
+ top: -4px;
+ left: 7px;
+}
+
+.phui-timeline-minor-event .phui-timeline-icon.ph-rotate-180 {
+ top: 10px;
+ left: 0;
}
.phui-timeline-extra,
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Mar 21, 11:10 PM (1 d, 4 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7716097
Default Alt Text
D8827.id20947.diff (18 KB)
Attached To
Mode
D8827: Move Timeline icons to Fonts
Attached
Detach File
Event Timeline
Log In to Comment