diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/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 @@ '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 @@ '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 @@ '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 @@ '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 @@ '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 @@ 'aphront-error-view-css', 'sprite-gradient-css', 'sprite-menu-css', - 'sprite-apps-css', 'sprite-apps-large-css', 'phabricator-main-menu-view', 'phabricator-notification-css', diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php --- a/resources/celerity/packages.php +++ b/resources/celerity/packages.php @@ -98,7 +98,6 @@ 'sprite-gradient-css', 'sprite-menu-css', - 'sprite-apps-css', 'sprite-apps-large-css', 'phabricator-main-menu-view', diff --git a/resources/sprite/apps_dark_1x/adventure.png b/resources/sprite/apps_dark_1x/adventure.png deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ $generator->buildMenuSheet(), - 'apps' => $generator->buildAppsSheet(), 'apps-large' => $generator->buildAppsLargeSheet(), 'tokens' => $generator->buildTokenSheet(), 'gradient' => $generator->buildGradientSheet(), diff --git a/src/applications/celerity/CeleritySpriteGenerator.php b/src/applications/celerity/CeleritySpriteGenerator.php --- a/src/applications/celerity/CeleritySpriteGenerator.php +++ b/src/applications/celerity/CeleritySpriteGenerator.php @@ -214,11 +214,6 @@ return $sheet; } - - public function buildAppsSheet() { - return $this->buildAppsSheetVariant(1); - } - public function buildAppsLargeSheet() { return $this->buildAppsSheetVariant(2); } diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php --- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php +++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php @@ -19,7 +19,7 @@ } public function getFontIcon() { - return 'fa-code'; + return 'fa-file-code-o'; } public function isPinnedByDefault(PhabricatorUser $viewer) { diff --git a/src/applications/feed/story/PhabricatorFeedStoryAudit.php b/src/applications/feed/story/PhabricatorFeedStoryAudit.php --- a/src/applications/feed/story/PhabricatorFeedStoryAudit.php +++ b/src/applications/feed/story/PhabricatorFeedStoryAudit.php @@ -11,7 +11,6 @@ $commit_phid = $this->getPrimaryObjectPHID(); $view = $this->newStoryView(); - $view->setAppIcon('audit-dark'); $action = $this->getValue('action'); $verb = PhabricatorAuditActionConstants::getActionPastTenseVerb($action); diff --git a/src/applications/feed/story/PhabricatorFeedStoryCommit.php b/src/applications/feed/story/PhabricatorFeedStoryCommit.php --- a/src/applications/feed/story/PhabricatorFeedStoryCommit.php +++ b/src/applications/feed/story/PhabricatorFeedStoryCommit.php @@ -50,7 +50,6 @@ } $view = $this->newStoryView(); - $view->setAppIcon('differential-dark'); $view->setTitle($title); diff --git a/src/applications/feed/story/PhabricatorFeedStoryDifferential.php b/src/applications/feed/story/PhabricatorFeedStoryDifferential.php --- a/src/applications/feed/story/PhabricatorFeedStoryDifferential.php +++ b/src/applications/feed/story/PhabricatorFeedStoryDifferential.php @@ -10,7 +10,6 @@ $data = $this->getStoryData(); $view = $this->newStoryView(); - $view->setAppIcon('differential-dark'); $line = $this->getLineForData($data); $view->setTitle($line); diff --git a/src/applications/feed/story/PhabricatorFeedStoryDifferentialAggregate.php b/src/applications/feed/story/PhabricatorFeedStoryDifferentialAggregate.php --- a/src/applications/feed/story/PhabricatorFeedStoryDifferentialAggregate.php +++ b/src/applications/feed/story/PhabricatorFeedStoryDifferentialAggregate.php @@ -55,7 +55,6 @@ } $view = $this->newStoryView(); - $view->setAppIcon('differential-dark'); $view->setTitle($title); $href = $this->getHandle($data->getValue('revision_phid'))->getURI(); diff --git a/src/applications/feed/story/PhabricatorFeedStoryManiphestAggregate.php b/src/applications/feed/story/PhabricatorFeedStoryManiphestAggregate.php --- a/src/applications/feed/story/PhabricatorFeedStoryManiphestAggregate.php +++ b/src/applications/feed/story/PhabricatorFeedStoryManiphestAggregate.php @@ -55,7 +55,6 @@ } $view = $this->newStoryView(); - $view->setAppIcon('maniphest-dark'); $view->setTitle($title); $href = $this->getHandle($data->getValue('taskPHID'))->getURI(); diff --git a/src/applications/feed/story/PhabricatorFeedStoryPhriction.php b/src/applications/feed/story/PhabricatorFeedStoryPhriction.php --- a/src/applications/feed/story/PhabricatorFeedStoryPhriction.php +++ b/src/applications/feed/story/PhabricatorFeedStoryPhriction.php @@ -23,7 +23,6 @@ $document_phid = $data->getValue('phid'); $view = $this->newStoryView(); - $view->setAppIcon('phriction-dark'); $action = $data->getValue('action'); $verb = PhrictionActionConstants::getActionPastTenseVerb($action); diff --git a/src/applications/phame/controller/PhameController.php b/src/applications/phame/controller/PhameController.php --- a/src/applications/phame/controller/PhameController.php +++ b/src/applications/phame/controller/PhameController.php @@ -73,7 +73,7 @@ ->setTitle($title) ->setImage($blogger_image) ->setImageHref($blogger_uri) - ->setAppIcon('phame-dark') + ->setAppIcon('fa-star') ->setUser($viewer) ->setPontification($phame_post, $phame_title); diff --git a/src/applications/tokens/feed/PhabricatorTokenGivenFeedStory.php b/src/applications/tokens/feed/PhabricatorTokenGivenFeedStory.php --- a/src/applications/tokens/feed/PhabricatorTokenGivenFeedStory.php +++ b/src/applications/tokens/feed/PhabricatorTokenGivenFeedStory.php @@ -22,7 +22,6 @@ public function renderView() { $view = $this->newStoryView(); - $view->setAppIcon('token-dark'); $author_phid = $this->getValue('authorPHID'); $href = $this->getHandle($this->getPrimaryObjectPHID())->getURI(); diff --git a/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php b/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php --- a/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php +++ b/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php @@ -69,7 +69,19 @@ $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(); diff --git a/src/applications/uiexample/examples/PHUIFeedStoryExample.php b/src/applications/uiexample/examples/PHUIFeedStoryExample.php --- a/src/applications/uiexample/examples/PHUIFeedStoryExample.php +++ b/src/applications/uiexample/examples/PHUIFeedStoryExample.php @@ -24,7 +24,7 @@ ->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 @@ ->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 @@ ->appendChild($token) ->setEpoch(1) ->addAction($action1) - ->setAppIcon('token-dark') + ->setAppIcon('fa-trophy') ->setUser($user); /* Image Story, used in Pholio, Macro */ @@ -97,7 +97,7 @@ ->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 @@ ->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 @@ ->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); diff --git a/src/view/phui/PHUIFeedStoryView.php b/src/view/phui/PHUIFeedStoryView.php --- a/src/view/phui/PHUIFeedStoryView.php +++ b/src/view/phui/PHUIFeedStoryView.php @@ -192,9 +192,8 @@ $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 @@ ->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; - } - } } 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 @@ -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'; diff --git a/src/view/phui/PHUIListItemView.php b/src/view/phui/PHUIListItemView.php --- a/src/view/phui/PHUIListItemView.php +++ b/src/view/phui/PHUIListItemView.php @@ -70,11 +70,6 @@ return $this; } - public function setAppIcon($icon) { - $this->appIcon = $icon; - return $this; - } - public function setProfileImage($image) { $this->profileImage = $image; return $this; @@ -242,8 +237,7 @@ 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( diff --git a/webroot/rsrc/css/phui/phui-feed-story.css b/webroot/rsrc/css/phui/phui-feed-story.css --- a/webroot/rsrc/css/phui/phui-feed-story.css +++ b/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; } diff --git a/webroot/rsrc/css/sprite-apps.css b/webroot/rsrc/css/sprite-apps.css deleted file mode 100644 --- a/webroot/rsrc/css/sprite-apps.css +++ /dev/null @@ -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; -} diff --git a/webroot/rsrc/image/sprite-apps-X2.png b/webroot/rsrc/image/sprite-apps-X2.png deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@