Remove 1x AppIcons, use FontIcons instead

Summary: Removes the 1x application icons, and uses the fonticons instead. Feed was only known location.

Test Plan:
feed, dashboards, grep for use

{F275636}

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: hach-que, Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D11496

resources/celerity/map.php

@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => '3bb22d78',
+    'core.pkg.css' => '232f2fa7',
     'core.pkg.js' => '63963771',
     'darkconsole.pkg.js' => '8ab24e01',
     'differential.pkg.css' => '8af45893',
@@ -126,7 +126,7 @@ return array(
     'rsrc/css/phui/phui-button.css' => '008ba5e2',
     'rsrc/css/phui/phui-crumbs-view.css' => '1705bce6',
     'rsrc/css/phui/phui-document.css' => 'bbeb1890',
-    'rsrc/css/phui/phui-feed-story.css' => '582f0ec9',
+    'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5',
     'rsrc/css/phui/phui-fontkit.css' => '9c3d2dce',
     'rsrc/css/phui/phui-form-view.css' => 'aad06f2a',
     'rsrc/css/phui/phui-form.css' => '9aecbda1',
@@ -148,7 +148,6 @@ return array(
     'rsrc/css/phui/phui-workboard-view.css' => '8896938c',
     'rsrc/css/phui/phui-workpanel-view.css' => 'e495a5cc',
     'rsrc/css/sprite-apps-large.css' => '20ec0cc0',
-    'rsrc/css/sprite-apps.css' => 'd5baed0f',
     'rsrc/css/sprite-gradient.css' => '4bdb98a7',
     'rsrc/css/sprite-login.css' => 'a355d921',
     'rsrc/css/sprite-main-header.css' => '92720ee2',
@@ -318,11 +317,8 @@ return array(
     'rsrc/image/phrequent_inactive.png' => 'bfc15a69',
     'rsrc/image/search-white.png' => '64cc0d45',
     'rsrc/image/search.png' => '82625a7e',
-    'rsrc/image/sprite-apps-X2.png' => '58294cf3',
-    'rsrc/image/sprite-apps-X4.png' => '936fc9af',
     'rsrc/image/sprite-apps-large-X2.png' => '79e15268',
     'rsrc/image/sprite-apps-large.png' => '4d41b94a',
-    'rsrc/image/sprite-apps.png' => '5570df20',
     'rsrc/image/sprite-gradient.png' => 'ec15a417',
     'rsrc/image/sprite-login-X2.png' => '5ae6de3a',
     'rsrc/image/sprite-login.png' => '07f2c67c',
@@ -773,7 +769,7 @@ return array(
     'phui-calendar-month-css' => 'a92e47d2',
     'phui-crumbs-view-css' => '1705bce6',
     'phui-document-view-css' => 'bbeb1890',
-    'phui-feed-story-css' => '582f0ec9',
+    'phui-feed-story-css' => 'c9f3a0b5',
     'phui-font-icon-base-css' => '3dad2ae3',
     'phui-fontkit-css' => '9c3d2dce',
     'phui-form-css' => '9aecbda1',
@@ -814,7 +810,6 @@ return array(
     'releeph-request-differential-create-dialog' => '8d8b92cd',
     'releeph-request-typeahead-css' => '667a48ae',
     'setup-issue-css' => '8f852bc0',
-    'sprite-apps-css' => 'd5baed0f',
     'sprite-apps-large-css' => '20ec0cc0',
     'sprite-gradient-css' => '4bdb98a7',
     'sprite-login-css' => 'a355d921',
@@ -2011,7 +2006,6 @@ return array(
       'aphront-error-view-css',
       'sprite-gradient-css',
       'sprite-menu-css',
-      'sprite-apps-css',
       'sprite-apps-large-css',
       'phabricator-main-menu-view',
       'phabricator-notification-css',

resources/celerity/packages.php

@@ -98,7 +98,6 @@ return array(
 
     'sprite-gradient-css',
     'sprite-menu-css',
-    'sprite-apps-css',
     'sprite-apps-large-css',
 
     'phabricator-main-menu-view',

resources/sprite/manifest/apps.json

@@ -1,352 +0,0 @@
-{
-  "version" : 1,
-  "sprites" : {
-    "apps-adventure-dark"      : {
-      "name" : "apps-adventure-dark",
-      "rule" : ".apps-adventure-dark",
-      "hash" : "01fe18848e24564b2fd918d67050cca2"
-    },
-    "apps-aphlict-dark"        : {
-      "name" : "apps-aphlict-dark",
-      "rule" : ".apps-aphlict-dark",
-      "hash" : "df527b1706bbb51bf9c1786d2b7bdd8c"
-    },
-    "apps-application-dark"    : {
-      "name" : "apps-application-dark",
-      "rule" : ".apps-application-dark",
-      "hash" : "5b83b158a993fe384a13565af92a459b"
-    },
-    "apps-audit-dark"          : {
-      "name" : "apps-audit-dark",
-      "rule" : ".apps-audit-dark",
-      "hash" : "3802f0b0a6d76f43a3e058e801b40ef1"
-    },
-    "apps-authentication-dark" : {
-      "name" : "apps-authentication-dark",
-      "rule" : ".apps-authentication-dark",
-      "hash" : "d0dd9de47a870c28f92fedc7afa793af"
-    },
-    "apps-calendar-dark"       : {
-      "name" : "apps-calendar-dark",
-      "rule" : ".apps-calendar-dark",
-      "hash" : "dd118aea78f8e25e8897bc487e9d11da"
-    },
-    "apps-chatlog-dark"        : {
-      "name" : "apps-chatlog-dark",
-      "rule" : ".apps-chatlog-dark",
-      "hash" : "b8d8a24139ed744f40db4ece47001949"
-    },
-    "apps-conduit-dark"        : {
-      "name" : "apps-conduit-dark",
-      "rule" : ".apps-conduit-dark",
-      "hash" : "6d4547691bab8f2fc2fd993ce88831ea"
-    },
-    "apps-conpherence-dark"    : {
-      "name" : "apps-conpherence-dark",
-      "rule" : ".apps-conpherence-dark",
-      "hash" : "5df19890607d90081445d281a2472423"
-    },
-    "apps-countdown-dark"      : {
-      "name" : "apps-countdown-dark",
-      "rule" : ".apps-countdown-dark",
-      "hash" : "637b2aaac2a88494d953284be6589ff9"
-    },
-    "apps-daemon-dark"         : {
-      "name" : "apps-daemon-dark",
-      "rule" : ".apps-daemon-dark",
-      "hash" : "fa8d8cbc50fc669ee224a8187f6d688d"
-    },
-    "apps-differential-dark"   : {
-      "name" : "apps-differential-dark",
-      "rule" : ".apps-differential-dark",
-      "hash" : "3dbd55b10830ca6db2af0d854dc78019"
-    },
-    "apps-diffusion-dark"      : {
-      "name" : "apps-diffusion-dark",
-      "rule" : ".apps-diffusion-dark",
-      "hash" : "77ff44867101be7c03b8aafccbb68fc2"
-    },
-    "apps-diviner-dark"        : {
-      "name" : "apps-diviner-dark",
-      "rule" : ".apps-diviner-dark",
-      "hash" : "ac05c111831e20ab61826ee3b2c9b17c"
-    },
-    "apps-drydock-dark"        : {
-      "name" : "apps-drydock-dark",
-      "rule" : ".apps-drydock-dark",
-      "hash" : "40a96aad1940a3babdd9e79a70c2297b"
-    },
-    "apps-fact-dark"           : {
-      "name" : "apps-fact-dark",
-      "rule" : ".apps-fact-dark",
-      "hash" : "cc8119a099db6b771c8d86855b76a94c"
-    },
-    "apps-fancyhome-dark"      : {
-      "name" : "apps-fancyhome-dark",
-      "rule" : ".apps-fancyhome-dark",
-      "hash" : "8e85ddfba4ea2b86143863704f82f5f1"
-    },
-    "apps-feed-dark"           : {
-      "name" : "apps-feed-dark",
-      "rule" : ".apps-feed-dark",
-      "hash" : "b9ef76193816d7e1dd385984c1f030c9"
-    },
-    "apps-files-dark"          : {
-      "name" : "apps-files-dark",
-      "rule" : ".apps-files-dark",
-      "hash" : "cad2c3e86cf1b9875b60c18ba874768c"
-    },
-    "apps-flags-dark"          : {
-      "name" : "apps-flags-dark",
-      "rule" : ".apps-flags-dark",
-      "hash" : "e0ec52f936eb8ff4e853841ff6762fbe"
-    },
-    "apps-harbormaster-dark"   : {
-      "name" : "apps-harbormaster-dark",
-      "rule" : ".apps-harbormaster-dark",
-      "hash" : "497af8593144083aebabe86cee01d2a7"
-    },
-    "apps-help-dark"           : {
-      "name" : "apps-help-dark",
-      "rule" : ".apps-help-dark",
-      "hash" : "6c5ff30231f95a909382605078d61513"
-    },
-    "apps-herald-dark"         : {
-      "name" : "apps-herald-dark",
-      "rule" : ".apps-herald-dark",
-      "hash" : "3906225920ac8e6dcd5fa22641e66efe"
-    },
-    "apps-home-dark"           : {
-      "name" : "apps-home-dark",
-      "rule" : ".apps-home-dark",
-      "hash" : "790ba7304646939e75366013fceba15b"
-    },
-    "apps-info-sm-dark"        : {
-      "name" : "apps-info-sm-dark",
-      "rule" : ".apps-info-sm-dark",
-      "hash" : "198d4347988f82649409be94992d87b0"
-    },
-    "apps-legalpad-dark"       : {
-      "name" : "apps-legalpad-dark",
-      "rule" : ".apps-legalpad-dark",
-      "hash" : "fa1245067bb7998065f3381d803d0cf1"
-    },
-    "apps-logo-dark"           : {
-      "name" : "apps-logo-dark",
-      "rule" : ".apps-logo-dark",
-      "hash" : "62955580ab663271c8d853b11faa7f3a"
-    },
-    "apps-logout-sm-dark"      : {
-      "name" : "apps-logout-sm-dark",
-      "rule" : ".apps-logout-sm-dark",
-      "hash" : "14709c30e0c96b302eb52fdbf5ff3b2a"
-    },
-    "apps-macro-dark"          : {
-      "name" : "apps-macro-dark",
-      "rule" : ".apps-macro-dark",
-      "hash" : "34e17ede5baff1f0d9c9e0359ebad6dc"
-    },
-    "apps-mail-dark"           : {
-      "name" : "apps-mail-dark",
-      "rule" : ".apps-mail-dark",
-      "hash" : "3d39625a73c7c43e8c699244c56c94e6"
-    },
-    "apps-maniphest-dark"      : {
-      "name" : "apps-maniphest-dark",
-      "rule" : ".apps-maniphest-dark",
-      "hash" : "ec6460bcf05968565d86224976bbc570"
-    },
-    "apps-metamta-dark"        : {
-      "name" : "apps-metamta-dark",
-      "rule" : ".apps-metamta-dark",
-      "hash" : "c8d964ae6af59fe33cf3fe5e333c3769"
-    },
-    "apps-new-dark"            : {
-      "name" : "apps-new-dark",
-      "rule" : ".apps-new-dark",
-      "hash" : "dd91c7cbe96b703fe13d5c9b5ce44bca"
-    },
-    "apps-new-sm-dark"         : {
-      "name" : "apps-new-sm-dark",
-      "rule" : ".apps-new-sm-dark",
-      "hash" : "077f57d2677e510eea13c300fdaf68a7"
-    },
-    "apps-nuance-dark"         : {
-      "name" : "apps-nuance-dark",
-      "rule" : ".apps-nuance-dark",
-      "hash" : "3a172c027b2184019c48947de0a362f1"
-    },
-    "apps-owners-dark"         : {
-      "name" : "apps-owners-dark",
-      "rule" : ".apps-owners-dark",
-      "hash" : "8b3de6a179ae5e140cc1841a8f2358cf"
-    },
-    "apps-passphrase-dark"     : {
-      "name" : "apps-passphrase-dark",
-      "rule" : ".apps-passphrase-dark",
-      "hash" : "0d11baaa2aaa847c54745a61bd91b37c"
-    },
-    "apps-paste-dark"          : {
-      "name" : "apps-paste-dark",
-      "rule" : ".apps-paste-dark",
-      "hash" : "2f84b1f1ea1a7338512c5c9c21b18598"
-    },
-    "apps-pebkac-dark"         : {
-      "name" : "apps-pebkac-dark",
-      "rule" : ".apps-pebkac-dark",
-      "hash" : "76629325bba11a64eb325512b1bf1b6e"
-    },
-    "apps-people-dark"         : {
-      "name" : "apps-people-dark",
-      "rule" : ".apps-people-dark",
-      "hash" : "113e014bf052a11070b3b56656459472"
-    },
-    "apps-phage-dark"          : {
-      "name" : "apps-phage-dark",
-      "rule" : ".apps-phage-dark",
-      "hash" : "aed3d614ee8fc80d5d4cfb2ca306a1bc"
-    },
-    "apps-phame-dark"          : {
-      "name" : "apps-phame-dark",
-      "rule" : ".apps-phame-dark",
-      "hash" : "1941ba32e355cedbe05baa019c3168f3"
-    },
-    "apps-phid-dark"           : {
-      "name" : "apps-phid-dark",
-      "rule" : ".apps-phid-dark",
-      "hash" : "778df0196b8df9352651e613335e832c"
-    },
-    "apps-phlux-dark"          : {
-      "name" : "apps-phlux-dark",
-      "rule" : ".apps-phlux-dark",
-      "hash" : "cf032c023b7f826e677513d3af87ba3d"
-    },
-    "apps-pholio-dark"         : {
-      "name" : "apps-pholio-dark",
-      "rule" : ".apps-pholio-dark",
-      "hash" : "d94922bfd240d2d51c368669aaa17cf8"
-    },
-    "apps-phortune-dark"       : {
-      "name" : "apps-phortune-dark",
-      "rule" : ".apps-phortune-dark",
-      "hash" : "9ed46a1c791b307b623513ed0288c7a3"
-    },
-    "apps-phpast-dark"         : {
-      "name" : "apps-phpast-dark",
-      "rule" : ".apps-phpast-dark",
-      "hash" : "eb82394eeae797ac73a74c8bc1f98f2a"
-    },
-    "apps-phragment-dark"      : {
-      "name" : "apps-phragment-dark",
-      "rule" : ".apps-phragment-dark",
-      "hash" : "35c890e5b32b0b45e196b30d5c4286e2"
-    },
-    "apps-phrequent-dark"      : {
-      "name" : "apps-phrequent-dark",
-      "rule" : ".apps-phrequent-dark",
-      "hash" : "7b9ee46eb402c936da50a5a01081150c"
-    },
-    "apps-phriction-dark"      : {
-      "name" : "apps-phriction-dark",
-      "rule" : ".apps-phriction-dark",
-      "hash" : "964db3a34c3fea0b0416769a080bdb26"
-    },
-    "apps-phund-dark"          : {
-      "name" : "apps-phund-dark",
-      "rule" : ".apps-phund-dark",
-      "hash" : "50b438bab64a6f9160000440845d6d67"
-    },
-    "apps-policy-dark"         : {
-      "name" : "apps-policy-dark",
-      "rule" : ".apps-policy-dark",
-      "hash" : "570f9bdba86e7cd0e000e9a4f3befbff"
-    },
-    "apps-ponder-dark"         : {
-      "name" : "apps-ponder-dark",
-      "rule" : ".apps-ponder-dark",
-      "hash" : "3c27441d006ac794f48a703ceae577f6"
-    },
-    "apps-power-dark"          : {
-      "name" : "apps-power-dark",
-      "rule" : ".apps-power-dark",
-      "hash" : "c1fb921b1d6fc2ac3f8eecb13ae85285"
-    },
-    "apps-projects-dark"       : {
-      "name" : "apps-projects-dark",
-      "rule" : ".apps-projects-dark",
-      "hash" : "0cf9905bc81bd956eceb8285eb7d4dac"
-    },
-    "apps-releeph-dark"        : {
-      "name" : "apps-releeph-dark",
-      "rule" : ".apps-releeph-dark",
-      "hash" : "762ba0c840afb78f32d1d069fd619d7a"
-    },
-    "apps-repositories-dark"   : {
-      "name" : "apps-repositories-dark",
-      "rule" : ".apps-repositories-dark",
-      "hash" : "8142cc591b9781c88badd105a5f1a9f5"
-    },
-    "apps-search-dark"         : {
-      "name" : "apps-search-dark",
-      "rule" : ".apps-search-dark",
-      "hash" : "8f98178d54ecdf173b70430f1bb4f3a9"
-    },
-    "apps-settings-dark"       : {
-      "name" : "apps-settings-dark",
-      "rule" : ".apps-settings-dark",
-      "hash" : "3e7a09c424bbbf600ad9fcc73bc6eba5"
-    },
-    "apps-settings-sm-dark"    : {
-      "name" : "apps-settings-sm-dark",
-      "rule" : ".apps-settings-sm-dark",
-      "hash" : "ce3364d636d80f58b976c9c936b87c96"
-    },
-    "apps-setup-dark"          : {
-      "name" : "apps-setup-dark",
-      "rule" : ".apps-setup-dark",
-      "hash" : "00bc3d329f167bfff4ddfec77169fc16"
-    },
-    "apps-slowvote-dark"       : {
-      "name" : "apps-slowvote-dark",
-      "rule" : ".apps-slowvote-dark",
-      "hash" : "76ce09f388aee8bad2858931a75168be"
-    },
-    "apps-spaces-dark"         : {
-      "name" : "apps-spaces-dark",
-      "rule" : ".apps-spaces-dark",
-      "hash" : "857acd5b7da841e66b7a48026f34e61f"
-    },
-    "apps-token-dark"          : {
-      "name" : "apps-token-dark",
-      "rule" : ".apps-token-dark",
-      "hash" : "98d531fd27b891879157dd9f535bba1c"
-    },
-    "apps-uiexamples-dark"     : {
-      "name" : "apps-uiexamples-dark",
-      "rule" : ".apps-uiexamples-dark",
-      "hash" : "9e26392abcca6d59ee4050b2a94a2cbf"
-    },
-    "apps-workboard-dark"      : {
-      "name" : "apps-workboard-dark",
-      "rule" : ".apps-workboard-dark",
-      "hash" : "4c445aebd5c73a7d2534b0d211f754fd"
-    },
-    "apps-workphlow-dark"      : {
-      "name" : "apps-workphlow-dark",
-      "rule" : ".apps-workphlow-dark",
-      "hash" : "02b43ef407ca7f068954962a75cb48f0"
-    },
-    "apps-xhprof-dark"         : {
-      "name" : "apps-xhprof-dark",
-      "rule" : ".apps-xhprof-dark",
-      "hash" : "8d21023a00252c41a5fd3fc829b643e4"
-    }
-  },
-  "scales"  : [
-    1,
-    2,
-    4
-  ],
-  "header"  : "\/**\n * @provides sprite-apps-css\n * @generated\n *\/\n\n.sprite-apps {\n  background-image: url(\/rsrc\/image\/sprite-apps.png);\n  background-repeat: no-repeat;\n}\n\n@media\nonly screen and (min-device-pixel-ratio: 1.5),\nonly screen and (-webkit-min-device-pixel-ratio: 1.5) {\n  .sprite-apps {\n    background-image: url(\/rsrc\/image\/sprite-apps-X2.png);\n    background-size: {X}px {Y}px;\n  }\n}\n",
-  "type"    : "standard"
-}

scripts/celerity/generate_sprites.php

@@ -28,7 +28,6 @@ $generator = new CeleritySpriteGenerator();
 
 $sheets = array(
   'menu' => $generator->buildMenuSheet(),
-  'apps' => $generator->buildAppsSheet(),
   'apps-large' => $generator->buildAppsLargeSheet(),
   'tokens' => $generator->buildTokenSheet(),
   'gradient' => $generator->buildGradientSheet(),

src/applications/celerity/CeleritySpriteGenerator.php

@@ -214,11 +214,6 @@ final class CeleritySpriteGenerator {
     return $sheet;
   }
 
-
-  public function buildAppsSheet() {
-    return $this->buildAppsSheetVariant(1);
-  }
-
   public function buildAppsLargeSheet() {
     return $this->buildAppsSheetVariant(2);
   }

src/applications/diffusion/application/PhabricatorDiffusionApplication.php

@@ -19,7 +19,7 @@ final class PhabricatorDiffusionApplication extends PhabricatorApplication {
   }
 
   public function getFontIcon() {
-    return 'fa-code';
+    return 'fa-file-code-o';
   }
 
   public function isPinnedByDefault(PhabricatorUser $viewer) {

src/applications/feed/story/PhabricatorFeedStoryAudit.php

@@ -11,7 +11,6 @@ final class PhabricatorFeedStoryAudit extends PhabricatorFeedStory {
     $commit_phid = $this->getPrimaryObjectPHID();
 
     $view = $this->newStoryView();
-    $view->setAppIcon('audit-dark');
 
     $action = $this->getValue('action');
     $verb = PhabricatorAuditActionConstants::getActionPastTenseVerb($action);

src/applications/feed/story/PhabricatorFeedStoryCommit.php

@@ -50,7 +50,6 @@ final class PhabricatorFeedStoryCommit extends PhabricatorFeedStory {
     }
 
     $view = $this->newStoryView();
-    $view->setAppIcon('differential-dark');
 
     $view->setTitle($title);
 

src/applications/feed/story/PhabricatorFeedStoryDifferential.php

@@ -10,7 +10,6 @@ final class PhabricatorFeedStoryDifferential extends PhabricatorFeedStory {
     $data = $this->getStoryData();
 
     $view = $this->newStoryView();
-    $view->setAppIcon('differential-dark');
 
     $line = $this->getLineForData($data);
     $view->setTitle($line);

src/applications/feed/story/PhabricatorFeedStoryDifferentialAggregate.php

@@ -55,7 +55,6 @@ final class PhabricatorFeedStoryDifferentialAggregate
     }
 
     $view = $this->newStoryView();
-    $view->setAppIcon('differential-dark');
     $view->setTitle($title);
 
     $href = $this->getHandle($data->getValue('revision_phid'))->getURI();

src/applications/feed/story/PhabricatorFeedStoryManiphestAggregate.php

@@ -55,7 +55,6 @@ final class PhabricatorFeedStoryManiphestAggregate
     }
 
     $view = $this->newStoryView();
-    $view->setAppIcon('maniphest-dark');
     $view->setTitle($title);
 
     $href = $this->getHandle($data->getValue('taskPHID'))->getURI();

src/applications/feed/story/PhabricatorFeedStoryPhriction.php

@@ -23,7 +23,6 @@ final class PhabricatorFeedStoryPhriction extends PhabricatorFeedStory {
     $document_phid = $data->getValue('phid');
 
     $view = $this->newStoryView();
-    $view->setAppIcon('phriction-dark');
 
     $action = $data->getValue('action');
     $verb = PhrictionActionConstants::getActionPastTenseVerb($action);

src/applications/phame/controller/PhameController.php

@@ -73,7 +73,7 @@ abstract class PhameController extends PhabricatorController {
         ->setTitle($title)
         ->setImage($blogger_image)
         ->setImageHref($blogger_uri)
-        ->setAppIcon('phame-dark')
+        ->setAppIcon('fa-star')
         ->setUser($viewer)
         ->setPontification($phame_post, $phame_title);
 

src/applications/tokens/feed/PhabricatorTokenGivenFeedStory.php

@@ -22,7 +22,6 @@ final class PhabricatorTokenGivenFeedStory
 
   public function renderView() {
     $view = $this->newStoryView();
-    $view->setAppIcon('token-dark');
     $author_phid = $this->getValue('authorPHID');
 
     $href = $this->getHandle($this->getPrimaryObjectPHID())->getURI();

src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php

@@ -69,7 +69,19 @@ class PhabricatorApplicationTransactionFeedStory
     $handle = $this->getHandle($this->getPrimaryObjectPHID());
     $view->setHref($handle->getURI());
 
-    $view->setAppIconFromPHID($handle->getPHID());
+    $type = phid_get_type($handle->getPHID());
+    $phid_types = PhabricatorPHIDType::getAllTypes();
+    $icon = null;
+    if (!empty($phid_types[$type])) {
+      $phid_type = $phid_types[$type];
+      $class = $phid_type->getPHIDTypeApplicationClass();
+      if ($class) {
+        $application = PhabricatorApplication::getByClass($class);
+        $icon = $application->getFontIcon();
+      }
+    }
+
+    $view->setAppIcon($icon);
 
     $xaction_phids = $this->getValue('transactionPHIDs');
     $xaction = $this->getPrimaryTransaction();

src/applications/uiexample/examples/PHUIFeedStoryExample.php

@@ -24,7 +24,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       ->setImage(celerity_get_resource_uri('/rsrc/image/people/harding.png'))
       ->setImageHref('http://en.wikipedia.org/wiki/Warren_G._Harding')
       ->setEpoch(1)
-      ->setAppIcon('differential-dark')
+      ->setAppIcon('fa-star')
       ->setUser($user);
 
     /* Text Story, useful in Blogs, Ponders, Status */
@@ -48,7 +48,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       ->setImage(celerity_get_resource_uri('/rsrc/image/people/lincoln.png'))
       ->setImageHref('http://en.wikipedia.org/wiki/Abraham_Lincoln')
       ->setEpoch(strtotime('November 19, 1863'))
-      ->setAppIcon('phame-dark')
+      ->setAppIcon('fa-star')
       ->setUser($user)
       ->setTokenBar($tokenview)
       ->setPontification('Four score and seven years ago our fathers brought '.
@@ -80,7 +80,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       ->appendChild($token)
       ->setEpoch(1)
       ->addAction($action1)
-      ->setAppIcon('token-dark')
+      ->setAppIcon('fa-trophy')
       ->setUser($user);
 
     /* Image Story, used in Pholio, Macro */
@@ -97,7 +97,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       ->setImage(celerity_get_resource_uri('/rsrc/image/people/harding.png'))
       ->setImageHref('http://en.wikipedia.org/wiki/Warren_G._Harding')
       ->setEpoch(1)
-      ->setAppIcon('ponder-dark')
+      ->setAppIcon('fa-cogs')
       ->setPontification('Why does inline-block add space under my spans and '.
         'anchors?')
       ->addAction($action1)
@@ -112,7 +112,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       ->setImage(celerity_get_resource_uri('/rsrc/image/people/lincoln.png'))
       ->setImageHref('http://en.wikipedia.org/wiki/Abraham_Lincoln')
       ->setEpoch(strtotime('November 19, 1863'))
-      ->setAppIcon('phame-dark')
+      ->setAppIcon('fa-rocket')
       ->setUser($user)
       ->setPontification('If we ever create a lightweight status app '.
       'this story would be how that would be displayed.');
@@ -126,7 +126,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       ->setImage(celerity_get_resource_uri('/rsrc/image/people/harding.png'))
       ->setImageHref('http://en.wikipedia.org/wiki/Warren_G._Harding')
       ->setEpoch(1)
-      ->setAppIcon('differential-dark')
+      ->setAppIcon('fa-wifi')
       ->setUser($user);
 
 

src/view/phui/PHUIFeedStoryView.php

@@ -192,9 +192,8 @@ final class PHUIFeedStoryView extends AphrontView {
 
     $icon = null;
     if ($this->appIcon) {
-      $icon = new PHUIIconView();
-      $icon->setSpriteIcon($this->appIcon);
-      $icon->setSpriteSheet(PHUIIconView::SPRITE_APPS);
+      $icon = id(new PHUIIconView())
+        ->setIconFont($this->appIcon);
     }
 
     $action_list = array();
@@ -275,23 +274,4 @@ final class PHUIFeedStoryView extends AphrontView {
       ->appendChild(array($head, $body, $foot));
   }
 
-  public function setAppIconFromPHID($phid) {
-    switch (phid_get_type($phid)) {
-      case PholioMockPHIDType::TYPECONST:
-        $this->setAppIcon('pholio-dark');
-        break;
-      case PhabricatorMacroMacroPHIDType::TYPECONST:
-        $this->setAppIcon('macro-dark');
-        break;
-      case ManiphestTaskPHIDType::TYPECONST:
-        $this->setAppIcon('maniphest-dark');
-        break;
-      case DifferentialRevisionPHIDType::TYPECONST:
-        $this->setAppIcon('differential-dark');
-        break;
-      case PhabricatorCalendarEventPHIDType::TYPECONST:
-        $this->setAppIcon('calendar-dark');
-        break;
-    }
-  }
 }

src/view/phui/PHUIIconView.php

@@ -2,7 +2,6 @@
 
 final class PHUIIconView extends AphrontTagView {
 
-  const SPRITE_APPS = 'apps';
   const SPRITE_TOKENS = 'tokens';
   const SPRITE_LOGIN = 'login';
   const SPRITE_PROJECTS = 'projects';

src/view/phui/PHUIListItemView.php

@@ -70,11 +70,6 @@ final class PHUIListItemView extends AphrontTagView {
     return $this;
   }
 
-  public function setAppIcon($icon) {
-    $this->appIcon = $icon;
-    return $this;
-  }
-
   public function setProfileImage($image) {
     $this->profileImage = $image;
     return $this;
@@ -242,8 +237,7 @@ final class PHUIListItemView extends AphrontTagView {
     if ($this->appIcon) {
       $icon = id(new PHUIIconView())
         ->addClass('phui-list-item-icon')
-        ->setSpriteSheet(PHUIIconView::SPRITE_APPS)
-        ->setSpriteIcon($this->appIcon);
+        ->setIconFont($this->appIcon);
     }
 
     return javelin_tag(

webroot/rsrc/css/phui/phui-feed-story.css

@@ -52,8 +52,6 @@
 }
 
 .phui-feed-story-foot .phui-icon-view {
-  float: left;
-  display: inline-block;
   margin-right: 5px;
 }
 

webroot/rsrc/css/sprite-apps.css

@@ -1,291 +0,0 @@
-/**
- * @provides sprite-apps-css
- * @generated
- */
-
-.sprite-apps {
-  background-image: url(/rsrc/image/sprite-apps.png);
-  background-repeat: no-repeat;
-}
-
-@media
-only screen and (min-device-pixel-ratio: 1.5),
-only screen and (-webkit-min-device-pixel-ratio: 1.5) {
-  .sprite-apps {
-    background-image: url(/rsrc/image/sprite-apps-X2.png);
-    background-size: 120px 135px;
-  }
-}
-
-
-.apps-adventure-dark {
-  background-position: 0px 0px;
-}
-
-.apps-aphlict-dark {
-  background-position: -15px 0px;
-}
-
-.apps-application-dark {
-  background-position: -30px 0px;
-}
-
-.apps-audit-dark {
-  background-position: -45px 0px;
-}
-
-.apps-authentication-dark {
-  background-position: -60px 0px;
-}
-
-.apps-calendar-dark {
-  background-position: -75px 0px;
-}
-
-.apps-chatlog-dark {
-  background-position: -90px 0px;
-}
-
-.apps-conduit-dark {
-  background-position: -105px 0px;
-}
-
-.apps-conpherence-dark {
-  background-position: 0px -15px;
-}
-
-.apps-countdown-dark {
-  background-position: -15px -15px;
-}
-
-.apps-daemon-dark {
-  background-position: -30px -15px;
-}
-
-.apps-differential-dark {
-  background-position: -45px -15px;
-}
-
-.apps-diffusion-dark {
-  background-position: -60px -15px;
-}
-
-.apps-diviner-dark {
-  background-position: -75px -15px;
-}
-
-.apps-drydock-dark {
-  background-position: -90px -15px;
-}
-
-.apps-fact-dark {
-  background-position: -105px -15px;
-}
-
-.apps-fancyhome-dark {
-  background-position: 0px -30px;
-}
-
-.apps-feed-dark {
-  background-position: -15px -30px;
-}
-
-.apps-files-dark {
-  background-position: -30px -30px;
-}
-
-.apps-flags-dark {
-  background-position: -45px -30px;
-}
-
-.apps-harbormaster-dark {
-  background-position: -60px -30px;
-}
-
-.apps-help-dark {
-  background-position: -75px -30px;
-}
-
-.apps-herald-dark {
-  background-position: -90px -30px;
-}
-
-.apps-home-dark {
-  background-position: -105px -30px;
-}
-
-.apps-info-sm-dark {
-  background-position: 0px -45px;
-}
-
-.apps-legalpad-dark {
-  background-position: -15px -45px;
-}
-
-.apps-logo-dark {
-  background-position: -30px -45px;
-}
-
-.apps-logout-sm-dark {
-  background-position: -45px -45px;
-}
-
-.apps-macro-dark {
-  background-position: -60px -45px;
-}
-
-.apps-mail-dark {
-  background-position: -75px -45px;
-}
-
-.apps-maniphest-dark {
-  background-position: -90px -45px;
-}
-
-.apps-metamta-dark {
-  background-position: -105px -45px;
-}
-
-.apps-new-sm-dark {
-  background-position: 0px -60px;
-}
-
-.apps-new-dark {
-  background-position: -15px -60px;
-}
-
-.apps-nuance-dark {
-  background-position: -30px -60px;
-}
-
-.apps-owners-dark {
-  background-position: -45px -60px;
-}
-
-.apps-passphrase-dark {
-  background-position: -60px -60px;
-}
-
-.apps-paste-dark {
-  background-position: -75px -60px;
-}
-
-.apps-pebkac-dark {
-  background-position: -90px -60px;
-}
-
-.apps-people-dark {
-  background-position: -105px -60px;
-}
-
-.apps-phage-dark {
-  background-position: 0px -75px;
-}
-
-.apps-phame-dark {
-  background-position: -15px -75px;
-}
-
-.apps-phid-dark {
-  background-position: -30px -75px;
-}
-
-.apps-phlux-dark {
-  background-position: -45px -75px;
-}
-
-.apps-pholio-dark {
-  background-position: -60px -75px;
-}
-
-.apps-phortune-dark {
-  background-position: -75px -75px;
-}
-
-.apps-phpast-dark {
-  background-position: -90px -75px;
-}
-
-.apps-phragment-dark {
-  background-position: -105px -75px;
-}
-
-.apps-phrequent-dark {
-  background-position: 0px -90px;
-}
-
-.apps-phriction-dark {
-  background-position: -15px -90px;
-}
-
-.apps-phund-dark {
-  background-position: -30px -90px;
-}
-
-.apps-policy-dark {
-  background-position: -45px -90px;
-}
-
-.apps-ponder-dark {
-  background-position: -60px -90px;
-}
-
-.apps-power-dark {
-  background-position: -75px -90px;
-}
-
-.apps-projects-dark {
-  background-position: -90px -90px;
-}
-
-.apps-releeph-dark {
-  background-position: -105px -90px;
-}
-
-.apps-repositories-dark {
-  background-position: 0px -105px;
-}
-
-.apps-search-dark {
-  background-position: -15px -105px;
-}
-
-.apps-settings-sm-dark {
-  background-position: -30px -105px;
-}
-
-.apps-settings-dark {
-  background-position: -45px -105px;
-}
-
-.apps-setup-dark {
-  background-position: -60px -105px;
-}
-
-.apps-slowvote-dark {
-  background-position: -75px -105px;
-}
-
-.apps-spaces-dark {
-  background-position: -90px -105px;
-}
-
-.apps-token-dark {
-  background-position: -105px -105px;
-}
-
-.apps-uiexamples-dark {
-  background-position: 0px -120px;
-}
-
-.apps-workboard-dark {
-  background-position: -15px -120px;
-}
-
-.apps-workphlow-dark {
-  background-position: -30px -120px;
-}
-
-.apps-xhprof-dark {
-  background-position: -45px -120px;
-}