diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,11 +7,11 @@ return array( 'names' => array( - 'core.pkg.css' => 'c00e58c8', + 'core.pkg.css' => 'be14eb23', 'core.pkg.js' => 'b2ed04a2', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => '4b8686e3', - 'differential.pkg.js' => '05ad02d3', + 'differential.pkg.js' => '36bec171', 'diffusion.pkg.css' => '3783278d', 'diffusion.pkg.js' => '5b4010f4', 'javelin.pkg.js' => 'dbef0389', @@ -82,7 +82,7 @@ 'rsrc/css/application/phame/phame.css' => '19ecc703', 'rsrc/css/application/pholio/pholio-edit.css' => 'b9e59b6d', 'rsrc/css/application/pholio/pholio-inline-comments.css' => '52be33f0', - 'rsrc/css/application/pholio/pholio.css' => '2fa97dbe', + 'rsrc/css/application/pholio/pholio.css' => 'e059f955', 'rsrc/css/application/phortune/phortune-credit-card-form.css' => 'b25b4beb', 'rsrc/css/application/phrequent/phrequent.css' => 'ffc185ad', 'rsrc/css/application/phriction/phriction-document-css.css' => '7d7f0071', @@ -111,12 +111,11 @@ 'rsrc/css/core/z-index.css' => 'efb673ac', 'rsrc/css/diviner/diviner-shared.css' => '38813222', 'rsrc/css/font/font-awesome.css' => '62bc244d', - 'rsrc/css/font/font-glyphicons-halflings.css' => 'c4c1c6b6', 'rsrc/css/font/font-source-sans-pro.css' => '91d53463', - 'rsrc/css/font/phui-font-icon-base.css' => 'cd92ff25', + 'rsrc/css/font/phui-font-icon-base.css' => '104caddd', 'rsrc/css/layout/phabricator-action-header-view.css' => 'c14dfc57', - 'rsrc/css/layout/phabricator-action-list-view.css' => '6f7ef696', - 'rsrc/css/layout/phabricator-crumbs-view.css' => '0222cbe0', + 'rsrc/css/layout/phabricator-action-list-view.css' => 'dcd9875f', + 'rsrc/css/layout/phabricator-crumbs-view.css' => '6a23399c', 'rsrc/css/layout/phabricator-filetree-view.css' => 'a8c86ace', 'rsrc/css/layout/phabricator-hovercard-view.css' => '46a13cf0', 'rsrc/css/layout/phabricator-side-menu-view.css' => '503699d0', @@ -133,12 +132,12 @@ 'rsrc/css/phui/phui-form-view.css' => '867463b4', 'rsrc/css/phui/phui-form.css' => 'b78ec020', 'rsrc/css/phui/phui-header-view.css' => '5d245c9c', - 'rsrc/css/phui/phui-icon.css' => '215fa314', + 'rsrc/css/phui/phui-icon.css' => '00abbd26', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', - 'rsrc/css/phui/phui-list.css' => 'ef8035b6', + 'rsrc/css/phui/phui-list.css' => '65eab261', 'rsrc/css/phui/phui-object-box.css' => 'ce92d8ec', - 'rsrc/css/phui/phui-object-item-list-view.css' => '7cf6ccf9', - 'rsrc/css/phui/phui-pinboard-view.css' => 'e7d3b05e', + 'rsrc/css/phui/phui-object-item-list-view.css' => '64b6b266', + 'rsrc/css/phui/phui-pinboard-view.css' => '874c22f9', 'rsrc/css/phui/phui-property-list-view.css' => 'af4b381f', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', 'rsrc/css/phui/phui-spacing.css' => '042804d6', @@ -147,7 +146,7 @@ 'rsrc/css/phui/phui-text.css' => '23e9b4b7', 'rsrc/css/phui/phui-timeline-view.css' => '15ff2a9f', 'rsrc/css/phui/phui-workboard-view.css' => '2bf82d00', - 'rsrc/css/phui/phui-workpanel-view.css' => '97b69459', + 'rsrc/css/phui/phui-workpanel-view.css' => '1169f879', 'rsrc/css/sprite-actions.css' => '969ad0e5', 'rsrc/css/sprite-apps-large.css' => '3e3ec4c3', 'rsrc/css/sprite-apps-xlarge.css' => 'db66c878', @@ -156,13 +155,13 @@ 'rsrc/css/sprite-conpherence.css' => '3b4a0487', 'rsrc/css/sprite-docs.css' => '5f65d0da', 'rsrc/css/sprite-gradient.css' => 'a10def53', - 'rsrc/css/sprite-icons.css' => 'f19a828c', 'rsrc/css/sprite-login.css' => '8d10fb28', 'rsrc/css/sprite-main-header.css' => '92720ee2', 'rsrc/css/sprite-menu.css' => '8da53882', 'rsrc/css/sprite-minicons.css' => 'df4f76fe', 'rsrc/css/sprite-payments.css' => 'cc085d44', 'rsrc/css/sprite-projects.css' => '7578fa56', + 'rsrc/css/sprite-remarkup.css' => '5c396a57', 'rsrc/css/sprite-status.css' => '25d7f92f', 'rsrc/css/sprite-tokens.css' => '1706b943', 'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => 'b676fe4f', @@ -323,8 +322,6 @@ 'rsrc/image/sprite-docs-X2.png' => '6dc1adad', 'rsrc/image/sprite-docs.png' => '4636297f', 'rsrc/image/sprite-gradient.png' => '4ece0b62', - 'rsrc/image/sprite-icons-X2.png' => '0d5867c0', - 'rsrc/image/sprite-icons.png' => '3f754bda', 'rsrc/image/sprite-login-X2.png' => 'bf5ceccc', 'rsrc/image/sprite-login.png' => 'c1e200b3', 'rsrc/image/sprite-main-header.png' => '83521873', @@ -335,6 +332,8 @@ 'rsrc/image/sprite-payments.png' => 'd8576309', 'rsrc/image/sprite-projects-X2.png' => '218fdc8b', 'rsrc/image/sprite-projects.png' => '631ff9a7', + 'rsrc/image/sprite-remarkup-X2.png' => '7ee1dc28', + 'rsrc/image/sprite-remarkup.png' => 'b4421f07', 'rsrc/image/sprite-status-X2.png' => '6cb4b401', 'rsrc/image/sprite-status.png' => '97eb1562', 'rsrc/image/sprite-tokens-X2.png' => 'b4776580', @@ -465,7 +464,7 @@ 'rsrc/js/core/behavior-lightbox-attachments.js' => '3aa45ad9', 'rsrc/js/core/behavior-line-linker.js' => 'bc778103', 'rsrc/js/core/behavior-more.js' => '9b9197be', - 'rsrc/js/core/behavior-object-selector.js' => 'b4eef37b', + 'rsrc/js/core/behavior-object-selector.js' => 'e6f67523', 'rsrc/js/core/behavior-oncopy.js' => 'c3e218fe', 'rsrc/js/core/behavior-phabricator-nav.js' => 'b5842a5e', 'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'c021950a', @@ -525,7 +524,6 @@ 'diffusion-source-css' => '66fdf661', 'diviner-shared-css' => '38813222', 'font-fontawesome' => '62bc244d', - 'font-glyphicons-halflings' => 'c4c1c6b6', 'font-source-sans-pro' => '91d53463', 'global-drag-and-drop-css' => '697324ad', 'harbormaster-css' => 'cec833b7', @@ -605,7 +603,7 @@ 'javelin-behavior-phabricator-line-linker' => 'bc778103', 'javelin-behavior-phabricator-nav' => 'b5842a5e', 'javelin-behavior-phabricator-notification-example' => 'c51a6616', - 'javelin-behavior-phabricator-object-selector' => 'b4eef37b', + 'javelin-behavior-phabricator-object-selector' => 'e6f67523', 'javelin-behavior-phabricator-oncopy' => 'c3e218fe', 'javelin-behavior-phabricator-remarkup-assist' => 'c021950a', 'javelin-behavior-phabricator-reveal-content' => '8f24abfc', @@ -688,14 +686,14 @@ 'path-typeahead' => 'f7fc67ec', 'people-profile-css' => 'ba7b2762', 'phabricator-action-header-view-css' => 'c14dfc57', - 'phabricator-action-list-view-css' => '6f7ef696', + 'phabricator-action-list-view-css' => 'dcd9875f', 'phabricator-application-launch-view-css' => 'd290ba21', 'phabricator-busy' => '6453c869', 'phabricator-chatlog-css' => '852140ff', 'phabricator-content-source-view-css' => '4b8b05d4', 'phabricator-core-css' => '40151074', 'phabricator-countdown-css' => '86b7b0a0', - 'phabricator-crumbs-view-css' => '0222cbe0', + 'phabricator-crumbs-view-css' => '6a23399c', 'phabricator-drag-and-drop-file-upload' => 'ae6abfba', 'phabricator-draggable-list' => '1681c4d4', 'phabricator-fatal-config-template-css' => '25d446d6', @@ -742,7 +740,7 @@ 'phabricator-uiexample-reactor-sendproperties' => '551add57', 'phabricator-zindex-css' => 'efb673ac', 'phame-css' => '19ecc703', - 'pholio-css' => '2fa97dbe', + 'pholio-css' => 'e059f955', 'pholio-edit-css' => 'b9e59b6d', 'pholio-inline-comments-css' => '52be33f0', 'phortune-credit-card-form' => '2290aeef', @@ -757,17 +755,17 @@ 'phui-calendar-month-css' => 'a92e47d2', 'phui-document-view-css' => '3b078dc0', 'phui-feed-story-css' => '3a59c2cf', - 'phui-font-icon-base-css' => 'cd92ff25', + 'phui-font-icon-base-css' => '104caddd', 'phui-fontkit-css' => 'de84aa4a', 'phui-form-css' => 'b78ec020', 'phui-form-view-css' => '867463b4', 'phui-header-view-css' => '5d245c9c', - 'phui-icon-view-css' => '215fa314', + 'phui-icon-view-css' => '00abbd26', 'phui-info-panel-css' => '27ea50a1', - 'phui-list-view-css' => 'ef8035b6', + 'phui-list-view-css' => '65eab261', 'phui-object-box-css' => 'ce92d8ec', - 'phui-object-item-list-view-css' => '7cf6ccf9', - 'phui-pinboard-view-css' => 'e7d3b05e', + 'phui-object-item-list-view-css' => '64b6b266', + 'phui-pinboard-view-css' => '874c22f9', 'phui-property-list-view-css' => 'af4b381f', 'phui-remarkup-preview-css' => '19ad512b', 'phui-spacing-css' => '042804d6', @@ -776,7 +774,7 @@ 'phui-text-css' => '23e9b4b7', 'phui-timeline-view-css' => '15ff2a9f', 'phui-workboard-view-css' => '2bf82d00', - 'phui-workpanel-view-css' => '97b69459', + 'phui-workpanel-view-css' => '1169f879', 'phuix-action-list-view' => 'b5c256b8', 'phuix-action-view' => '19a0b148', 'phuix-dropdown-menu' => 'bd4c8dca', @@ -803,13 +801,13 @@ 'sprite-conpherence-css' => '3b4a0487', 'sprite-docs-css' => '5f65d0da', 'sprite-gradient-css' => 'a10def53', - 'sprite-icons-css' => 'f19a828c', 'sprite-login-css' => '8d10fb28', 'sprite-main-header-css' => '92720ee2', 'sprite-menu-css' => '8da53882', 'sprite-minicons-css' => 'df4f76fe', 'sprite-payments-css' => 'cc085d44', 'sprite-projects-css' => '7578fa56', + 'sprite-remarkup-css' => '5c396a57', 'sprite-status-css' => '25d7f92f', 'sprite-tokens-css' => '1706b943', 'subscribers-list-css' => '5bb30c78', @@ -1617,13 +1615,6 @@ 2 => 'javelin-util', 3 => 'javelin-reactor-node-calmer', ), - 'b4eef37b' => - array( - 0 => 'javelin-behavior', - 1 => 'javelin-dom', - 2 => 'javelin-request', - 3 => 'javelin-util', - ), 'b5842a5e' => array( 0 => 'javelin-behavior', @@ -1914,6 +1905,13 @@ 2 => 'javelin-view-visitor', 3 => 'javelin-util', ), + 'e6f67523' => + array( + 0 => 'javelin-behavior', + 1 => 'javelin-dom', + 2 => 'javelin-request', + 3 => 'javelin-util', + ), 'e7c21fb3' => array( 0 => 'javelin-dom', @@ -2089,7 +2087,7 @@ 16 => 'aphront-tooltip-css', 17 => 'phabricator-flag-css', 18 => 'aphront-error-view-css', - 19 => 'sprite-icons-css', + 19 => 'sprite-remarkup-css', 20 => 'sprite-gradient-css', 21 => 'sprite-menu-css', 22 => 'sprite-apps-large-css', diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php --- a/resources/celerity/packages.php +++ b/resources/celerity/packages.php @@ -89,7 +89,7 @@ 'phabricator-flag-css', 'aphront-error-view-css', - 'sprite-icons-css', + 'sprite-remarkup-css', 'sprite-gradient-css', 'sprite-menu-css', 'sprite-apps-large-css', diff --git a/resources/sprite/icons_1x/action-menu.png b/resources/sprite/icons_1x/action-menu.png deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ $generator->buildIconSheet(), + 'remarkup' => $generator->buildRemarkupSheet(), 'menu' => $generator->buildMenuSheet(), 'apps' => $generator->buildAppsSheet(), 'actions' => $generator->buildActionsSheet(), diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -1081,7 +1081,6 @@ 'PhabricatorAccessLogConfigOptions' => 'applications/config/option/PhabricatorAccessLogConfigOptions.php', 'PhabricatorActionHeaderExample' => 'applications/uiexample/examples/PhabricatorActionHeaderExample.php', 'PhabricatorActionHeaderView' => 'view/layout/PhabricatorActionHeaderView.php', - 'PhabricatorActionListExample' => 'applications/uiexample/examples/PhabricatorActionListExample.php', 'PhabricatorActionListView' => 'view/layout/PhabricatorActionListView.php', 'PhabricatorActionView' => 'view/layout/PhabricatorActionView.php', 'PhabricatorAllCapsTranslation' => 'infrastructure/internationalization/translation/PhabricatorAllCapsTranslation.php', @@ -3819,7 +3818,6 @@ 'PhabricatorAccessLogConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorActionHeaderExample' => 'PhabricatorUIExample', 'PhabricatorActionHeaderView' => 'AphrontView', - 'PhabricatorActionListExample' => 'PhabricatorUIExample', 'PhabricatorActionListView' => 'AphrontView', 'PhabricatorActionView' => 'AphrontView', 'PhabricatorAllCapsTranslation' => 'PhabricatorTranslation', diff --git a/src/applications/audit/events/AuditActionMenuEventListener.php b/src/applications/audit/events/AuditActionMenuEventListener.php --- a/src/applications/audit/events/AuditActionMenuEventListener.php +++ b/src/applications/audit/events/AuditActionMenuEventListener.php @@ -36,8 +36,7 @@ $view_uri = '/audit/?authors='.$username; return id(new PhabricatorActionView()) - ->setIcon('audit-dark') - ->setIconSheet(PHUIIconView::SPRITE_APPS) + ->setIcon('fa-check-circle-o') ->setName(pht('View Commits')) ->setHref($view_uri); } diff --git a/src/applications/auth/controller/config/PhabricatorAuthProviderConfigController.php b/src/applications/auth/controller/config/PhabricatorAuthProviderConfigController.php --- a/src/applications/auth/controller/config/PhabricatorAuthProviderConfigController.php +++ b/src/applications/auth/controller/config/PhabricatorAuthProviderConfigController.php @@ -31,7 +31,7 @@ id(new PHUIListItemView()) ->setName(pht('Add Authentication Provider')) ->setHref($this->getApplicationURI('/config/new/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php --- a/src/applications/base/controller/PhabricatorController.php +++ b/src/applications/base/controller/PhabricatorController.php @@ -442,15 +442,14 @@ $can_act = $this->hasApplicationCapability($capability); if ($can_act) { $message = $positive_message; - $icon_name = 'enable-grey'; + $icon_name = 'fa-play-circle-o lightgreytext'; } else { $message = $negative_message; - $icon_name = 'lock'; + $icon_name = 'fa-lock'; } $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon($icon_name); + ->setIconFont($icon_name); require_celerity_resource('policy-css'); diff --git a/src/applications/calendar/controller/PhabricatorCalendarController.php b/src/applications/calendar/controller/PhabricatorCalendarController.php --- a/src/applications/calendar/controller/PhabricatorCalendarController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarController.php @@ -31,7 +31,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Event')) ->setHref($this->getApplicationURI().'event/create') - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php --- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php @@ -70,7 +70,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Event')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI("event/edit/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); @@ -78,7 +78,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Cancel Event')) - ->setIcon('delete') + ->setIcon('fa-times') ->setHref($this->getApplicationURI("event/delete/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(true)); diff --git a/src/applications/conpherence/controller/ConpherenceController.php b/src/applications/conpherence/controller/ConpherenceController.php --- a/src/applications/conpherence/controller/ConpherenceController.php +++ b/src/applications/conpherence/controller/ConpherenceController.php @@ -40,13 +40,13 @@ id(new PHUIListItemView()) ->setName(pht('New Message')) ->setHref($this->getApplicationURI('new/')) - ->setIcon('create') + ->setIcon('fa-plus-square') ->setWorkflow(true)) ->addAction( id(new PHUIListItemView()) ->setName(pht('Thread')) ->setHref('#') - ->setIcon('action-menu') + ->setIcon('fa-bars') ->setStyle('display: none;') ->addClass('device-widgets-selector') ->addSigil('device-widgets-selector')); diff --git a/src/applications/conpherence/events/ConpherenceActionMenuEventListener.php b/src/applications/conpherence/events/ConpherenceActionMenuEventListener.php --- a/src/applications/conpherence/events/ConpherenceActionMenuEventListener.php +++ b/src/applications/conpherence/events/ConpherenceActionMenuEventListener.php @@ -35,7 +35,7 @@ $href = '/conpherence/new/?participant='.$user->getPHID(); return id(new PhabricatorActionView()) - ->setIcon('message') + ->setIcon('fa-envelope') ->setName(pht('Send Message')) ->setWorkflow(true) ->setHref($href); diff --git a/src/applications/countdown/controller/PhabricatorCountdownController.php b/src/applications/countdown/controller/PhabricatorCountdownController.php --- a/src/applications/countdown/controller/PhabricatorCountdownController.php +++ b/src/applications/countdown/controller/PhabricatorCountdownController.php @@ -35,7 +35,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Countdown')) ->setHref($this->getApplicationURI('edit/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/countdown/controller/PhabricatorCountdownViewController.php b/src/applications/countdown/controller/PhabricatorCountdownViewController.php --- a/src/applications/countdown/controller/PhabricatorCountdownViewController.php +++ b/src/applications/countdown/controller/PhabricatorCountdownViewController.php @@ -80,7 +80,7 @@ $view->addAction( id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Countdown')) ->setHref($this->getApplicationURI("edit/{$id}/")) ->setDisabled(!$can_edit) @@ -88,7 +88,7 @@ $view->addAction( id(new PhabricatorActionView()) - ->setIcon('delete') + ->setIcon('fa-times') ->setName(pht('Delete Countdown')) ->setHref($this->getApplicationURI("delete/{$id}/")) ->setDisabled(!$can_edit) diff --git a/src/applications/dashboard/controller/PhabricatorDashboardListController.php b/src/applications/dashboard/controller/PhabricatorDashboardListController.php --- a/src/applications/dashboard/controller/PhabricatorDashboardListController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardListController.php @@ -41,7 +41,7 @@ $crumbs->addAction( id(new PHUIListItemView()) - ->setIcon('create') + ->setIcon('fa-plus-square') ->setName(pht('Create Dashboard')) ->setHref($this->getApplicationURI().'create/')); diff --git a/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php b/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php --- a/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php @@ -40,7 +40,7 @@ $crumbs->addAction( id(new PHUIListItemView()) - ->setIcon('create') + ->setIcon('fa-plus-square') ->setName(pht('Create Panel')) ->setHref($this->getApplicationURI().'panel/create/')); diff --git a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php --- a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php @@ -81,7 +81,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Panel')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI("panel/edit/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); @@ -89,7 +89,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('View Standalone')) - ->setIcon('preview') + ->setIcon('fa-eye') ->setHref($this->getApplicationURI("panel/render/{$id}/"))); return $actions; diff --git a/src/applications/dashboard/controller/PhabricatorDashboardViewController.php b/src/applications/dashboard/controller/PhabricatorDashboardViewController.php --- a/src/applications/dashboard/controller/PhabricatorDashboardViewController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardViewController.php @@ -79,7 +79,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Dashboard')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI("edit/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); @@ -87,7 +87,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Add Panel')) - ->setIcon('new') + ->setIcon('fa-plus') ->setHref($this->getApplicationURI("addpanel/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(true)); diff --git a/src/applications/differential/controller/DifferentialController.php b/src/applications/differential/controller/DifferentialController.php --- a/src/applications/differential/controller/DifferentialController.php +++ b/src/applications/differential/controller/DifferentialController.php @@ -9,7 +9,7 @@ id(new PHUIListItemView()) ->setHref($this->getApplicationURI('/diff/create/')) ->setName(pht('Create Diff')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -488,7 +488,7 @@ $actions = array(); $actions[] = id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref("/differential/revision/edit/{$revision_id}/") ->setName(pht('Edit Revision')) ->setDisabled(!$can_edit) @@ -498,7 +498,7 @@ $this->requireResource('javelin-behavior-phabricator-object-selector'); $actions[] = id(new PhabricatorActionView()) - ->setIcon('link') + ->setIcon('fa-link') ->setName(pht('Edit Dependencies')) ->setHref("/search/attach/{$revision_phid}/DREV/dependencies/") ->setWorkflow(true) @@ -507,7 +507,7 @@ $maniphest = 'PhabricatorApplicationManiphest'; if (PhabricatorApplication::isClassInstalled($maniphest)) { $actions[] = id(new PhabricatorActionView()) - ->setIcon('attach') + ->setIcon('fa-anchor') ->setName(pht('Edit Maniphest Tasks')) ->setHref("/search/attach/{$revision_phid}/TASK/") ->setWorkflow(true) @@ -516,7 +516,7 @@ $request_uri = $this->getRequest()->getRequestURI(); $actions[] = id(new PhabricatorActionView()) - ->setIcon('download') + ->setIcon('fa-download') ->setName(pht('Download Raw Diff')) ->setHref($request_uri->alter('download', 'true')); diff --git a/src/applications/differential/event/DifferentialActionMenuEventListener.php b/src/applications/differential/event/DifferentialActionMenuEventListener.php --- a/src/applications/differential/event/DifferentialActionMenuEventListener.php +++ b/src/applications/differential/event/DifferentialActionMenuEventListener.php @@ -37,8 +37,7 @@ $href = '/differential/?authors='.$person->getUsername(); return id(new PhabricatorActionView()) - ->setIcon('differential-dark') - ->setIconSheet(PHUIIconView::SPRITE_APPS) + ->setIcon('fa-cog') ->setName(pht('View Revisions')) ->setHref($href); } @@ -59,8 +58,7 @@ return id(new PhabricatorActionView()) ->setName(pht('Edit Differential Revisions')) ->setHref("/search/attach/{$phid}/DREV/") - ->setWorkflow(true) - ->setIcon('attach') + ->setIcon('fa-cog') ->setDisabled(!$can_edit) ->setWorkflow(true); } diff --git a/src/applications/differential/view/DifferentialChangesetDetailView.php b/src/applications/differential/view/DifferentialChangesetDetailView.php --- a/src/applications/differential/view/DifferentialChangesetDetailView.php +++ b/src/applications/differential/view/DifferentialChangesetDetailView.php @@ -51,43 +51,43 @@ switch ($extension) { case 'psd': case 'ai': - $icon = 'preview'; + $icon = 'fa-eye'; break; case 'conf': - $icon = 'wrench'; + $icon = 'fa-wrench'; break; case 'wav': case 'mp3': case 'aiff': - $icon = 'music'; + $icon = 'fa-music'; break; case 'm4v': case 'mov': - $icon = 'film'; + $icon = 'fa-film'; break; case 'sql'; case 'db': case 'csv': - $icon = 'data'; + $icon = 'fa-table'; break; case 'ics': - $icon = 'calendar'; + $icon = 'fa-calendar'; break; case 'zip': case 'tar': case 'bz': case 'tgz': case 'gz': - $icon = 'zip'; + $icon = 'fa-archive'; break; case 'png': case 'jpg': case 'bmp': case 'gif': - $icon = 'image'; + $icon = 'fa-picture-o'; break; default: - $icon = 'file'; + $icon = 'fa-file'; break; } return $icon; @@ -128,8 +128,7 @@ $display_filename = $changeset->getDisplayFilename(); $display_icon = $this->getFileIcon($display_filename); $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon($display_icon); + ->setIconFont($display_icon); return javelin_tag( 'div', diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php --- a/src/applications/differential/view/DifferentialRevisionListView.php +++ b/src/applications/differential/view/DifferentialRevisionListView.php @@ -128,8 +128,7 @@ if (isset($icons['draft'])) { $draft = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('file-grey') + ->setIconFont('fa-comment-o lightgreytext') ->addSigil('has-tooltip') ->setMetadata( array( diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php --- a/src/applications/diffusion/controller/DiffusionBrowseController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseController.php @@ -94,7 +94,7 @@ id(new PhabricatorActionView()) ->setName(pht('View History')) ->setHref($history_uri) - ->setIcon('history')); + ->setIcon('fa-list')); $behind_head = $drequest->getRawCommit(); $head_uri = $drequest->generateURI( @@ -106,7 +106,7 @@ id(new PhabricatorActionView()) ->setName(pht('Jump to HEAD')) ->setHref($head_uri) - ->setIcon('home') + ->setIcon('fa-home') ->setDisabled(!$behind_head)); // TODO: Ideally, this should live in Owners and be event-triggered, but @@ -125,7 +125,7 @@ id(new PhabricatorActionView()) ->setName(pht('Find Owners')) ->setHref((string)$owners_uri) - ->setIcon('preview')); + ->setIcon('fa-users')); } return $view; diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php --- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php @@ -334,15 +334,15 @@ array( 'action' => 'change', ))) - ->setIcon('new')); + ->setIcon('fa-backward')); if ($show_blame) { $blame_text = pht('Disable Blame'); - $blame_icon = 'blame-grey'; + $blame_icon = 'fa-exclamation-circle lightgreytext'; $blame_value = 0; } else { $blame_text = pht('Enable Blame'); - $blame_icon = 'blame'; + $blame_icon = 'fa-exclamation-circle'; $blame_value = 1; } @@ -356,11 +356,11 @@ if ($show_color) { $highlight_text = pht('Disable Highlighting'); - $highlight_icon = 'highlight-grey'; + $highlight_icon = 'fa-star-o grey'; $highlight_value = 0; } else { $highlight_text = pht('Enable Highlighting'); - $highlight_icon = 'highlight'; + $highlight_icon = 'fa-star'; $highlight_value = 1; } @@ -393,7 +393,7 @@ id(new PhabricatorActionView()) ->setName($lint_text) ->setHref($href) - ->setIcon('warning') + ->setIcon('fa-exclamation-triangle') ->setDisabled(!$href)); return $view; @@ -413,8 +413,7 @@ $editor_link = $user->loadEditorLink($path, $line, $callsign); $icon_edit = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('edit'); + ->setIconFont('fa-pencil'); $button = id(new PHUIButtonView()) ->setTag('a') ->setText(pht('Open in Editor')) @@ -432,16 +431,15 @@ if ($file_uri) { $text = pht('Download Raw File'); $href = $file_uri; - $icon = 'download'; + $icon = 'fa-download'; } else { $text = pht('View Raw File'); $href = $base_uri->alter('view', 'raw'); - $icon = 'file'; + $icon = 'fa-file-text'; } $iconview = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon($icon); + ->setIconFont($icon); $button = id(new PHUIButtonView()) ->setTag('a') ->setText($text) diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php --- a/src/applications/diffusion/controller/DiffusionCommitController.php +++ b/src/applications/diffusion/controller/DiffusionCommitController.php @@ -252,8 +252,7 @@ if ($count > self::CHANGES_LIMIT && !$show_all_details) { $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('transcript'); + ->setIconFont('fa-files-o'); $button = id(new PHUIButtonView()) ->setText(pht('Show All Changes')) @@ -987,7 +986,7 @@ $action = id(new PhabricatorActionView()) ->setName(pht('Edit Commit')) ->setHref($uri) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit); $actions->addAction($action); @@ -999,7 +998,7 @@ if (PhabricatorApplication::isClassInstalled($maniphest)) { $action = id(new PhabricatorActionView()) ->setName(pht('Edit Maniphest Tasks')) - ->setIcon('attach') + ->setIcon('fa-anchor') ->setHref('/search/attach/'.$commit->getPHID().'/TASK/edge/') ->setWorkflow(true) ->setDisabled(!$can_edit); @@ -1009,7 +1008,7 @@ $action = id(new PhabricatorActionView()) ->setName(pht('Download Raw Diff')) ->setHref($request->getRequestURI()->alter('diff', true)) - ->setIcon('download'); + ->setIcon('fa-download'); $actions->addAction($action); return $actions; diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php @@ -287,8 +287,7 @@ } $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('fork'); + ->setIconFont('fa-fork'); $button = new PHUIButtonView(); $button->setText(pht("Show All Branches")); @@ -360,8 +359,7 @@ } $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('tag'); + ->setIconFont('fa-tag'); $button = new PHUIButtonView(); $button->setText(pht("Show All Tags")); @@ -399,7 +397,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Repository')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($edit_uri) ->setWorkflow(!$can_edit) ->setDisabled(!$can_edit)); @@ -412,7 +410,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('View Push Logs')) - ->setIcon('transcript') + ->setIcon('fa-list-alt') ->setHref($push_uri)); } @@ -461,8 +459,7 @@ $callsign = $drequest->getRepository()->getCallsign(); $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('transcript'); + ->setIconFont('fa-list-alt'); $button = id(new PHUIButtonView()) ->setText(pht('View Full History')) @@ -522,8 +519,7 @@ ->setHeader(pht('Repository')); $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('data'); + ->setIconFont('fa-folder-open'); $button = new PHUIButtonView(); $button->setText(pht('Browse Repository')); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php @@ -203,7 +203,7 @@ ->setUser($viewer); $edit = id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Basic Information')) ->setHref($this->getRepositoryControllerURI($repository, 'edit/basic/')); $view->addAction($edit); @@ -215,11 +215,11 @@ if ($repository->isTracked()) { $activate - ->setIcon('disable') + ->setIcon('fa-pause') ->setName(pht('Deactivate Repository')); } else { $activate - ->setIcon('enable') + ->setIcon('fa-play') ->setName(pht('Activate Repository')); } @@ -228,7 +228,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Delete Repository')) - ->setIcon('delete') + ->setIcon('fa-times') ->setHref( $this->getRepositoryControllerURI($repository, 'edit/delete/')) ->setDisabled(true) @@ -304,7 +304,7 @@ ->setUser($viewer); $edit = id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Text Encoding')) ->setHref( $this->getRepositoryControllerURI($repository, 'edit/encoding/')); @@ -341,7 +341,7 @@ ->setUser($viewer); $edit = id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Policies')) ->setHref( $this->getRepositoryControllerURI($repository, 'edit/policy/')); @@ -388,7 +388,7 @@ ->setUser($viewer); $edit = id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Branches')) ->setHref( $this->getRepositoryControllerURI($repository, 'edit/branches/')); @@ -438,7 +438,7 @@ ->setUser($viewer); $edit = id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Subversion Info')) ->setHref( $this->getRepositoryControllerURI($repository, 'edit/subversion/')); @@ -478,7 +478,7 @@ ->setUser($viewer); $edit = id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Actions')) ->setHref( $this->getRepositoryControllerURI($repository, 'edit/actions/')); @@ -520,7 +520,7 @@ ->setUser($viewer); $edit = id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Remote')) ->setHref( $this->getRepositoryControllerURI($repository, 'edit/remote/')); @@ -562,7 +562,7 @@ ->setUser($viewer); $edit = id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Local')) ->setHref( $this->getRepositoryControllerURI($repository, 'edit/local/')); @@ -596,7 +596,7 @@ ->setUser($user); $edit = id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Hosting')) ->setHref( $this->getRepositoryControllerURI($repository, 'edit/hosting/')); @@ -605,14 +605,14 @@ if ($repository->canAllowDangerousChanges()) { if ($repository->shouldAllowDangerousChanges()) { $changes = id(new PhabricatorActionView()) - ->setIcon('blame') + ->setIcon('fa-shield') ->setName(pht('Prevent Dangerous Changes')) ->setHref( $this->getRepositoryControllerURI($repository, 'edit/dangerous/')) ->setWorkflow(true); } else { $changes = id(new PhabricatorActionView()) - ->setIcon('warning') + ->setIcon('fa-bullseye') ->setName(pht('Allow Dangerous Changes')) ->setHref( $this->getRepositoryControllerURI($repository, 'edit/dangerous/')) @@ -1043,7 +1043,7 @@ $mirror_actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Add Mirror')) - ->setIcon('new') + ->setIcon('fa-plus') ->setHref($new_mirror_uri) ->setWorkflow(true)); @@ -1092,7 +1092,7 @@ $item->addAction( id(new PHUIListItemView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($edit_uri) ->setWorkflow(true)); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryListController.php b/src/applications/diffusion/controller/DiffusionRepositoryListController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryListController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryListController.php @@ -48,7 +48,7 @@ ->setName(pht('New Repository')) ->setHref($this->getApplicationURI('new/')) ->setDisabled(!$can_create) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/diviner/controller/DivinerMainController.php b/src/applications/diviner/controller/DivinerMainController.php --- a/src/applications/diviner/controller/DivinerMainController.php +++ b/src/applications/diviner/controller/DivinerMainController.php @@ -18,8 +18,7 @@ $crumbs->addTextCrumb(pht('Books')); $search_icon = id(new PHUIIconView()) - ->setSpriteIcon('search') - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS); + ->setIconFont('fa-search'); $query_button = id(new PHUIButtonView()) ->setTag('a') diff --git a/src/applications/drydock/controller/DrydockBlueprintListController.php b/src/applications/drydock/controller/DrydockBlueprintListController.php --- a/src/applications/drydock/controller/DrydockBlueprintListController.php +++ b/src/applications/drydock/controller/DrydockBlueprintListController.php @@ -33,7 +33,7 @@ ->setHref($this->getApplicationURI('/blueprint/create/')) ->setDisabled(!$can_create) ->setWorkflow(!$can_create) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/drydock/controller/DrydockBlueprintViewController.php b/src/applications/drydock/controller/DrydockBlueprintViewController.php --- a/src/applications/drydock/controller/DrydockBlueprintViewController.php +++ b/src/applications/drydock/controller/DrydockBlueprintViewController.php @@ -101,7 +101,7 @@ id(new PhabricatorActionView()) ->setHref($uri) ->setName(pht('Edit Blueprint')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setWorkflow(!$can_edit) ->setDisabled(!$can_edit)); diff --git a/src/applications/files/controller/PhabricatorFileController.php b/src/applications/files/controller/PhabricatorFileController.php --- a/src/applications/files/controller/PhabricatorFileController.php +++ b/src/applications/files/controller/PhabricatorFileController.php @@ -7,7 +7,7 @@ $crumbs->addAction( id(new PHUIListItemView()) ->setName(pht('Upload File')) - ->setIcon('create') // TODO: Get @chad to build an "upload" icon. + ->setIcon('fa-upload') ->setHref($this->getApplicationURI('/upload/'))); return $crumbs; diff --git a/src/applications/flag/constants/PhabricatorFlagColor.php b/src/applications/flag/constants/PhabricatorFlagColor.php --- a/src/applications/flag/constants/PhabricatorFlagColor.php +++ b/src/applications/flag/constants/PhabricatorFlagColor.php @@ -32,4 +32,18 @@ return 'phabricator-flag-color-'.(int)$color; } + public static function getIcon($color) { + $map = array( + self::COLOR_RED => 'fa-flag red', + self::COLOR_ORANGE => 'fa-flag orange', + self::COLOR_YELLOW => 'fa-flag yellow', + self::COLOR_GREEN => 'fa-flag green', + self::COLOR_BLUE => 'fa-flag blue', + self::COLOR_PINK => 'fa-flag indigo', // whhaaaa + self::COLOR_PURPLE => 'fa-flag purple', + self::COLOR_CHECKERED => 'fa-flag-checkered', + ); + return idx($map, $color); + } + } diff --git a/src/applications/flag/events/PhabricatorFlagsUIEventListener.php b/src/applications/flag/events/PhabricatorFlagsUIEventListener.php --- a/src/applications/flag/events/PhabricatorFlagsUIEventListener.php +++ b/src/applications/flag/events/PhabricatorFlagsUIEventListener.php @@ -36,17 +36,18 @@ if ($flag) { $color = PhabricatorFlagColor::getColorName($flag->getColor()); + $flag_icon = PhabricatorFlagColor::getIcon($flag->getColor()); $flag_action = id(new PhabricatorActionView()) ->setWorkflow(true) ->setHref('/flag/delete/'.$flag->getID().'/') ->setName(pht('Remove %s Flag', $color)) - ->setIcon('flag-'.$flag->getColor()); + ->setIcon($flag_icon); } else { $flag_action = id(new PhabricatorActionView()) ->setWorkflow(true) ->setHref('/flag/edit/'.$object->getPHID().'/') ->setName(pht('Flag For Later')) - ->setIcon('flag'); + ->setIcon('fa-flag'); if (!$user->isLoggedIn()) { $flag_action->setDisabled(true); diff --git a/src/applications/flag/query/PhabricatorFlagSearchEngine.php b/src/applications/flag/query/PhabricatorFlagSearchEngine.php --- a/src/applications/flag/query/PhabricatorFlagSearchEngine.php +++ b/src/applications/flag/query/PhabricatorFlagSearchEngine.php @@ -148,13 +148,13 @@ $item->addAction( id(new PHUIListItemView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI("edit/{$phid}/")) ->setWorkflow(true)); $item->addAction( id(new PHUIListItemView()) - ->setIcon('delete') + ->setIcon('fa-times') ->setHref($this->getApplicationURI("delete/{$id}/")) ->setWorkflow(true)); diff --git a/src/applications/harbormaster/controller/HarbormasterController.php b/src/applications/harbormaster/controller/HarbormasterController.php --- a/src/applications/harbormaster/controller/HarbormasterController.php +++ b/src/applications/harbormaster/controller/HarbormasterController.php @@ -9,7 +9,7 @@ id(new PHUIListItemView()) ->setName(pht('New Build Plan')) ->setHref($this->getApplicationURI('plan/edit/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php --- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php +++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php @@ -118,7 +118,7 @@ $step->getClassName())) ->addAction( id(new PHUIListItemView()) - ->setIcon('delete') + ->setIcon('fa-times') ->addSigil('harbormaster-build-step-delete') ->setWorkflow(true) ->setRenderNameAsTooltip(true) @@ -152,7 +152,7 @@ ->setHref($edit_uri) ->addAction( id(new PHUIListItemView()) - ->setIcon('delete') + ->setIcon('fa-times') ->addSigil('harbormaster-build-step-delete') ->setWorkflow(true) ->setDisabled(!$can_edit) @@ -224,7 +224,7 @@ ->setHref($this->getApplicationURI("plan/edit/{$id}/")) ->setWorkflow(!$can_edit) ->setDisabled(!$can_edit) - ->setIcon('edit')); + ->setIcon('fa-pencil')); if ($plan->isDisabled()) { $list->addAction( @@ -233,7 +233,7 @@ ->setHref($this->getApplicationURI("plan/disable/{$id}/")) ->setWorkflow(true) ->setDisabled(!$can_edit) - ->setIcon('enable')); + ->setIcon('fa-check')); } else { $list->addAction( id(new PhabricatorActionView()) @@ -241,7 +241,7 @@ ->setHref($this->getApplicationURI("plan/disable/{$id}/")) ->setWorkflow(true) ->setDisabled(!$can_edit) - ->setIcon('disable')); + ->setIcon('fa-ban')); } $list->addAction( @@ -250,7 +250,7 @@ ->setHref($this->getApplicationURI("step/add/{$id}/")) ->setWorkflow(true) ->setDisabled(!$can_edit) - ->setIcon('new')); + ->setIcon('fa-plus')); $list->addAction( id(new PhabricatorActionView()) @@ -258,7 +258,7 @@ ->setHref($this->getApplicationURI("plan/run/{$id}/")) ->setWorkflow(true) ->setDisabled(!$can_edit) - ->setIcon('start-sandcastle')); + ->setIcon('fa-play-circle')); return $list; } diff --git a/src/applications/herald/controller/HeraldController.php b/src/applications/herald/controller/HeraldController.php --- a/src/applications/herald/controller/HeraldController.php +++ b/src/applications/herald/controller/HeraldController.php @@ -27,7 +27,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Herald Rule')) ->setHref($this->getApplicationURI('new/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/herald/controller/HeraldRuleViewController.php b/src/applications/herald/controller/HeraldRuleViewController.php --- a/src/applications/herald/controller/HeraldRuleViewController.php +++ b/src/applications/herald/controller/HeraldRuleViewController.php @@ -83,17 +83,17 @@ id(new PhabricatorActionView()) ->setName(pht('Edit Rule')) ->setHref($this->getApplicationURI("edit/{$id}/")) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); if ($rule->getIsDisabled()) { $disable_uri = "disable/{$id}/enable/"; - $disable_icon = 'enable'; + $disable_icon = 'fa-check-circle-o'; $disable_name = pht('Enable Rule'); } else { $disable_uri = "disable/{$id}/disable/"; - $disable_icon = 'disable'; + $disable_icon = 'fa-ban'; $disable_name = pht('Disable Rule'); } diff --git a/src/applications/legalpad/controller/LegalpadController.php b/src/applications/legalpad/controller/LegalpadController.php --- a/src/applications/legalpad/controller/LegalpadController.php +++ b/src/applications/legalpad/controller/LegalpadController.php @@ -29,7 +29,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Document')) ->setHref($this->getApplicationURI('create/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/legalpad/controller/LegalpadDocumentViewController.php b/src/applications/legalpad/controller/LegalpadDocumentViewController.php --- a/src/applications/legalpad/controller/LegalpadDocumentViewController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentViewController.php @@ -137,7 +137,7 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Document')) ->setHref($this->getApplicationURI('/edit/'.$doc_id.'/')) ->setDisabled(!$can_edit) @@ -145,13 +145,13 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('like') + ->setIcon('fa-pencil-square') ->setName(pht('Sign Document')) ->setHref('/'.$document->getMonogram())); $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('transcript') + ->setIcon('fa-terminal') ->setName(pht('View Signatures')) ->setHref($this->getApplicationURI('/signatures/'.$doc_id.'/'))); diff --git a/src/applications/macro/controller/PhabricatorMacroController.php b/src/applications/macro/controller/PhabricatorMacroController.php --- a/src/applications/macro/controller/PhabricatorMacroController.php +++ b/src/applications/macro/controller/PhabricatorMacroController.php @@ -35,7 +35,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Macro')) ->setHref($this->getApplicationURI('/create/')) - ->setIcon('create') + ->setIcon('fa-plus-square') ->setDisabled(!$can_manage) ->setWorkflow(!$can_manage)); diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php --- a/src/applications/macro/controller/PhabricatorMacroViewController.php +++ b/src/applications/macro/controller/PhabricatorMacroViewController.php @@ -134,7 +134,7 @@ ->setHref($this->getApplicationURI('/edit/'.$macro->getID().'/')) ->setDisabled(!$can_manage) ->setWorkflow(!$can_manage) - ->setIcon('edit')); + ->setIcon('fa-pencil')); $view->addAction( id(new PhabricatorActionView()) @@ -142,7 +142,7 @@ ->setHref($this->getApplicationURI('/audio/'.$macro->getID().'/')) ->setDisabled(!$can_manage) ->setWorkflow(!$can_manage) - ->setIcon('herald')); + ->setIcon('fa-music')); if ($macro->getIsDisabled()) { $view->addAction( @@ -151,7 +151,7 @@ ->setHref($this->getApplicationURI('/disable/'.$macro->getID().'/')) ->setWorkflow(true) ->setDisabled(!$can_manage) - ->setIcon('undo')); + ->setIcon('fa-check-circle-o')); } else { $view->addAction( id(new PhabricatorActionView()) @@ -159,7 +159,7 @@ ->setHref($this->getApplicationURI('/disable/'.$macro->getID().'/')) ->setWorkflow(true) ->setDisabled(!$can_manage) - ->setIcon('delete')); + ->setIcon('fa-ban')); } return $view; diff --git a/src/applications/mailinglists/controller/PhabricatorMailingListsController.php b/src/applications/mailinglists/controller/PhabricatorMailingListsController.php --- a/src/applications/mailinglists/controller/PhabricatorMailingListsController.php +++ b/src/applications/mailinglists/controller/PhabricatorMailingListsController.php @@ -32,7 +32,7 @@ id(new PHUIListItemView()) ->setName(pht('Create List')) ->setHref($this->getApplicationURI('edit/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/mailinglists/query/PhabricatorMailingListSearchEngine.php b/src/applications/mailinglists/query/PhabricatorMailingListSearchEngine.php --- a/src/applications/mailinglists/query/PhabricatorMailingListSearchEngine.php +++ b/src/applications/mailinglists/query/PhabricatorMailingListSearchEngine.php @@ -71,7 +71,7 @@ $item->addAttribute($list->getEmail()); $item->addAction( id(new PHUIListItemView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI('/edit/'.$list->getID().'/'))); $view->addItem($item); diff --git a/src/applications/maniphest/controller/ManiphestController.php b/src/applications/maniphest/controller/ManiphestController.php --- a/src/applications/maniphest/controller/ManiphestController.php +++ b/src/applications/maniphest/controller/ManiphestController.php @@ -38,7 +38,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Task')) ->setHref($this->getApplicationURI('task/create/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -208,8 +208,7 @@ $submit_control = id(new PHUIFormMultiSubmitControl()); if (!$task->isClosed()) { $close_image = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('check'); + ->setIconFont('fa-check-square-o'); $submit_control->addButtonView( id(new PHUIButtonView()) ->setColor(PHUIButtonView::GREY) @@ -441,7 +440,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Task')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI("/task/edit/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); @@ -451,11 +450,11 @@ id(new PhabricatorActionView()) ->setName(pht('Automatically Subscribed')) ->setDisabled(true) - ->setIcon('enable')); + ->setIcon('fa-check-circle')); } else { $action = $viewer_is_cc ? 'rem' : 'add'; $name = $viewer_is_cc ? pht('Unsubscribe') : pht('Subscribe'); - $icon = $viewer_is_cc ? 'disable' : 'check'; + $icon = $viewer_is_cc ? 'fa-minus-circle' : 'fa-plus-circle'; $view->addAction( id(new PhabricatorActionView()) @@ -471,7 +470,7 @@ ->setName(pht('Merge Duplicates In')) ->setHref("/search/attach/{$phid}/TASK/merge/") ->setWorkflow(true) - ->setIcon('merge') + ->setIcon('fa-compress') ->setDisabled(!$can_edit) ->setWorkflow(true)); @@ -479,14 +478,14 @@ id(new PhabricatorActionView()) ->setName(pht('Create Subtask')) ->setHref($this->getApplicationURI("/task/create/?parent={$id}")) - ->setIcon('fork')); + ->setIcon('fa-level-down')); $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Dependencies')) ->setHref("/search/attach/{$phid}/TASK/dependencies/") ->setWorkflow(true) - ->setIcon('link') + ->setIcon('fa-link') ->setDisabled(!$can_edit) ->setWorkflow(true)); diff --git a/src/applications/maniphest/event/ManiphestActionMenuEventListener.php b/src/applications/maniphest/event/ManiphestActionMenuEventListener.php --- a/src/applications/maniphest/event/ManiphestActionMenuEventListener.php +++ b/src/applications/maniphest/event/ManiphestActionMenuEventListener.php @@ -38,8 +38,7 @@ $phid); return id(new PhabricatorActionView()) - ->setIcon('maniphest-dark') - ->setIconSheet(PHUIIconView::SPRITE_APPS) + ->setIcon('fa-anchor') ->setName(pht('View Tasks')) ->setHref($view_uri); } diff --git a/src/applications/maniphest/view/ManiphestTaskListView.php b/src/applications/maniphest/view/ManiphestTaskListView.php --- a/src/applications/maniphest/view/ManiphestTaskListView.php +++ b/src/applications/maniphest/view/ManiphestTaskListView.php @@ -91,7 +91,7 @@ if ($this->showBatchControls) { $item->addAction( id(new PHUIListItemView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->addSigil('maniphest-edit-task') ->setHref('/maniphest/task/edit/'.$task->getID().'/')); } diff --git a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php --- a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php +++ b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php @@ -104,7 +104,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Policies')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit) ->setHref($edit_uri)); @@ -114,7 +114,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Uninstall')) - ->setIcon('delete') + ->setIcon('fa-times') ->setDisabled(!$can_edit) ->setWorkflow(true) ->setHref( @@ -122,7 +122,7 @@ } else { $action = id(new PhabricatorActionView()) ->setName(pht('Install')) - ->setIcon('new') + ->setIcon('fa-plus') ->setDisabled(!$can_edit) ->setWorkflow(true) ->setHref( @@ -140,7 +140,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Uninstall')) - ->setIcon('delete') + ->setIcon('fa-times') ->setWorkflow(true) ->setDisabled(true) ->setHref( diff --git a/src/applications/notification/controller/PhabricatorNotificationListController.php b/src/applications/notification/controller/PhabricatorNotificationListController.php --- a/src/applications/notification/controller/PhabricatorNotificationListController.php +++ b/src/applications/notification/controller/PhabricatorNotificationListController.php @@ -57,8 +57,7 @@ ->appendChild($view); $image = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('preview'); + ->setIconFont('fa-eye-slash'); $button = id(new PHUIButtonView()) ->setTag('a') ->setColor(PHUIButtonView::SIMPLE) diff --git a/src/applications/notification/controller/PhabricatorNotificationStatusController.php b/src/applications/notification/controller/PhabricatorNotificationStatusController.php --- a/src/applications/notification/controller/PhabricatorNotificationStatusController.php +++ b/src/applications/notification/controller/PhabricatorNotificationStatusController.php @@ -60,8 +60,7 @@ )); $test_icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('warning'); + ->setIconFont('fa-exclamation-triangle'); $test_button = id(new PHUIButtonView()) ->setTag('a') diff --git a/src/applications/nuance/controller/NuanceSourceViewController.php b/src/applications/nuance/controller/NuanceSourceViewController.php --- a/src/applications/nuance/controller/NuanceSourceViewController.php +++ b/src/applications/nuance/controller/NuanceSourceViewController.php @@ -98,7 +98,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Source')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI("source/edit/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php --- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php +++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php @@ -30,7 +30,7 @@ id(new PHUIListItemView()) ->setHref($this->getApplicationURI('client/create/')) ->setName(pht('Create Application')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php --- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php +++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php @@ -70,7 +70,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Application')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setWorkflow(!$can_edit) ->setDisabled(!$can_edit) ->setHref($client->getEditURI())); @@ -78,7 +78,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Delete Application')) - ->setIcon('delete') + ->setIcon('fa-times') ->setWorkflow(true) ->setDisabled(!$can_edit) ->setHref($client->getDeleteURI())); @@ -86,7 +86,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Create Test Authorization')) - ->setIcon('wrench') + ->setIcon('fa-wrench') ->setWorkflow(true) ->setDisabled($is_authorized) ->setHref($this->getApplicationURI('test/'.$client->getID().'/'))); diff --git a/src/applications/owners/controller/PhabricatorOwnersController.php b/src/applications/owners/controller/PhabricatorOwnersController.php --- a/src/applications/owners/controller/PhabricatorOwnersController.php +++ b/src/applications/owners/controller/PhabricatorOwnersController.php @@ -51,7 +51,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Package')) ->setHref('/owners/new/') - ->setIcon('create')); + ->setIcon('fa-plus-square')); $nav->setCrumbs($crumbs); diff --git a/src/applications/passphrase/controller/PassphraseController.php b/src/applications/passphrase/controller/PassphraseController.php --- a/src/applications/passphrase/controller/PassphraseController.php +++ b/src/applications/passphrase/controller/PassphraseController.php @@ -32,7 +32,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Credential')) ->setHref($this->getApplicationURI('create/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/passphrase/controller/PassphraseCredentialViewController.php b/src/applications/passphrase/controller/PassphraseCredentialViewController.php --- a/src/applications/passphrase/controller/PassphraseCredentialViewController.php +++ b/src/applications/passphrase/controller/PassphraseCredentialViewController.php @@ -88,10 +88,10 @@ $is_locked = $credential->getIsLocked(); if ($is_locked) { $credential_lock_text = pht('Locked Permanently'); - $credential_lock_icon = 'lock'; + $credential_lock_icon = 'fa-lock'; } else { $credential_lock_text = pht('Lock Permanently'); - $credential_lock_icon = 'unlock'; + $credential_lock_icon = 'fa-unlock'; } $actions = id(new PhabricatorActionListView()) @@ -106,7 +106,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Credential')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI("edit/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); @@ -115,7 +115,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Destroy Credential')) - ->setIcon('delete') + ->setIcon('fa-times') ->setHref($this->getApplicationURI("destroy/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(true)); @@ -123,7 +123,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Show Secret')) - ->setIcon('preview') + ->setIcon('fa-eye') ->setHref($this->getApplicationURI("reveal/{$id}/")) ->setDisabled(!$can_edit || $is_locked) ->setWorkflow(true)); @@ -132,7 +132,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Show Public Key')) - ->setIcon('download-alt') + ->setIcon('fa-download') ->setHref($this->getApplicationURI("public/{$id}/")) ->setWorkflow(true) ->setDisabled($is_locked)); diff --git a/src/applications/paste/controller/PhabricatorPasteController.php b/src/applications/paste/controller/PhabricatorPasteController.php --- a/src/applications/paste/controller/PhabricatorPasteController.php +++ b/src/applications/paste/controller/PhabricatorPasteController.php @@ -35,7 +35,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Paste')) ->setHref($this->getApplicationURI('create/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/paste/controller/PhabricatorPasteViewController.php b/src/applications/paste/controller/PhabricatorPasteViewController.php --- a/src/applications/paste/controller/PhabricatorPasteViewController.php +++ b/src/applications/paste/controller/PhabricatorPasteViewController.php @@ -174,21 +174,21 @@ ->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Paste')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit) ->setHref($this->getApplicationURI('/edit/'.$paste->getID().'/'))) ->addAction( id(new PhabricatorActionView()) ->setName(pht('Fork This Paste')) - ->setIcon('fork') + ->setIcon('fa-code-fork') ->setDisabled(!$can_fork) ->setWorkflow(!$can_fork) ->setHref($fork_uri)) ->addAction( id(new PhabricatorActionView()) ->setName(pht('View Raw File')) - ->setIcon('file') + ->setIcon('fa-file-text-o') ->setHref($file->getBestURI())); } diff --git a/src/applications/people/controller/PhabricatorPeopleController.php b/src/applications/people/controller/PhabricatorPeopleController.php --- a/src/applications/people/controller/PhabricatorPeopleController.php +++ b/src/applications/people/controller/PhabricatorPeopleController.php @@ -42,7 +42,7 @@ id(new PHUIListItemView()) ->setName(pht('Create New User')) ->setHref($this->getApplicationURI('create/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); } return $crumbs; diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php --- a/src/applications/people/controller/PhabricatorPeopleProfileController.php +++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php @@ -49,7 +49,7 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Profile')) ->setHref($this->getApplicationURI('editprofile/'.$user->getID().'/')) ->setDisabled(!$can_edit) @@ -57,7 +57,7 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('image') + ->setIcon('fa-picture-o') ->setName(pht('Edit Profile Picture')) ->setHref($this->getApplicationURI('picture/'.$user->getID().'/')) ->setDisabled(!$can_edit) @@ -66,17 +66,17 @@ if ($viewer->getIsAdmin()) { $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('wrench') + ->setIcon('fa-wrench') ->setName(pht('Edit Settings')) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit) ->setHref('/settings/'.$user->getID().'/')); if ($user->getIsAdmin()) { - $empower_icon = 'lower-priority'; + $empower_icon = 'fa-arrow-circle-o-down'; $empower_name = pht('Remove Administrator'); } else { - $empower_icon = 'raise-priority'; + $empower_icon = 'fa-arrow-circle-o-up'; $empower_name = pht('Make Administrator'); } @@ -90,16 +90,16 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('tag') + ->setIcon('fa-tag') ->setName(pht('Change Username')) ->setWorkflow(true) ->setHref($this->getApplicationURI('rename/'.$user->getID().'/'))); if ($user->getIsDisabled()) { - $disable_icon = 'enable'; + $disable_icon = 'fa-check-circle-o'; $disable_name = pht('Enable User'); } else { - $disable_icon = 'disable'; + $disable_icon = 'fa-ban'; $disable_name = pht('Disable User'); } @@ -113,7 +113,7 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('delete') + ->setIcon('fa-times') ->setName(pht('Delete User')) ->setDisabled(($user->getPHID() == $viewer->getPHID())) ->setWorkflow(true) @@ -121,7 +121,7 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('message') + ->setIcon('fa-envelope') ->setName(pht('Send Welcome Email')) ->setWorkflow(true) ->setHref($this->getApplicationURI('welcome/'.$user->getID().'/'))); 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 @@ -114,12 +114,12 @@ id(new PHUIListItemView()) ->setName(pht('New Blog')) ->setHref($this->getApplicationURI('/blog/new')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); $crumbs->addAction( id(new PHUIListItemView()) ->setName(pht('New Post')) ->setHref($this->getApplicationURI('/post/new')) - ->setIcon('new')); + ->setIcon('fa-pencil')); return $crumbs; } } diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php --- a/src/applications/phame/controller/blog/PhameBlogViewController.php +++ b/src/applications/phame/controller/blog/PhameBlogViewController.php @@ -160,7 +160,7 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('new') + ->setIcon('fa-plus') ->setHref($this->getApplicationURI('post/edit/?blog='.$blog->getID())) ->setName(pht('Write Post')) ->setDisabled(!$can_join) @@ -169,13 +169,13 @@ $actions->addAction( id(new PhabricatorActionView()) ->setUser($user) - ->setIcon('world') + ->setIcon('fa-globe') ->setHref($blog->getLiveURI()) ->setName(pht('View Live'))); $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI('blog/edit/'.$blog->getID().'/')) ->setName('Edit Blog') ->setDisabled(!$can_edit) @@ -183,7 +183,7 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('delete') + ->setIcon('fa-times') ->setHref($this->getApplicationURI('blog/delete/'.$blog->getID().'/')) ->setName('Delete Blog') ->setDisabled(!$can_edit) diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php --- a/src/applications/phame/controller/post/PhamePostViewController.php +++ b/src/applications/phame/controller/post/PhamePostViewController.php @@ -102,7 +102,7 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI('post/edit/'.$id.'/')) ->setName(pht('Edit Post')) ->setDisabled(!$can_edit) @@ -110,7 +110,7 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('move') + ->setIcon('fa-arrows') ->setHref($this->getApplicationURI('post/move/'.$id.'/')) ->setName(pht('Move Post')) ->setDisabled(!$can_edit) diff --git a/src/applications/phid/PhabricatorObjectHandle.php b/src/applications/phid/PhabricatorObjectHandle.php --- a/src/applications/phid/PhabricatorObjectHandle.php +++ b/src/applications/phid/PhabricatorObjectHandle.php @@ -229,8 +229,7 @@ $icon = null; if ($this->getPolicyFiltered()) { $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('lock-grey'); + ->setIconFont('fa-lock lightgreytext'); } return phutil_tag( diff --git a/src/applications/phlux/controller/PhluxController.php b/src/applications/phlux/controller/PhluxController.php --- a/src/applications/phlux/controller/PhluxController.php +++ b/src/applications/phlux/controller/PhluxController.php @@ -8,7 +8,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Variable')) ->setHref($this->getApplicationURI('/edit/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/phlux/controller/PhluxViewController.php b/src/applications/phlux/controller/PhluxViewController.php --- a/src/applications/phlux/controller/PhluxViewController.php +++ b/src/applications/phlux/controller/PhluxViewController.php @@ -44,7 +44,7 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Variable')) ->setHref($this->getApplicationURI('/edit/'.$var->getVariableKey().'/')) ->setDisabled(!$can_edit) diff --git a/src/applications/pholio/controller/PholioController.php b/src/applications/pholio/controller/PholioController.php --- a/src/applications/pholio/controller/PholioController.php +++ b/src/applications/pholio/controller/PholioController.php @@ -31,7 +31,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Mock')) ->setHref($this->getApplicationURI('new/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php --- a/src/applications/pholio/controller/PholioMockViewController.php +++ b/src/applications/pholio/controller/PholioMockViewController.php @@ -174,7 +174,7 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Mock')) ->setHref($this->getApplicationURI('/edit/'.$mock->getID().'/')) ->setDisabled(!$can_edit) @@ -182,7 +182,7 @@ $actions->addAction( id(new PhabricatorActionView()) - ->setIcon('attach') + ->setIcon('fa-anchor') ->setName(pht('Edit Maniphest Tasks')) ->setHref("/search/attach/{$mock->getPHID()}/TASK/edge/") ->setDisabled(!$user->isLoggedIn()) diff --git a/src/applications/pholio/event/PholioActionMenuEventListener.php b/src/applications/pholio/event/PholioActionMenuEventListener.php --- a/src/applications/pholio/event/PholioActionMenuEventListener.php +++ b/src/applications/pholio/event/PholioActionMenuEventListener.php @@ -43,7 +43,7 @@ ->setName(pht('Edit Pholio Mocks')) ->setHref("/search/attach/{$phid}/MOCK/edge/") ->setWorkflow(true) - ->setIcon('attach') + ->setIcon('fa-camera-retro') ->setDisabled(!$can_edit) ->setWorkflow(true); } diff --git a/src/applications/pholio/query/PholioMockSearchEngine.php b/src/applications/pholio/query/PholioMockSearchEngine.php --- a/src/applications/pholio/query/PholioMockSearchEngine.php +++ b/src/applications/pholio/query/PholioMockSearchEngine.php @@ -99,8 +99,8 @@ ->setURI('/M'.$mock->getID()) ->setImageURI($mock->getCoverFile()->getThumb280x210URI()) ->setImageSize(280, 210) - ->addIconCount('image', count($mock->getImages())) - ->addIconCount('like', $mock->getTokenCount()); + ->addIconCount('fa-picture-o', count($mock->getImages())) + ->addIconCount('fa-trophy', $mock->getTokenCount()); if ($mock->getAuthorPHID()) { $author_handle = $handles[$mock->getAuthorPHID()]; diff --git a/src/applications/pholio/view/PholioMockEmbedView.php b/src/applications/pholio/view/PholioMockEmbedView.php --- a/src/applications/pholio/view/PholioMockEmbedView.php +++ b/src/applications/pholio/view/PholioMockEmbedView.php @@ -82,18 +82,15 @@ $thumbnails); $icons_data = array( - 'image' => count($this->mock->getImages()), - 'like' => $this->mock->getTokenCount()); + 'fa-picture-o' => count($this->mock->getImages()), + 'fa-trophy' => $this->mock->getTokenCount()); $icon_list = array(); foreach ($icons_data as $icon_name => $icon_value) { - $icon = phutil_tag( - 'span', - array( - 'class' => - 'pholio-mock-embed-icon sprite-icons icons-'.$icon_name.'-white', - ), - ' '); + $icon = id(new PHUIIconView()) + ->setIconFont($icon_name.' white') + ->addClass('pholio-mock-embed-icon'); + $count = phutil_tag('span', array(), $icon_value); $icon_list[] = phutil_tag( diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/PhortuneAccountViewController.php --- a/src/applications/phortune/controller/PhortuneAccountViewController.php +++ b/src/applications/phortune/controller/PhortuneAccountViewController.php @@ -35,13 +35,13 @@ ->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Account')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref('#') ->setDisabled(true)) ->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Members')) - ->setIcon('transcript') + ->setIcon('fa-users') ->setHref('#') ->setDisabled(true)); @@ -92,7 +92,7 @@ ->addAction( id(new PhabricatorActionView()) ->setName(pht('Add Payment Method')) - ->setIcon('new') + ->setIcon('fa-plus') ->setHref($add_uri)); $list = id(new PHUIObjectItemListView()) diff --git a/src/applications/phortune/controller/PhortuneProductListController.php b/src/applications/phortune/controller/PhortuneProductListController.php --- a/src/applications/phortune/controller/PhortuneProductListController.php +++ b/src/applications/phortune/controller/PhortuneProductListController.php @@ -22,7 +22,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Product')) ->setHref($this->getApplicationURI('product/edit/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); $header = id(new PHUIHeaderView()) ->setHeader(pht('Product List')); diff --git a/src/applications/phortune/controller/PhortuneProductViewController.php b/src/applications/phortune/controller/PhortuneProductViewController.php --- a/src/applications/phortune/controller/PhortuneProductViewController.php +++ b/src/applications/phortune/controller/PhortuneProductViewController.php @@ -39,13 +39,13 @@ id(new PhabricatorActionView()) ->setName(pht('Edit Product')) ->setHref($edit_uri) - ->setIcon('edit')) + ->setIcon('fa-pencil')) ->addAction( id(new PhabricatorActionView()) ->setUser($user) ->setName(pht('Purchase')) ->setHref($cart_uri) - ->setIcon('new') + ->setIcon('fa-shopping-cart') ->setRenderAsForm(true)); $crumbs = $this->buildApplicationCrumbs(); diff --git a/src/applications/phragment/controller/PhragmentBrowseController.php b/src/applications/phragment/controller/PhragmentBrowseController.php --- a/src/applications/phragment/controller/PhragmentBrowseController.php +++ b/src/applications/phragment/controller/PhragmentBrowseController.php @@ -34,7 +34,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Fragment')) ->setHref($this->getApplicationURI('/create/'.$path)) - ->setIcon('create')); + ->setIcon('fa-plus-square')); } $current_box = $this->createCurrentFragmentView($current, false); diff --git a/src/applications/phragment/controller/PhragmentController.php b/src/applications/phragment/controller/PhragmentController.php --- a/src/applications/phragment/controller/PhragmentController.php +++ b/src/applications/phragment/controller/PhragmentController.php @@ -105,13 +105,13 @@ ->setName(pht('Download Fragment')) ->setHref($this->isCorrectlyConfigured() ? $file_uri : null) ->setDisabled($file === null || !$this->isCorrectlyConfigured()) - ->setIcon('download')); + ->setIcon('fa-download')); $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Download Contents as ZIP')) ->setHref($this->isCorrectlyConfigured() ? $zip_uri : null) ->setDisabled(!$this->isCorrectlyConfigured()) - ->setIcon('zip')); + ->setIcon('fa-floppy-o')); if (!$fragment->isDirectory()) { $actions->addAction( id(new PhabricatorActionView()) @@ -119,7 +119,7 @@ ->setHref($this->getApplicationURI("update/".$fragment->getPath())) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit) - ->setIcon('edit')); + ->setIcon('fa-refresh')); } else { $actions->addAction( id(new PhabricatorActionView()) @@ -127,7 +127,7 @@ ->setHref($this->getApplicationURI("update/".$fragment->getPath())) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit) - ->setIcon('edit')); + ->setIcon('fa-file-o')); } $actions->addAction( id(new PhabricatorActionView()) @@ -135,19 +135,19 @@ ->setHref($this->getApplicationURI("policy/".$fragment->getPath())) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit) - ->setIcon('edit')); + ->setIcon('fa-asterisk')); if ($is_history_view) { $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('View Child Fragments')) ->setHref($this->getApplicationURI("browse/".$fragment->getPath())) - ->setIcon('browse')); + ->setIcon('fa-search-plus')); } else { $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('View History')) ->setHref($this->getApplicationURI("history/".$fragment->getPath())) - ->setIcon('history')); + ->setIcon('fa-list')); } $actions->addAction( id(new PhabricatorActionView()) @@ -156,7 +156,7 @@ "snapshot/create/".$fragment->getPath())) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit) - ->setIcon('snapshot')); + ->setIcon('fa-files-o')); $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Promote Snapshot to Here')) @@ -164,7 +164,7 @@ "snapshot/promote/latest/".$fragment->getPath())) ->setWorkflow(true) ->setDisabled(!$can_edit) - ->setIcon('promote')); + ->setIcon('fa-arrow-circle-up')); $properties = id(new PHUIPropertyListView()) ->setUser($viewer) diff --git a/src/applications/phragment/controller/PhragmentHistoryController.php b/src/applications/phragment/controller/PhragmentHistoryController.php --- a/src/applications/phragment/controller/PhragmentHistoryController.php +++ b/src/applications/phragment/controller/PhragmentHistoryController.php @@ -31,7 +31,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Fragment')) ->setHref($this->getApplicationURI('/create/'.$path)) - ->setIcon('create')); + ->setIcon('fa-plus-square')); } $current_box = $this->createCurrentFragmentView($current, true); diff --git a/src/applications/phrequent/event/PhrequentUIEventListener.php b/src/applications/phrequent/event/PhrequentUIEventListener.php --- a/src/applications/phrequent/event/PhrequentUIEventListener.php +++ b/src/applications/phrequent/event/PhrequentUIEventListener.php @@ -43,14 +43,14 @@ if (!$tracking) { $track_action = id(new PhabricatorActionView()) ->setName(pht('Start Tracking Time')) - ->setIcon('history') + ->setIcon('fa-clock-o') ->setWorkflow(true) ->setRenderAsForm(true) ->setHref('/phrequent/track/start/'.$object->getPHID().'/'); } else { $track_action = id(new PhabricatorActionView()) ->setName(pht('Stop Tracking Time')) - ->setIcon('history') + ->setIcon('fa-clock-o red') ->setWorkflow(true) ->setRenderAsForm(true) ->setHref('/phrequent/track/stop/'.$object->getPHID().'/'); diff --git a/src/applications/phriction/controller/PhrictionController.php b/src/applications/phriction/controller/PhrictionController.php --- a/src/applications/phriction/controller/PhrictionController.php +++ b/src/applications/phriction/controller/PhrictionController.php @@ -37,7 +37,7 @@ id(new PHUIListItemView()) ->setName(pht('Index')) ->setHref('/phriction/') - ->setIcon('transcript')); + ->setIcon('fa-home')); } $crumbs->addAction( @@ -45,7 +45,7 @@ ->setName(pht('New Document')) ->setHref('/phriction/new/?slug='.$this->getDocumentSlug()) ->setWorkflow(true) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php --- a/src/applications/phriction/controller/PhrictionDocumentController.php +++ b/src/applications/phriction/controller/PhrictionDocumentController.php @@ -278,28 +278,28 @@ return $action_view->addAction( id(new PhabricatorActionView()) ->setName(pht('Create This Document')) - ->setIcon('create') + ->setIcon('fa-plus-square') ->setHref('/phriction/edit/?slug='.$slug)); } $action_view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Document')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref('/phriction/edit/'.$document->getID().'/')); if ($document->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS) { $action_view->addAction( id(new PhabricatorActionView()) ->setName(pht('Move Document')) - ->setIcon('move') + ->setIcon('fa-arrows') ->setHref('/phriction/move/'.$document->getID().'/') ->setWorkflow(true)); $action_view->addAction( id(new PhabricatorActionView()) ->setName(pht('Delete Document')) - ->setIcon('delete') + ->setIcon('fa-times') ->setHref('/phriction/delete/'.$document->getID().'/') ->setWorkflow(true)); } @@ -308,7 +308,7 @@ $action_view->addAction( id(new PhabricatorActionView()) ->setName(pht('View History')) - ->setIcon('history') + ->setIcon('fa-list') ->setHref(PhrictionDocument::getSlugURI($slug, 'history'))); } diff --git a/src/applications/phriction/event/PhrictionActionMenuEventListener.php b/src/applications/phriction/event/PhrictionActionMenuEventListener.php --- a/src/applications/phriction/event/PhrictionActionMenuEventListener.php +++ b/src/applications/phriction/event/PhrictionActionMenuEventListener.php @@ -35,8 +35,7 @@ $href = '/w/projects/'.$slug; return id(new PhabricatorActionView()) - ->setIcon('phriction-dark') - ->setIconSheet(PHUIIconView::SPRITE_APPS) + ->setIcon('fa-book') ->setName(pht('View Wiki')) ->setHref($href); } diff --git a/src/applications/ponder/controller/PonderController.php b/src/applications/ponder/controller/PonderController.php --- a/src/applications/ponder/controller/PonderController.php +++ b/src/applications/ponder/controller/PonderController.php @@ -24,7 +24,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Question')) ->setHref('/ponder/question/edit/') - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php --- a/src/applications/ponder/controller/PonderQuestionViewController.php +++ b/src/applications/ponder/controller/PonderQuestionViewController.php @@ -93,20 +93,20 @@ $view->addAction( id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Question')) ->setHref($this->getApplicationURI("/question/edit/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); if ($question->getStatus() == PonderQuestionStatus::STATUS_OPEN) { - $name = pht("Close Question"); - $icon = "delete"; - $href = "close"; + $name = pht('Close Question'); + $icon = 'fa-times'; + $href = 'close'; } else { - $name = pht("Reopen Question"); - $icon = "enable"; - $href = "open"; + $name = pht('Reopen Question'); + $icon = 'fa-check-circle-o'; + $href = 'open'; } $view->addAction( @@ -120,7 +120,7 @@ $view->addAction( id(new PhabricatorActionView()) - ->setIcon('transcript') + ->setIcon('fa-list') ->setName(pht('View History')) ->setHref($this->getApplicationURI("/question/history/{$id}/"))); @@ -316,7 +316,7 @@ $view->addAction( id(new PhabricatorActionView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setName(pht('Edit Answer')) ->setHref($this->getApplicationURI("/answer/edit/{$id}/")) ->setDisabled(!$can_edit) @@ -324,7 +324,7 @@ $view->addAction( id(new PhabricatorActionView()) - ->setIcon('transcript') + ->setIcon('fa-list') ->setName(pht('View History')) ->setHref($this->getApplicationURI("/answer/history/{$id}/"))); diff --git a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php --- a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php +++ b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php @@ -115,7 +115,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit column')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI($base_uri.'edit/'.$id.'/')) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); @@ -124,7 +124,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Delete column')) - ->setIcon('delete') + ->setIcon('fa-times') ->setHref($this->getApplicationURI($base_uri.'delete/'.$id.'/')) ->setDisabled(!$can_edit) ->setWorkflow(true)); @@ -132,7 +132,7 @@ $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Activate column')) - ->setIcon('enable') + ->setIcon('fa-play-circle-o') ->setHref($this->getApplicationURI($base_uri.'delete/'.$id.'/')) ->setDisabled(!$can_edit) ->setWorkflow(true)); diff --git a/src/applications/project/controller/PhabricatorProjectEditMainController.php b/src/applications/project/controller/PhabricatorProjectEditMainController.php --- a/src/applications/project/controller/PhabricatorProjectEditMainController.php +++ b/src/applications/project/controller/PhabricatorProjectEditMainController.php @@ -89,7 +89,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Details')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI("details/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); @@ -97,7 +97,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Picture')) - ->setIcon('image') + ->setIcon('fa-picture-o') ->setHref($this->getApplicationURI("picture/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); @@ -106,7 +106,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Unarchive Project')) - ->setIcon('enable') + ->setIcon('fa-circle-check') ->setHref($this->getApplicationURI("archive/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(true)); @@ -114,7 +114,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Archive Project')) - ->setIcon('disable') + ->setIcon('fa-ban') ->setHref($this->getApplicationURI("archive/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(true)); diff --git a/src/applications/project/controller/PhabricatorProjectListController.php b/src/applications/project/controller/PhabricatorProjectListController.php --- a/src/applications/project/controller/PhabricatorProjectListController.php +++ b/src/applications/project/controller/PhabricatorProjectListController.php @@ -33,7 +33,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Project')) ->setHref($this->getApplicationURI('create/')) - ->setIcon('create') + ->setIcon('fa-plus-square') ->setWorkflow(!$can_create) ->setDisabled(!$can_create)); diff --git a/src/applications/project/controller/PhabricatorProjectMembersEditController.php b/src/applications/project/controller/PhabricatorProjectMembersEditController.php --- a/src/applications/project/controller/PhabricatorProjectMembersEditController.php +++ b/src/applications/project/controller/PhabricatorProjectMembersEditController.php @@ -134,7 +134,7 @@ $item->addAction( id(new PHUIListItemView()) - ->setIcon('delete') + ->setIcon('fa-times') ->setName(pht('Remove')) ->setHref($remove_uri) ->setWorkflow(true)); diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php --- a/src/applications/project/controller/PhabricatorProjectProfileController.php +++ b/src/applications/project/controller/PhabricatorProjectProfileController.php @@ -49,8 +49,7 @@ $id = $this->id; $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('workboard'); + ->setIconFont('fa-columns'); $board_btn = id(new PHUIButtonView()) ->setTag('a') ->setText(pht('Workboards')) @@ -153,16 +152,14 @@ $phid); $create_uri = '/maniphest/task/create/?projects='.$phid; $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('action-menu'); + ->setIconFont('fa-list'); $button_view = id(new PHUIButtonView()) ->setTag('a') ->setText(pht('View All')) ->setHref($view_uri) ->setIcon($icon); $icon_new = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('new'); + ->setIconFont('fa-plus'); $button_add = id(new PHUIButtonView()) ->setTag('a') ->setText(pht('New Task')) @@ -200,13 +197,13 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Project')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI("edit/{$id}/"))); $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Members')) - ->setIcon('user') + ->setIcon('fa-users') ->setHref($this->getApplicationURI("members/{$id}/")) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); @@ -222,14 +219,14 @@ ->setUser($viewer) ->setRenderAsForm(true) ->setHref('/project/update/'.$project->getID().'/join/') - ->setIcon('new') + ->setIcon('fa-plus') ->setDisabled(!$can_join) ->setName(pht('Join Project')); } else { $action = id(new PhabricatorActionView()) ->setWorkflow(true) ->setHref('/project/update/'.$project->getID().'/leave/') - ->setIcon('delete') + ->setIcon('fa-times') ->setName(pht('Leave Project...')); } $view->addAction($action); diff --git a/src/applications/project/view/ProjectBoardTaskCard.php b/src/applications/project/view/ProjectBoardTaskCard.php --- a/src/applications/project/view/ProjectBoardTaskCard.php +++ b/src/applications/project/view/ProjectBoardTaskCard.php @@ -60,7 +60,7 @@ ->addAction( id(new PHUIListItemView()) ->setName(pht('Edit')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->addSigil('edit-project-card') ->setHref('/maniphest/task/edit/'.$task->getID().'/')) ->setBarColor($bar_color); diff --git a/src/applications/releeph/controller/branch/ReleephBranchViewController.php b/src/applications/releeph/controller/branch/ReleephBranchViewController.php --- a/src/applications/releeph/controller/branch/ReleephBranchViewController.php +++ b/src/applications/releeph/controller/branch/ReleephBranchViewController.php @@ -113,7 +113,7 @@ id(new PHUIListItemView()) ->setHref($pull_uri) ->setName(pht('New Pull Request')) - ->setIcon('create') + ->setIcon('fa-plus-square') ->setDisabled(!$branch->isActive())); } @@ -156,7 +156,7 @@ id(new PhabricatorActionView()) ->setName(pht('Edit Branch')) ->setHref($edit_uri) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); @@ -165,7 +165,7 @@ id(new PhabricatorActionView()) ->setName(pht('Close Branch')) ->setHref($close_uri) - ->setIcon('delete') + ->setIcon('fa-times') ->setDisabled(!$can_edit) ->setWorkflow(true)); } else { @@ -173,7 +173,7 @@ id(new PhabricatorActionView()) ->setName(pht('Reopen Branch')) ->setHref($reopen_uri) - ->setIcon('new') + ->setIcon('fa-plus') ->setUser($viewer) ->setDisabled(!$can_edit) ->setWorkflow(true)); @@ -183,7 +183,7 @@ id(new PhabricatorActionView()) ->setName(pht('View History')) ->setHref($history_uri) - ->setIcon('transcript')); + ->setIcon('fa-list')); $properties = id(new PHUIPropertyListView()) ->setUser($viewer) diff --git a/src/applications/releeph/controller/product/ReleephProductListController.php b/src/applications/releeph/controller/product/ReleephProductListController.php --- a/src/applications/releeph/controller/product/ReleephProductListController.php +++ b/src/applications/releeph/controller/product/ReleephProductListController.php @@ -29,7 +29,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Product')) ->setHref($this->getApplicationURI('product/create/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/releeph/controller/product/ReleephProductViewController.php b/src/applications/releeph/controller/product/ReleephProductViewController.php --- a/src/applications/releeph/controller/product/ReleephProductViewController.php +++ b/src/applications/releeph/controller/product/ReleephProductViewController.php @@ -117,7 +117,7 @@ if ($open_count) { $item->setBarColor('orange'); $item->addIcon( - 'fork', + 'fa-code-fork', pht('%d Open Pull Request(s)', new PhutilNumber($open_count))); } @@ -157,7 +157,7 @@ id(new PHUIListItemView()) ->setHref($product->getURI('cutbranch/')) ->setName(pht('Cut New Branch')) - ->setIcon('create')); + ->setIcon('fa-plus')); } return $crumbs; @@ -197,18 +197,18 @@ id(new PhabricatorActionView()) ->setName(pht('Edit Product')) ->setHref($edit_uri) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); if ($product->getIsActive()) { $status_name = pht('Deactivate Product'); $status_href = "product/{$id}/action/deactivate/"; - $status_icon = 'delete'; + $status_icon = 'fa-times'; } else { $status_name = pht('Reactivate Product'); $status_href = "product/{$id}/action/activate/"; - $status_icon = 'new'; + $status_icon = 'fa-plus-circle-o'; } $actions->addAction( @@ -223,7 +223,7 @@ id(new PhabricatorActionView()) ->setName(pht('View History')) ->setHref($history_uri) - ->setIcon('transcript')); + ->setIcon('fa-list')); $properties = id(new PHUIPropertyListView()) ->setUser($viewer) diff --git a/src/applications/releeph/view/ReleephRequestView.php b/src/applications/releeph/view/ReleephRequestView.php --- a/src/applications/releeph/view/ReleephRequestView.php +++ b/src/applications/releeph/view/ReleephRequestView.php @@ -139,18 +139,18 @@ if ($viewer_is_pusher) { $yes_text = pht('Approve Pull'); $no_text = pht('Reject Pull'); - $yes_icon = 'check'; - $no_icon = 'delete'; + $yes_icon = 'fa-check'; + $no_icon = 'fa-times'; } else if ($viewer_is_requestor) { $yes_text = pht('Request Pull'); $no_text = pht('Cancel Pull'); - $yes_icon = 'ok'; - $no_icon = 'delete'; + $yes_icon = 'fa-check'; + $no_icon = 'fa-times'; } else { $yes_text = pht('Support Pull'); $no_text = pht('Discourage Pull'); - $yes_icon = 'like'; - $no_icon = 'dislike'; + $yes_icon = 'fa-thumbs-o-up'; + $no_icon = 'fa-thumbs-o-down'; } $yes_href = '/releeph/request/action/want/'.$id.'/'; @@ -211,7 +211,7 @@ ->setRenderAsForm($use_workflow) ->addSigil('releeph-request-state-change') ->addSigil('mark-manually-picked') - ->setIcon('warning')); + ->setIcon('fa-exclamation-triangle')); } } @@ -220,7 +220,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Pull Request')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($edit_uri)); } diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php --- a/src/applications/search/controller/PhabricatorApplicationSearchController.php +++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php @@ -300,9 +300,9 @@ ->setHref($engine->getQueryResultsPageURI($key)); if ($named_query->getIsBuiltin() && $named_query->getIsDisabled()) { - $icon = 'new'; + $icon = 'fa-plus'; } else { - $icon = 'delete'; + $icon = 'fa-times'; } $item->addAction( @@ -313,15 +313,15 @@ if ($named_query->getIsBuiltin()) { if ($named_query->getIsDisabled()) { - $item->addIcon('delete-grey', pht('Disabled')); + $item->addIcon('fa-times lightgreytext', pht('Disabled')); $item->setDisabled(true); } else { - $item->addIcon('lock-grey', pht('Builtin')); + $item->addIcon('fa-lock lightgreytext', pht('Builtin')); } } else { $item->addAction( id(new PHUIListItemView()) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref('/search/edit/'.$key.'/')); } diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php --- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php @@ -136,8 +136,7 @@ if ($editable) { $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('new'); + ->setIconFont('fa-plus'); $button = new PHUIButtonView(); $button->setText(pht('Add New Address')); diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelMultiFactor.php b/src/applications/settings/panel/PhabricatorSettingsPanelMultiFactor.php --- a/src/applications/settings/panel/PhabricatorSettingsPanelMultiFactor.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelMultiFactor.php @@ -108,8 +108,7 @@ 'User Guide: Multi-Factor Authentication'); $help_icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('lint-info'); + ->setIconFont('fa-info-circle'); $help_button = id(new PHUIButtonView()) ->setText(pht('Help')) ->setHref($help_uri) @@ -117,8 +116,7 @@ ->setIcon($help_icon); $create_icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('new'); + ->setIconFont('fa-plus'); $create_button = id(new PHUIButtonView()) ->setText(pht('Add Authentication Factor')) ->setHref($this->getPanelURI('?new=true')) diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php --- a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php @@ -206,8 +206,7 @@ $header = new PHUIHeaderView(); $upload_icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('upload'); + ->setIconFont('fa-upload'); $upload_button = id(new PHUIButtonView()) ->setText(pht('Upload Public Key')) ->setHref($this->getPanelURI('?edit=true')) @@ -222,8 +221,7 @@ } $generate_icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('lock'); + ->setIconFont('fa-lock'); $generate_button = id(new PHUIButtonView()) ->setText(pht('Generate Keypair')) ->setHref($this->getPanelURI('?generate=true')) diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSessions.php b/src/applications/settings/panel/PhabricatorSettingsPanelSessions.php --- a/src/applications/settings/panel/PhabricatorSettingsPanelSessions.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelSessions.php @@ -107,8 +107,7 @@ $terminate_icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('warning'); + ->setIconFont('fa-exclamation-triangle'); $terminate_button = id(new PHUIButtonView()) ->setText(pht('Terminate All Sessions')) ->setHref('/auth/session/terminate/all/') @@ -123,8 +122,7 @@ $hisec = ($viewer->getSession()->getHighSecurityUntil() - time()); if ($hisec > 0) { $hisec_icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('lock'); + ->setIconFont('fa-lock'); $hisec_button = id(new PHUIButtonView()) ->setText(pht('Leave High Security')) ->setHref('/auth/session/downgrade/') diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteController.php --- a/src/applications/slowvote/controller/PhabricatorSlowvoteController.php +++ b/src/applications/slowvote/controller/PhabricatorSlowvoteController.php @@ -36,7 +36,7 @@ id(new PHUIListItemView()) ->setName(pht('Create Poll')) ->setHref($this->getApplicationURI('create/')) - ->setIcon('create')); + ->setIcon('fa-plus-square')); return $crumbs; } diff --git a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php --- a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php +++ b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php @@ -97,12 +97,12 @@ $is_closed = $poll->getIsClosed(); $close_poll_text = $is_closed ? pht('Reopen Poll') : pht('Close Poll'); - $close_poll_icon = $is_closed ? 'enable' : 'disable'; + $close_poll_icon = $is_closed ? 'fa-play-circle-o' : 'fa-ban'; $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Poll')) - ->setIcon('edit') + ->setIcon('fa-pencil') ->setHref($this->getApplicationURI('edit/'.$poll->getID().'/')) ->setDisabled(!$can_edit) ->setWorkflow(!$can_edit)); diff --git a/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php b/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php --- a/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php +++ b/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php @@ -45,7 +45,7 @@ ->setRenderAsForm(true) ->setHref('/subscriptions/add/'.$object->getPHID().'/') ->setName(pht('Automatically Subscribed')) - ->setIcon('enable'); + ->setIcon('fa-check-circle lightgreytext'); } else { $subscribed = false; if ($user->isLoggedIn()) { @@ -67,14 +67,14 @@ ->setRenderAsForm(true) ->setHref('/subscriptions/delete/'.$object->getPHID().'/') ->setName(pht('Unsubscribe')) - ->setIcon('disable'); + ->setIcon('fa-minus-circle'); } else { $sub_action = id(new PhabricatorActionView()) ->setWorkflow(true) ->setRenderAsForm(true) ->setHref('/subscriptions/add/'.$object->getPHID().'/') ->setName(pht('Subscribe')) - ->setIcon('check'); + ->setIcon('fa-plus-circle'); } if (!$user->isLoggedIn()) { diff --git a/src/applications/tokens/event/PhabricatorTokenUIEventListener.php b/src/applications/tokens/event/PhabricatorTokenUIEventListener.php --- a/src/applications/tokens/event/PhabricatorTokenUIEventListener.php +++ b/src/applications/tokens/event/PhabricatorTokenUIEventListener.php @@ -48,13 +48,13 @@ ->setWorkflow(true) ->setHref('/token/give/'.$object->getPHID().'/') ->setName(pht('Award Token')) - ->setIcon('like'); + ->setIcon('fa-trophy'); } else { $token_action = id(new PhabricatorActionView()) ->setWorkflow(true) ->setHref('/token/give/'.$object->getPHID().'/') ->setName(pht('Rescind Token')) - ->setIcon('dislike'); + ->setIcon('fa-trophy'); } if (!$user->isLoggedIn()) { $token_action->setDisabled(true); 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 @@ -356,11 +356,7 @@ case PhabricatorTransactions::TYPE_BUILDABLE: return 'fa-wrench'; case PhabricatorTransactions::TYPE_TOKEN: - if ($this->getNewValue()) { - return 'fa-thumbs-o-up'; - } else { - return 'fa-thumbs-o-down'; - } + return 'fa-trophy'; } return 'fa-pencil'; diff --git a/src/applications/uiexample/examples/PHUIBoxExample.php b/src/applications/uiexample/examples/PHUIBoxExample.php --- a/src/applications/uiexample/examples/PHUIBoxExample.php +++ b/src/applications/uiexample/examples/PHUIBoxExample.php @@ -59,8 +59,7 @@ ->addMargin(PHUI::MARGIN_LARGE_BOTTOM)); $image = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon('love'); + ->setIconFont('fa-heart'); $button = id(new PHUIButtonView()) ->setTag('a') ->setColor(PHUIButtonView::SIMPLE) diff --git a/src/applications/uiexample/examples/PHUIButtonExample.php b/src/applications/uiexample/examples/PHUIButtonExample.php --- a/src/applications/uiexample/examples/PHUIButtonExample.php +++ b/src/applications/uiexample/examples/PHUIButtonExample.php @@ -103,14 +103,13 @@ $column = array(); $icons = array( - 'Comment' => 'comment', - 'Give Token' => 'like', - 'Reverse Time' => 'history', - 'Implode Earth' => 'warning'); + 'Comment' => 'fa-comment', + 'Give Token' => 'fa-trophy', + 'Reverse Time' => 'fa-clock-o', + 'Implode Earth' => 'fa-exclamation-triangle red'); foreach ($icons as $text => $icon) { $image = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon($icon); + ->setIconFont($icon); $column[] = id(new PHUIButtonView()) ->setTag('a') ->setColor(PHUIButtonView::GREY) @@ -121,12 +120,11 @@ $column2 = array(); $icons = array( - 'Subscribe' => 'meta-mta', - 'Edit' => 'edit'); + 'Subscribe' => 'fa-check-circle bluegrey', + 'Edit' => 'fa-pencil bluegrey'); foreach ($icons as $text => $icon) { $image = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon($icon); + ->setIconFont($icon); $column2[] = id(new PHUIButtonView()) ->setTag('a') ->setColor(PHUIButtonView::SIMPLE) diff --git a/src/applications/uiexample/examples/PHUIDocumentExample.php b/src/applications/uiexample/examples/PHUIDocumentExample.php --- a/src/applications/uiexample/examples/PHUIDocumentExample.php +++ b/src/applications/uiexample/examples/PHUIDocumentExample.php @@ -21,31 +21,31 @@ $action1 = id(new PHUIListItemView()) ->setName('Edit Document') ->setHref('#') - ->setIcon('edit') + ->setIcon('fa-edit') ->setType(PHUIListItemView::TYPE_LINK); $action2 = id(new PHUIListItemView()) ->setName('Move Document') ->setHref('#') - ->setIcon('move') + ->setIcon('fa-arrows') ->setType(PHUIListItemView::TYPE_LINK); $action3 = id(new PHUIListItemView()) ->setName('Delete Document') ->setHref('#') - ->setIcon('delete') + ->setIcon('fa-times') ->setType(PHUIListItemView::TYPE_LINK); $action4 = id(new PHUIListItemView()) ->setName('View History') ->setHref('#') - ->setIcon('history') + ->setIcon('fa-list') ->setType(PHUIListItemView::TYPE_LINK); $action5 = id(new PHUIListItemView()) ->setName('Subscribe') ->setHref('#') - ->setIcon('check') + ->setIcon('fa-plus-circle') ->setType(PHUIListItemView::TYPE_LINK); $divider = id(new PHUIListItemView) diff --git a/src/applications/uiexample/examples/PHUIListExample.php b/src/applications/uiexample/examples/PHUIListExample.php --- a/src/applications/uiexample/examples/PHUIListExample.php +++ b/src/applications/uiexample/examples/PHUIListExample.php @@ -18,31 +18,31 @@ $action1 = id(new PHUIListItemView()) ->setName('Edit Document') ->setHref('#') - ->setIcon('edit') + ->setIcon('fa-pencil') ->setType(PHUIListItemView::TYPE_LINK); $action2 = id(new PHUIListItemView()) ->setName('Move Document') ->setHref('#') - ->setIcon('move') + ->setIcon('fa-arrows') ->setType(PHUIListItemView::TYPE_LINK); $action3 = id(new PHUIListItemView()) ->setName('Delete Document') ->setHref('#') - ->setIcon('delete') + ->setIcon('fa-times') ->setType(PHUIListItemView::TYPE_LINK); $action4 = id(new PHUIListItemView()) ->setName('View History') ->setHref('#') - ->setIcon('history') + ->setIcon('fa-list') ->setType(PHUIListItemView::TYPE_LINK); $action5 = id(new PHUIListItemView()) ->setName('Subscribe') ->setHref('#') - ->setIcon('check') + ->setIcon('fa-plus-circle') ->setType(PHUIListItemView::TYPE_LINK); $actionmenu = id(new PHUIListView()) @@ -125,7 +125,7 @@ /* Top Navigation */ $home = id(new PHUIListItemView()) - ->setIcon('home') + ->setIcon('fa-home') ->setHref('#') ->setType(PHUIListItemView::TYPE_ICON); diff --git a/src/applications/uiexample/examples/PHUIObjectItemListExample.php b/src/applications/uiexample/examples/PHUIObjectItemListExample.php --- a/src/applications/uiexample/examples/PHUIObjectItemListExample.php +++ b/src/applications/uiexample/examples/PHUIObjectItemListExample.php @@ -123,7 +123,7 @@ id(new PHUIObjectItemView()) ->setHeader(pht('Playing Card')) ->setBarColor('orange') - ->addIcon('comment', pht('Royal Flush!'))); + ->addIcon('fa-comment', pht('Royal Flush!'))); $owner = phutil_tag('a', array('href' => '#'), pht('jackofclubs')); $list->addItem( @@ -138,19 +138,19 @@ id(new PHUIObjectItemView()) ->setHeader(pht('Cardigan')) ->setBarColor('green') - ->addIcon('highlight', pht('Warm!')) + ->addIcon('fa-star', pht('Warm!')) ->addByline(pht('Author: %s', $author))); $list->addItem( id(new PHUIObjectItemView()) ->setHeader(pht('Cardamom')) - ->addFootIcon('highlight-white', 'Spice') + ->addFootIcon('fa-shield white', 'Spice') ->setBarColor('blue')); $list->addItem( id(new PHUIObjectItemView()) ->setHeader(pht( 'The human cardiovascular system includes the heart, lungs, and '. 'some other parts; most of these parts are pretty squishy')) - ->addFootIcon('search-white', pht('Respiration!')) + ->addFootIcon('fa-search white', pht('Respiration!')) ->addHandleIcon($handle, pht('You have a cardiovascular system!')) ->setBarColor('indigo')); @@ -186,7 +186,7 @@ ->addAction( id(new PHUIListItemView()) ->setHref('#') - ->setIcon('delete'))); + ->setIcon('fa-times'))); $out[] = array($head, $list); @@ -203,7 +203,7 @@ id(new PHUIListItemView()) ->setHref('#') ->setName(pht('Moo')) - ->setIcon('edit'))); + ->setIcon('fa-pencil'))); $list->addItem( id(new PHUIObjectItemView()) @@ -214,12 +214,12 @@ id(new PHUIListItemView()) ->setHref('#') ->setName(pht('Quack')) - ->setIcon('edit')) + ->setIcon('fa-pencil')) ->addAction( id(new PHUIListItemView()) ->setHref('#') ->setName(pht('Oink')) - ->setIcon('delete'))); + ->setIcon('fa-times'))); $out[] = array($head, $list); @@ -237,10 +237,10 @@ ->setHref('#') ->addAttribute(pht('Suit: Hearts')) ->addAttribute(pht('Rank: Ace')) - ->addIcon('love', pht('Ace')) - ->addIcon('love-grey', pht('Hearts')) - ->addFootIcon('blame-white', pht('Ace')) - ->addFootIcon('love-white', pht('Heart')) + ->addIcon('fa-heart', pht('Ace')) + ->addIcon('fa-heart red', pht('Hearts')) + ->addFootIcon('fa-heart white', pht('Ace')) + ->addFootIcon('fa-heart white', pht('Heart')) ->addHandleIcon($handle, pht('You hold all the cards.')) ->addHandleIcon($handle, pht('You make all the rules.'))); @@ -261,9 +261,9 @@ id(new PHUIObjectItemView()) ->setHeader(pht('Crowded Eastern Edge')) ->setHref('#') - ->addIcon('computer', pht('Stuff')) - ->addIcon('computer', pht('Stuff')) - ->addIcon('computer', pht('Stuff')) + ->addIcon('fa-circle red', pht('Stuff')) + ->addIcon('fa-circle yellow', pht('Stuff')) + ->addIcon('fa-circle green', pht('Stuff')) ->addHandleIcon($handle, pht('More Stuff'))); $out[] = array($head, $list); @@ -349,7 +349,7 @@ ->addAction( id(new PHUIListItemView()) ->setHref('#') - ->setIcon('create'))); + ->setIcon('fa-plus-square'))); $list->addItem( id(new PHUIObjectItemView()) diff --git a/src/applications/uiexample/examples/PHUITagExample.php b/src/applications/uiexample/examples/PHUITagExample.php --- a/src/applications/uiexample/examples/PHUITagExample.php +++ b/src/applications/uiexample/examples/PHUITagExample.php @@ -125,31 +125,31 @@ $icons[] = id(new PHUITagView()) ->setType(PHUITagView::TYPE_STATE) ->setBackgroundColor(PHUITagView::COLOR_GREEN) - ->setIcon('ok-white') + ->setIcon('fa-check white') ->setName('Passed'); $icons[] = hsprintf('

'); $icons[] = id(new PHUITagView()) ->setType(PHUITagView::TYPE_STATE) ->setBackgroundColor(PHUITagView::COLOR_RED) - ->setIcon('delete-white') + ->setIcon('fa-times white') ->setName('Failed'); $icons[] = hsprintf('

'); $icons[] = id(new PHUITagView()) ->setType(PHUITagView::TYPE_STATE) ->setBackgroundColor(PHUITagView::COLOR_BLUE) - ->setIcon('play-white') + ->setIcon('fa-refresh white') ->setName('Running'); $icons[] = hsprintf('

'); $icons[] = id(new PHUITagView()) ->setType(PHUITagView::TYPE_STATE) ->setBackgroundColor(PHUITagView::COLOR_GREY) - ->setIcon('pause-white') + ->setIcon('fa-pause white') ->setName('Paused'); $icons[] = hsprintf('

'); $icons[] = id(new PHUITagView()) ->setType(PHUITagView::TYPE_STATE) ->setBackgroundColor(PHUITagView::COLOR_BLACK) - ->setIcon('stop-white') + ->setIcon('fa-stop white') ->setName('Stopped'); $content3 = id(new PHUIBoxView()) diff --git a/src/applications/uiexample/examples/PhabricatorActionListExample.php b/src/applications/uiexample/examples/PhabricatorActionListExample.php deleted file mode 100644 --- a/src/applications/uiexample/examples/PhabricatorActionListExample.php +++ /dev/null @@ -1,112 +0,0 @@ -PhabricatorActionListView to render object actions.'); - } - - public function renderExample() { - $request = $this->getRequest(); - $user = $request->getUser(); - - $notices = array(); - if ($request->isFormPost()) { - $notices[] = 'You just submitted a valid form POST.'; - } - - if ($request->isJavelinWorkflow()) { - $notices[] = 'You just submitted a Workflow request.'; - } - - if ($notices) { - $notices = id(new AphrontErrorView()) - ->setSeverity(AphrontErrorView::SEVERITY_NOTICE) - ->setErrors($notices); - } else { - $notices = null; - } - - if ($request->isJavelinWorkflow()) { - $dialog = new AphrontDialogView(); - $dialog->setUser($user); - $dialog->setTitle('Request Information'); - $dialog->appendChild($notices); - $dialog->addCancelButton($request->getRequestURI(), 'Close'); - return id(new AphrontDialogResponse())->setDialog($dialog); - } - - $view = id(new PhabricatorActionListView()) - ->setUser($user) - ->setObjectURI($this->getRequest()->getRequestURI()); - - $view->addAction( - id(new PhabricatorActionView()) - ->setUser($user) - ->setHref($request->getRequestURI()) - ->setName('Normal Action') - ->setIcon('file')); - - $view->addAction( - id(new PhabricatorActionView()) - ->setUser($user) - ->setHref($request->getRequestURI()) - ->setDisabled(true) - ->setName('Disabled Action') - ->setIcon('file')); - - $view->addAction( - id(new PhabricatorActionView()) - ->setUser($user) - ->setHref($request->getRequestURI()) - ->setRenderAsForm(true) - ->setName('Form Action') - ->setIcon('file')); - - $view->addAction( - id(new PhabricatorActionView()) - ->setUser($user) - ->setHref($request->getRequestURI()) - ->setRenderAsForm(true) - ->setDisabled(true) - ->setName('Disabled Form Action') - ->setIcon('file')); - - $view->addAction( - id(new PhabricatorActionView()) - ->setUser($user) - ->setHref($request->getRequestURI()) - ->setWorkflow(true) - ->setName('Workflow Action') - ->setIcon('file')); - - $view->addAction( - id(new PhabricatorActionView()) - ->setUser($user) - ->setHref($request->getRequestURI()) - ->setRenderAsForm(true) - ->setWorkflow(true) - ->setName('Form + Workflow Action') - ->setIcon('file')); - - foreach (PhabricatorActionView::getAvailableIcons() as $icon) { - $view->addAction( - id(new PhabricatorActionView()) - ->setUser($user) - ->setHref('#') - ->setName('Icon "'.$icon.'"') - ->setIcon($icon)); - } - - return array( - $view, - hsprintf('
'), - $notices, - ); - } -} diff --git a/src/infrastructure/celerity/CeleritySpriteGenerator.php b/src/infrastructure/celerity/CeleritySpriteGenerator.php --- a/src/infrastructure/celerity/CeleritySpriteGenerator.php +++ b/src/infrastructure/celerity/CeleritySpriteGenerator.php @@ -2,58 +2,17 @@ final class CeleritySpriteGenerator { - public function buildIconSheet() { - $icons = $this->getDirectoryList('icons_1x'); - - $colors = array( - '', - 'grey', - 'white', - ); + public function buildRemarkupSheet() { $scales = array( '1x' => 1, '2x' => 2, ); + $sprites = array(); $template = id(new PhutilSprite()) ->setSourceSize(14, 14); - $sprites = array(); - foreach ($colors as $color) { - foreach ($icons as $icon) { - $prefix = 'icons_'; - if (strlen($color)) { - $prefix .= $color.'_'; - } - - $suffix = ''; - if (strlen($color)) { - $suffix = '-'.$color; - } - - $sprite = id(clone $template) - ->setName('icons-'.$icon.$suffix); - - $tcss = array(); - $tcss[] = '.icons-'.$icon.$suffix; - if ($color == 'white') { - $tcss[] = '.device-desktop .phabricator-action-view:hover '. - '.icons-'.$icon; - $tcss[] = '.device-desktop .phui-list-sidenav '. - '.phui-list-item-href:hover .icons-'.$icon; - } - - $sprite->setTargetCSS(implode(', ', $tcss)); - - foreach ($scales as $scale_key => $scale) { - $path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png'); - $sprite->setSourceFile($path, $scale); - } - $sprites[] = $sprite; - } - } - $remarkup_icons = $this->getDirectoryList('remarkup_1x'); foreach ($remarkup_icons as $icon) { $prefix = 'remarkup_'; @@ -78,7 +37,7 @@ $sprites[] = $sprite; } - $sheet = $this->buildSheet('icons', true); + $sheet = $this->buildSheet('remarkup', true); $sheet->setScales($scales); foreach ($sprites as $sprite) { $sheet->addSprite($sprite); diff --git a/src/view/form/control/PhabricatorRemarkupControl.php b/src/view/form/control/PhabricatorRemarkupControl.php --- a/src/view/form/control/PhabricatorRemarkupControl.php +++ b/src/view/form/control/PhabricatorRemarkupControl.php @@ -146,7 +146,7 @@ $tip); } - require_celerity_resource('sprite-icons-css'); + require_celerity_resource('sprite-remarkup-css'); $buttons[] = javelin_tag( @@ -163,7 +163,8 @@ phutil_tag( 'div', array( - 'class' => 'remarkup-assist sprite-icons remarkup-assist-'.$action, + 'class' => + 'remarkup-assist sprite-remarkup remarkup-assist-'.$action, ), $content)); } diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php --- a/src/view/layout/PhabricatorActionView.php +++ b/src/view/layout/PhabricatorActionView.php @@ -4,7 +4,6 @@ private $name; private $icon; - private $iconSheet; private $href; private $disabled; private $workflow; @@ -71,11 +70,6 @@ return $this; } - public function setIconSheet($sheet) { - $this->iconSheet = $sheet; - return $this; - } - public function setName($name) { $this->name = $name; return $this; @@ -100,17 +94,13 @@ $icon = null; if ($this->icon) { - $sheet = nonempty($this->iconSheet, PHUIIconView::SPRITE_ICONS); - - $suffix = ''; + $color = ''; if ($this->disabled) { - $suffix = '-grey'; + $color = ' grey'; } - $icon = id(new PHUIIconView()) ->addClass('phabricator-action-view-icon') - ->setSpriteIcon($this->icon.$suffix) - ->setSpriteSheet($sheet); + ->setIconFont($this->icon.$color); } if ($this->href) { @@ -185,22 +175,4 @@ array($icon, $item)); } - public static function getAvailableIcons() { - $manifest = PHUIIconView::getSheetManifest(PHUIIconView::SPRITE_ICONS); - - $results = array(); - $prefix = 'icons-'; - foreach ($manifest as $sprite) { - $name = $sprite['name']; - if (preg_match('/-(white|grey)$/', $name)) { - continue; - } - if (!strncmp($name, $prefix, strlen($prefix))) { - $results[] = substr($name, strlen($prefix)); - } - } - - return $results; - } - } diff --git a/src/view/layout/PhabricatorCrumbsView.php b/src/view/layout/PhabricatorCrumbsView.php --- a/src/view/layout/PhabricatorCrumbsView.php +++ b/src/view/layout/PhabricatorCrumbsView.php @@ -53,15 +53,12 @@ if ($action->getIcon()) { $icon_name = $action->getIcon(); if ($action->getDisabled()) { - $icon_name .= '-grey'; + $icon_name .= ' lightgreytext'; } - $icon = phutil_tag( - 'span', - array( - 'class' => 'sprite-icons icons-'.$icon_name, - ), - ''); + $icon = id(new PHUIIconView()) + ->setIconFont($icon_name); + } $name = phutil_tag( 'span', @@ -97,12 +94,8 @@ if ($this->actionListID) { $icon_id = celerity_generate_unique_node_id(); - $icon = phutil_tag( - 'span', - array( - 'class' => 'sprite-icons action-action-menu' - ), - ''); + $icon = id(new PHUIIconView()) + ->setIconFont('fa-bars'); $name = phutil_tag( 'span', array( 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 @@ -216,13 +216,12 @@ if ($this->icon) { $icon_name = $this->icon; if ($this->getDisabled()) { - $icon_name .= '-grey'; + $icon_name .= ' grey'; } $icon = id(new PHUIIconView()) ->addClass('phui-list-item-icon') - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon($icon_name); + ->setIconFont($icon_name); } if ($this->appIcon) { diff --git a/src/view/phui/PHUIObjectItemView.php b/src/view/phui/PHUIObjectItemView.php --- a/src/view/phui/PHUIObjectItemView.php +++ b/src/view/phui/PHUIObjectItemView.php @@ -149,22 +149,19 @@ $this->addIcon('none', $date); break; case self::AGE_STALE: - require_celerity_resource('sprite-status-css'); $attr = array( 'tip' => pht('Stale (%s day(s))', new PhutilNumber($days)), 'class' => 'icon-age-stale', - 'sheet' => PHUIIconView::SPRITE_STATUS, ); - $this->addIcon('time-yellow', $date, $attr); + + $this->addIcon('fa-clock-o yellow', $date, $attr); break; case self::AGE_OLD: - require_celerity_resource('sprite-status-css'); $attr = array( 'tip' => pht('Old (%s day(s))', new PhutilNumber($days)), 'class' => 'icon-age-old', - 'sheet' => PHUIIconView::SPRITE_STATUS, ); - $this->addIcon('time-red', $date, $attr); + $this->addIcon('fa-clock-o red', $date, $attr); break; default: throw new Exception("Unknown age '{$age}'!"); @@ -342,29 +339,20 @@ $icon_list = array(); foreach ($this->icons as $spec) { $icon = $spec['icon']; + $icon = id(new PHUIIconView()) + ->setIconFont($icon) + ->addClass('phui-object-item-icon-image'); - $sigil = null; - $meta = null; if (isset($spec['attributes']['tip'])) { $sigil = 'has-tooltip'; $meta = array( 'tip' => $spec['attributes']['tip'], 'align' => 'W', ); + $icon->addSigil($sigil); + $icon->setMetadata($meta); } - $sheet = idx($spec['attributes'], 'sheet', 'icons'); - - $icon = javelin_tag( - 'span', - array( - 'class' => 'phui-object-item-icon-image '. - 'sprite-'.$sheet.' '.$sheet.'-'.$icon, - 'sigil' => $sigil, - 'meta' => $meta, - ), - ''); - $label = phutil_tag( 'span', array( @@ -586,14 +574,9 @@ } private function renderFootIcon($icon, $label) { - require_celerity_resource('sprite-icons-css'); - $icon = phutil_tag( - 'span', - array( - 'class' => 'sprite-icons icons-'.$icon, - ), - ''); + $icon = id(new PHUIIconView()) + ->setIconFont($icon); $label = phutil_tag( 'span', diff --git a/src/view/phui/PHUIPinboardItemView.php b/src/view/phui/PHUIPinboardItemView.php --- a/src/view/phui/PHUIPinboardItemView.php +++ b/src/view/phui/PHUIPinboardItemView.php @@ -66,13 +66,10 @@ if ($this->iconBlock) { $icon_list = array(); foreach ($this->iconBlock as $block) { - $icon = phutil_tag( - 'span', - array( - 'class' => - 'phui-pinboard-icon sprite-icons icons-'.$block[0].'-grey', - ), - ''); + $icon = id(new PHUIIconView()) + ->setIconFont($block[0].' lightgreytext') + ->addClass('phui-pinboard-icon'); + $count = phutil_tag('span', array(), $block[1]); $icon_list[] = phutil_tag( 'span', diff --git a/src/view/phui/PHUITagView.php b/src/view/phui/PHUITagView.php --- a/src/view/phui/PHUITagView.php +++ b/src/view/phui/PHUITagView.php @@ -85,8 +85,7 @@ public function setIcon($icon) { $icon_view = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_ICONS) - ->setSpriteIcon($icon); + ->setIconFont($icon); $this->icon = $icon_view; return $this; } 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 @@ -508,8 +508,20 @@ } } + if ($this->getIsEditable()) { + $items[] = id(new PhabricatorActionView()) + ->setIcon('fa-pencil') + ->setHref('/transactions/edit/'.$xaction_phid.'/') + ->setName(pht('Edit Comment')) + ->addSigil('transaction-edit') + ->setMetadata( + array( + 'anchor' => $anchor, + )); + } + $items[] = id(new PhabricatorActionView()) - ->setIcon('comment') + ->setIcon('fa-quote-left') ->setHref('#') ->setName(pht('Quote')) ->addSigil('transaction-quote') @@ -521,21 +533,9 @@ )); } - if ($this->getIsEditable()) { - $items[] = id(new PhabricatorActionView()) - ->setIcon('edit') - ->setHref('/transactions/edit/'.$xaction_phid.'/') - ->setName(pht('Edit Comment')) - ->addSigil('transaction-edit') - ->setMetadata( - array( - 'anchor' => $anchor, - )); - } - if ($this->getIsRemovable()) { $items[] = id(new PhabricatorActionView()) - ->setIcon('delete') + ->setIcon('fa-times') ->setHref('/transactions/remove/'.$xaction_phid.'/') ->setName(pht('Remove Comment')) ->addSigil('transaction-remove') @@ -548,7 +548,7 @@ if ($this->getIsEdited()) { $items[] = id(new PhabricatorActionView()) - ->setIcon('transcript') + ->setIcon('fa-list') ->setHref('/transactions/history/'.$xaction_phid.'/') ->setName(pht('View Edit History')) ->setWorkflow(true); diff --git a/webroot/rsrc/css/application/pholio/pholio.css b/webroot/rsrc/css/application/pholio/pholio.css --- a/webroot/rsrc/css/application/pholio/pholio.css +++ b/webroot/rsrc/css/application/pholio/pholio.css @@ -172,9 +172,7 @@ .pholio-mock-embed-icon { height: 14px; width: 14px; - float: left; - padding-left: 2px; - margin-right: 2px; + padding: 2px 4px 0 0; } .pholio-mock-embed-head a { diff --git a/webroot/rsrc/css/font/font-glyphicons-halflings.css b/webroot/rsrc/css/font/font-glyphicons-halflings.css deleted file mode 100644 --- a/webroot/rsrc/css/font/font-glyphicons-halflings.css +++ /dev/null @@ -1,615 +0,0 @@ -/** - * @provides font-glyphicons-halflings - */ -@font-face { - font-family: 'Glyphicons Halflings Regular'; - src: url('/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.eot'); - src: url('/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.woff') format('woff'), url('/rsrc/externals/font/glyphicons/glyphicons-halflings-regular.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -.phui-font-gh:before { - font: 12px/1em 'Glyphicons Halflings Regular'; -} - -.gh-glass:before { - content: "\E001"; -} -.gh-music:before { - content: "\E002"; -} -.gh-search:before { - content: "\E003"; -} -.gh-envelope:before { - content: "\2709"; -} -.gh-heart:before { - content: "\E005"; -} -.gh-star:before { - content: "\E006"; -} -.gh-star-empty:before { - content: "\E007"; -} -.gh-user:before { - content: "\E008"; -} -.gh-film:before { - content: "\E009"; -} -.gh-th-large:before { - content: "\E010"; -} -.gh-th:before { - content: "\E011"; -} -.gh-th-list:before { - content: "\E012"; -} -.gh-ok:before { - content: "\E013"; -} -.gh-remove:before { - content: "\E014"; -} -.gh-zoom-in:before { - content: "\E015"; -} -.gh-zoom-out:before { - content: "\E016"; -} -.gh-off:before { - content: "\E017"; -} -.gh-signal:before { - content: "\E018"; -} -.gh-cog:before { - content: "\E019"; -} -.gh-trash:before { - content: "\E020"; -} -.gh-home:before { - content: "\E021"; -} -.gh-file:before { - content: "\E022"; -} -.gh-time:before { - content: "\E023"; -} -.gh-road:before { - content: "\E024"; -} -.gh-download-alt:before { - content: "\E025"; -} -.gh-download:before { - content: "\E026"; -} -.gh-upload:before { - content: "\E027"; -} -.gh-inbox:before { - content: "\E028"; -} -.gh-play-circle:before { - content: "\E029"; -} -.gh-repeat:before { - content: "\E030"; -} -.gh-refresh:before { - content: "\E031"; -} -.gh-list-alt:before { - content: "\E032"; -} -.gh-lock:before { - content: "\1F512"; -} -.gh-flag:before { - content: "\E034"; -} -.gh-headphones:before { - content: "\E035"; -} -.gh-volume-off:before { - content: "\E036"; -} -.gh-volume-down:before { - content: "\E037"; -} -.gh-volume-up:before { - content: "\E038"; -} -.gh-qrcode:before { - content: "\E039"; -} -.gh-barcode:before { - content: "\E040"; -} -.gh-tag:before { - content: "\E041"; -} -.gh-tags:before { - content: "\E042"; -} -.gh-book:before { - content: "\E043"; -} -.gh-bookmark:before { - content: "\1F516"; -} -.gh-print:before { - content: "\E045"; -} -.gh-camera:before { - content: "\1F4F7"; -} -.gh-font:before { - content: "\E047"; -} -.gh-bold:before { - content: "\E048"; -} -.gh-italic:before { - content: "\E049"; -} -.gh-text-height:before { - content: "\E050"; -} -.gh-text-width:before { - content: "\E051"; -} -.gh-align-left:before { - content: "\E052"; -} -.gh-align-center:before { - content: "\E053"; -} -.gh-align-right:before { - content: "\E054"; -} -.gh-align-justify:before { - content: "\E055"; -} -.gh-list:before { - content: "\E056"; -} -.gh-indent-left:before { - content: "\E057"; -} -.gh-indent-right:before { - content: "\E058"; -} -.gh-facetime-video:before { - content: "\E059"; -} -.gh-picture:before { - content: "\E060"; -} -.gh-pencil:before { - content: "\270F"; -} -.gh-map-marker:before { - content: "\E062"; -} -.gh-adjust:before { - content: "\E063"; -} -.gh-tint:before { - content: "\E064"; -} -.gh-edit:before { - content: "\E065"; -} -.gh-share:before { - content: "\E066"; -} -.gh-check:before { - content: "\E067"; -} -.gh-move:before { - content: "\E068"; -} -.gh-step-backward:before { - content: "\E069"; -} -.gh-fast-backward:before { - content: "\E070"; -} -.gh-backward:before { - content: "\E071"; -} -.gh-play:before { - content: "\E072"; -} -.gh-pause:before { - content: "\E073"; -} -.gh-stop:before { - content: "\E074"; -} -.gh-forward:before { - content: "\E075"; -} -.gh-fast-forward:before { - content: "\E076"; -} -.gh-step-forward:before { - content: "\E077"; -} -.gh-eject:before { - content: "\E078"; -} -.gh-chevron-left:before { - content: "\E079"; -} -.gh-chevron-right:before { - content: "\E080"; -} -.gh-plus-sign:before { - content: "\E081"; -} -.gh-minus-sign:before { - content: "\E082"; -} -.gh-remove-sign:before { - content: "\E083"; -} -.gh-ok-sign:before { - content: "\E084"; -} -.gh-question-sign:before { - content: "\E085"; -} -.gh-info-sign:before { - content: "\E086"; -} -.gh-screenshot:before { - content: "\E087"; -} -.gh-remove-circle:before { - content: "\E088"; -} -.gh-ok-circle:before { - content: "\E089"; -} -.gh-ban-circle:before { - content: "\E090"; -} -.gh-arrow-left:before { - content: "\E091"; -} -.gh-arrow-right:before { - content: "\E092"; -} -.gh-arrow-up:before { - content: "\E093"; -} -.gh-arrow-down:before { - content: "\E094"; -} -.gh-share-alt:before { - content: "\E095"; -} -.gh-resize-full:before { - content: "\E096"; -} -.gh-resize-small:before { - content: "\E097"; -} -.gh-plus:before { - content: "\002B"; -} -.gh-minus:before { - content: "\2212"; -} -.gh-asterisk:before { - content: "\002A"; -} -.gh-exclamation-sign:before { - content: "\E101"; -} -.gh-gift:before { - content: "\E102"; -} -.gh-leaf:before { - content: "\E103"; -} -.gh-fire:before { - content: "\1F525"; -} -.gh-eye-open:before { - content: "\E105"; -} -.gh-eye-close:before { - content: "\E106"; -} -.gh-warning-sign:before { - content: "\E107"; -} -.gh-plane:before { - content: "\E108"; -} -.gh-calendar:before { - content: "\1F4C5"; -} -.gh-random:before { - content: "\E110"; -} -.gh-comments:before { - content: "\E111"; -} -.gh-magnet:before { - content: "\E112"; -} -.gh-chevron-up:before { - content: "\E113"; -} -.gh-chevron-down:before { - content: "\E114"; -} -.gh-retweet:before { - content: "\E115"; -} -.gh-shopping-cart:before { - content: "\E116"; -} -.gh-folder-close:before { - content: "\E117"; -} -.gh-folder-open:before { - content: "\E118"; -} -.gh-resize-vertical:before { - content: "\E119"; -} -.gh-resize-horizontal:before { - content: "\E120"; -} -.gh-hdd:before { - content: "\E121"; -} -.gh-bullhorn:before { - content: "\E122"; -} -.gh-bell:before { - content: "\1F514"; -} -.gh-certificate:before { - content: "\E124"; -} -.gh-thumbs-up:before { - content: "\E125"; -} -.gh-thumbs-down:before { - content: "\E126"; -} -.gh-hand-right:before { - content: "\E127"; -} -.gh-hand-left:before { - content: "\E128"; -} -.gh-hand-top:before { - content: "\E129"; -} -.gh-hand-down:before { - content: "\E130"; -} -.gh-circle-arrow-right:before { - content: "\E131"; -} -.gh-circle-arrow-left:before { - content: "\E132"; -} -.gh-circle-arrow-top:before { - content: "\E133"; -} -.gh-circle-arrow-down:before { - content: "\E134"; -} -.gh-globe:before { - content: "\E135"; -} -.gh-wrench:before { - content: "\1F527"; -} -.gh-tasks:before { - content: "\E137"; -} -.gh-filter:before { - content: "\E138"; -} -.gh-briefcase:before { - content: "\1F4BC"; -} -.gh-fullscreen:before { - content: "\E140"; -} -.gh-dashboard:before { - content: "\E141"; -} -.gh-paperclip:before { - content: "\1F4CE"; -} -.gh-heart-empty:before { - content: "\E143"; -} -.gh-link:before { - content: "\E144"; -} -.gh-phone:before { - content: "\E145"; -} -.gh-pushpin:before { - content: "\1F4CC"; -} -.gh-euro:before { - content: "\20AC"; -} -.gh-usd:before { - content: "\E148"; -} -.gh-gbp:before { - content: "\E149"; -} -.gh-sort:before { - content: "\E150"; -} -.gh-sort-by-alphabet:before { - content: "\E151"; -} -.gh-sort-by-alphabet-alt:before { - content: "\E152"; -} -.gh-sort-by-order:before { - content: "\E153"; -} -.gh-sort-by-order-alt:before { - content: "\E154"; -} -.gh-sort-by-attributes:before { - content: "\E155"; -} -.gh-sort-by-attributes-alt:before { - content: "\E156"; -} -.gh-unchecked:before { - content: "\E157"; -} -.gh-expand:before { - content: "\E158"; -} -.gh-collapse:before { - content: "\E159"; -} -.gh-collapse-top:before { - content: "\E160"; -} -.gh-log_in:before { - content: "\E161"; -} -.gh-flash:before { - content: "\E162"; -} -.gh-log_out:before { - content: "\E163"; -} -.gh-new_window:before { - content: "\E164"; -} -.gh-record:before { - content: "\E165"; -} -.gh-save:before { - content: "\E166"; -} -.gh-open:before { - content: "\E167"; -} -.gh-saved:before { - content: "\E168"; -} -.gh-import:before { - content: "\E169"; -} -.gh-export:before { - content: "\E170"; -} -.gh-send:before { - content: "\E171"; -} -.gh-floppy_disk:before { - content: "\E172"; -} -.gh-floppy_saved:before { - content: "\E173"; -} -.gh-floppy_remove:before { - content: "\E174"; -} -.gh-floppy_save:before { - content: "\E175"; -} -.gh-floppy_open:before { - content: "\E176"; -} -.gh-credit_card:before { - content: "\E177"; -} -.gh-transfer:before { - content: "\E178"; -} -.gh-cutlery:before { - content: "\E179"; -} -.gh-header:before { - content: "\E180"; -} -.gh-compressed:before { - content: "\E181"; -} -.gh-earphone:before { - content: "\E182"; -} -.gh-phone_alt:before { - content: "\E183"; -} -.gh-tower:before { - content: "\E184"; -} -.gh-stats:before { - content: "\E185"; -} -.gh-sd_video:before { - content: "\E186"; -} -.gh-hd_video:before { - content: "\E187"; -} -.gh-subtitles:before { - content: "\E188"; -} -.gh-sound_stereo:before { - content: "\E189"; -} -.gh-sound_dolby:before { - content: "\E190"; -} -.gh-sound_5_1:before { - content: "\E191"; -} -.gh-sound_6_1:before { - content: "\E192"; -} -.gh-sound_7_1:before { - content: "\E193"; -} -.gh-copyright_mark:before { - content: "\E194"; -} -.gh-registration_mark:before { - content: "\E195"; -} -.gh-cloud:before { - content: "\2601"; -} -.gh-cloud_download:before { - content: "\E197"; -} -.gh-cloud_upload:before { - content: "\E198"; -} -.gh-tree_conifer:before { - content: "\E199"; -} -.gh-tree_deciduous:before { - content: "\E200"; -} diff --git a/webroot/rsrc/css/font/phui-font-icon-base.css b/webroot/rsrc/css/font/phui-font-icon-base.css --- a/webroot/rsrc/css/font/phui-font-icon-base.css +++ b/webroot/rsrc/css/font/phui-font-icon-base.css @@ -104,39 +104,40 @@ } } -.phui-icon-view.bluegrey:before { +.phui-icon-view.bluegrey { color: #7787a6; } -.phui-icon-view.white:before { +.phui-icon-view.white { color: #fff; } -.phui-icon-view.red:before { +.phui-icon-view.red { color: {$red}; } -.phui-icon-view.orange:before { +.phui-icon-view.orange { color: {$orange}; } -.phui-icon-view.yellow:before { +.phui-icon-view.yellow { color: {$yellow}; } -.phui-icon-view.green:before { +.phui-icon-view.green { color: {$green} } -.phui-icon-view.blue:before { +.phui-icon-view.blue { color: {$blue}; } -.phui-icon-view.sky:before { +.phui-icon-view.sky { color: {$sky}; } -.phui-icon-view.indigo:before { +.phui-icon-view.indigo { color: {$indigo}; } -.phui-icon-view.violet:before { +.phui-icon-view.violet { color: {$violet}; } -.phui-icon-view.lightbluetext:before { +.phui-icon-view.lightbluetext { color: {$lightbluetext}; } -.phui-icon-view.lightgreytext:before { +.phui-icon-view.lightgreytext, +.phui-icon-view.grey { color: {$lightgreytext}; } diff --git a/webroot/rsrc/css/layout/phabricator-action-list-view.css b/webroot/rsrc/css/layout/phabricator-action-list-view.css --- a/webroot/rsrc/css/layout/phabricator-action-list-view.css +++ b/webroot/rsrc/css/layout/phabricator-action-list-view.css @@ -68,12 +68,17 @@ position: absolute; top: 5px; left: 9px; + font-size: 13px; } .device-desktop .phabricator-action-view:hover .phabricator-action-view-item { text-decoration: none; background-color: {$blue}; - color: #ffffff; + color: #fff; +} + +.device-desktop .phabricator-action-view:hover .phabricator-action-view-icon { + color: #fff; } .phabricator-action-view-disabled .phabricator-action-view-item, @@ -92,7 +97,11 @@ .device-desktop .phabricator-action-view-disabled:hover .phabricator-action-view-item, .device-desktop .phabricator-action-view-disabled:hover - button.phabricator-action-view-item { - background-color: #dfdfdf; + button.phabricator-action-view-item, +.device-desktop .phabricator-action-view-disabled:hover + .phabricator-action-view-icon, +.device-desktop .phabricator-action-view-disabled:hover + button.phabricator-action-view-icon { + background-color: {$greybackground}; color: {$lightgreytext}; } diff --git a/webroot/rsrc/css/layout/phabricator-crumbs-view.css b/webroot/rsrc/css/layout/phabricator-crumbs-view.css --- a/webroot/rsrc/css/layout/phabricator-crumbs-view.css +++ b/webroot/rsrc/css/layout/phabricator-crumbs-view.css @@ -89,7 +89,7 @@ } .device-phone a.phabricator-crumbs-action { - padding: 13px 20px 4px 10px; + padding: 7px; border-left: 1px solid #ccc; } @@ -97,16 +97,12 @@ display: none; } -.device-phone a.phabricator-crumbs-action .sprite-icons { - margin-left: 5px; +a.phabricator-crumbs-action .phui-icon-view { + margin-right: 5px; } -.phabricator-crumbs-action .sprite-icons { - width: 14px; - height: 14px; - left: 4px; - top: 9px; - position: absolute; +.device-phone a.phabricator-crumbs-action .phui-icon-view { + margin-left: 5px; } .phabricator-crumb-divider { diff --git a/webroot/rsrc/css/phui/phui-icon.css b/webroot/rsrc/css/phui/phui-icon.css --- a/webroot/rsrc/css/phui/phui-icon.css +++ b/webroot/rsrc/css/phui/phui-icon.css @@ -18,7 +18,6 @@ } .phui-icon-view.sprite-apps, -.phui-icon-view.sprite-icons, .phui-icon-view.sprite-status, .phui-icon-view.sprite-buttonbar { height: 14px; diff --git a/webroot/rsrc/css/phui/phui-list.css b/webroot/rsrc/css/phui/phui-list.css --- a/webroot/rsrc/css/phui/phui-list.css +++ b/webroot/rsrc/css/phui/phui-list.css @@ -75,6 +75,10 @@ text-decoration: none; } +.device-desktop .phui-list-sidenav .phui-list-item-href:hover .phui-icon-view { + color: #fff; +} + /* - Top, Full Width Navigations ----------------------------------------------- Sets a page or box with a top navbar @@ -121,6 +125,7 @@ height: 14px; width: 14px; display: block; + font-size: 14px; } .device-phone .phui-list-view.phui-list-navbar > li { diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -34,7 +34,7 @@ } .phui-object-item { - background: #ffffff; + background: #fff; border-style: solid; border-color: {$lightgreyborder}; border-width: 0 0 0 4px; @@ -155,7 +155,7 @@ display: block; top: 50%; margin-top: -7px; - left: 5px; + left: 3px; } .phui-object-item-actions .phui-list-item-name { @@ -332,6 +332,7 @@ top: 2px; width: 14px; height: 14px; + font-size: 13px; } @@ -450,18 +451,16 @@ color: #ffffff; font-weight: bold; margin-right: 3px; - padding: 1px 4px 0 22px; - height: 19px; + padding: 3px 6px 0; + height: 17px; vertical-align: middle; position: relative; + font-size: 12px; + -webkit-font-smoothing: antialiased; } -.phui-object-item-foot-icon .sprite-icons { - width: 14px; - height: 14px; - position: absolute; - left: 4px; - top: 3px; +.phui-object-item-foot-icon .phui-icon-view { + margin-right: 4px; } diff --git a/webroot/rsrc/css/phui/phui-pinboard-view.css b/webroot/rsrc/css/phui/phui-pinboard-view.css --- a/webroot/rsrc/css/phui/phui-pinboard-view.css +++ b/webroot/rsrc/css/phui/phui-pinboard-view.css @@ -74,8 +74,5 @@ } .phui-pinboard-icon { - height: 14px; - width: 14px; - float: left; - padding-left: 2px; + margin-right: 4px; } diff --git a/webroot/rsrc/css/phui/phui-workpanel-view.css b/webroot/rsrc/css/phui/phui-workpanel-view.css --- a/webroot/rsrc/css/phui/phui-workpanel-view.css +++ b/webroot/rsrc/css/phui/phui-workpanel-view.css @@ -42,8 +42,8 @@ } .phui-workpanel-view .phui-list-item-icon { - height: 12px; - width: 12px; + height: 14px; + width: 14px; display: inline-block; } diff --git a/webroot/rsrc/css/sprite-icons.css b/webroot/rsrc/css/sprite-icons.css deleted file mode 100644 --- a/webroot/rsrc/css/sprite-icons.css +++ /dev/null @@ -1,1063 +0,0 @@ -/** - * @provides sprite-icons-css - * @generated - */ - -.sprite-icons { - background-image: url(/rsrc/image/sprite-icons.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-icons { - background-image: url(/rsrc/image/sprite-icons-X2.png); - background-size: 240px 255px; - } -} - - -.icons-action-menu { - background-position: 0px 0px; -} - -.icons-arrow_left { - background-position: -15px 0px; -} - -.icons-arrow_right { - background-position: -30px 0px; -} - -.icons-attach { - background-position: -45px 0px; -} - -.icons-backward { - background-position: -60px 0px; -} - -.icons-blame { - background-position: -75px 0px; -} - -.icons-calendar { - background-position: -90px 0px; -} - -.icons-check { - background-position: -105px 0px; -} - -.icons-comment { - background-position: -120px 0px; -} - -.icons-computer { - background-position: -135px 0px; -} - -.icons-create { - background-position: -150px 0px; -} - -.icons-data { - background-position: -165px 0px; -} - -.icons-delete { - background-position: -180px 0px; -} - -.icons-disable { - background-position: -195px 0px; -} - -.icons-dislike { - background-position: -210px 0px; -} - -.icons-download-alt { - background-position: -225px 0px; -} - -.icons-download { - background-position: 0px -15px; -} - -.icons-edit { - background-position: -15px -15px; -} - -.icons-enable { - background-position: -30px -15px; -} - -.icons-file { - background-position: -45px -15px; -} - -.icons-film { - background-position: -60px -15px; -} - -.icons-flag-0 { - background-position: -75px -15px; -} - -.icons-flag-1 { - background-position: -90px -15px; -} - -.icons-flag-2 { - background-position: -105px -15px; -} - -.icons-flag-3 { - background-position: -120px -15px; -} - -.icons-flag-4 { - background-position: -135px -15px; -} - -.icons-flag-5 { - background-position: -150px -15px; -} - -.icons-flag-6 { - background-position: -165px -15px; -} - -.icons-flag-7 { - background-position: -180px -15px; -} - -.icons-flag-ghost { - background-position: -195px -15px; -} - -.icons-flag { - background-position: -210px -15px; -} - -.icons-folder-open { - background-position: -225px -15px; -} - -.icons-fork { - background-position: 0px -30px; -} - -.icons-forward { - background-position: -15px -30px; -} - -.icons-herald { - background-position: -30px -30px; -} - -.icons-highlight { - background-position: -45px -30px; -} - -.icons-history { - background-position: -60px -30px; -} - -.icons-home { - background-position: -75px -30px; -} - -.icons-image { - background-position: -90px -30px; -} - -.icons-like { - background-position: -105px -30px; -} - -.icons-link { - background-position: -120px -30px; -} - -.icons-lint-info { - background-position: -135px -30px; -} - -.icons-lint-ok { - background-position: -150px -30px; -} - -.icons-lint-warning { - background-position: -165px -30px; -} - -.icons-lock { - background-position: -180px -30px; -} - -.icons-love { - background-position: -195px -30px; -} - -.icons-lower-priority { - background-position: -210px -30px; -} - -.icons-merge { - background-position: -225px -30px; -} - -.icons-message { - background-position: 0px -45px; -} - -.icons-meta-mta { - background-position: -15px -45px; -} - -.icons-move { - background-position: -30px -45px; -} - -.icons-music { - background-position: -45px -45px; -} - -.icons-new { - background-position: -60px -45px; -} - -.icons-none { - background-position: -75px -45px; -} - -.icons-normal-priority { - background-position: -90px -45px; -} - -.icons-octocat { - background-position: -105px -45px; -} - -.icons-ok { - background-position: -120px -45px; -} - -.icons-pause { - background-position: -135px -45px; -} - -.icons-perflab { - background-position: -150px -45px; -} - -.icons-play { - background-position: -165px -45px; -} - -.icons-popout { - background-position: -180px -45px; -} - -.icons-preview { - background-position: -195px -45px; -} - -.icons-project { - background-position: -210px -45px; -} - -.icons-raise-priority { - background-position: -225px -45px; -} - -.icons-refresh { - background-position: 0px -60px; -} - -.icons-remove { - background-position: -15px -60px; -} - -.icons-search { - background-position: -30px -60px; -} - -.icons-start-sandcastle { - background-position: -45px -60px; -} - -.icons-stop { - background-position: -60px -60px; -} - -.icons-tag { - background-position: -75px -60px; -} - -.icons-transcript { - background-position: -90px -60px; -} - -.icons-undo { - background-position: -105px -60px; -} - -.icons-unlock { - background-position: -120px -60px; -} - -.icons-unmerge { - background-position: -135px -60px; -} - -.icons-unpublish { - background-position: -150px -60px; -} - -.icons-upload { - background-position: -165px -60px; -} - -.icons-user { - background-position: -180px -60px; -} - -.icons-warning { - background-position: -195px -60px; -} - -.icons-workboard { - background-position: -210px -60px; -} - -.icons-world { - background-position: -225px -60px; -} - -.icons-wrench { - background-position: 0px -75px; -} - -.icons-zip { - background-position: -15px -75px; -} - -.icons-action-menu-grey { - background-position: -30px -75px; -} - -.icons-arrow_left-grey { - background-position: -45px -75px; -} - -.icons-arrow_right-grey { - background-position: -60px -75px; -} - -.icons-attach-grey { - background-position: -75px -75px; -} - -.icons-backward-grey { - background-position: -90px -75px; -} - -.icons-blame-grey { - background-position: -105px -75px; -} - -.icons-calendar-grey { - background-position: -120px -75px; -} - -.icons-check-grey { - background-position: -135px -75px; -} - -.icons-comment-grey { - background-position: -150px -75px; -} - -.icons-computer-grey { - background-position: -165px -75px; -} - -.icons-create-grey { - background-position: -180px -75px; -} - -.icons-data-grey { - background-position: -195px -75px; -} - -.icons-delete-grey { - background-position: -210px -75px; -} - -.icons-disable-grey { - background-position: -225px -75px; -} - -.icons-dislike-grey { - background-position: 0px -90px; -} - -.icons-download-alt-grey { - background-position: -15px -90px; -} - -.icons-download-grey { - background-position: -30px -90px; -} - -.icons-edit-grey { - background-position: -45px -90px; -} - -.icons-enable-grey { - background-position: -60px -90px; -} - -.icons-file-grey { - background-position: -75px -90px; -} - -.icons-film-grey { - background-position: -90px -90px; -} - -.icons-flag-0-grey { - background-position: -105px -90px; -} - -.icons-flag-1-grey { - background-position: -120px -90px; -} - -.icons-flag-2-grey { - background-position: -135px -90px; -} - -.icons-flag-3-grey { - background-position: -150px -90px; -} - -.icons-flag-4-grey { - background-position: -165px -90px; -} - -.icons-flag-5-grey { - background-position: -180px -90px; -} - -.icons-flag-6-grey { - background-position: -195px -90px; -} - -.icons-flag-7-grey { - background-position: -210px -90px; -} - -.icons-flag-ghost-grey { - background-position: -225px -90px; -} - -.icons-flag-grey { - background-position: 0px -105px; -} - -.icons-folder-open-grey { - background-position: -15px -105px; -} - -.icons-fork-grey { - background-position: -30px -105px; -} - -.icons-forward-grey { - background-position: -45px -105px; -} - -.icons-herald-grey { - background-position: -60px -105px; -} - -.icons-highlight-grey { - background-position: -75px -105px; -} - -.icons-history-grey { - background-position: -90px -105px; -} - -.icons-home-grey { - background-position: -105px -105px; -} - -.icons-image-grey { - background-position: -120px -105px; -} - -.icons-like-grey { - background-position: -135px -105px; -} - -.icons-link-grey { - background-position: -150px -105px; -} - -.icons-lint-info-grey { - background-position: -165px -105px; -} - -.icons-lint-ok-grey { - background-position: -180px -105px; -} - -.icons-lint-warning-grey { - background-position: -195px -105px; -} - -.icons-lock-grey { - background-position: -210px -105px; -} - -.icons-love-grey { - background-position: -225px -105px; -} - -.icons-lower-priority-grey { - background-position: 0px -120px; -} - -.icons-merge-grey { - background-position: -15px -120px; -} - -.icons-message-grey { - background-position: -30px -120px; -} - -.icons-meta-mta-grey { - background-position: -45px -120px; -} - -.icons-move-grey { - background-position: -60px -120px; -} - -.icons-music-grey { - background-position: -75px -120px; -} - -.icons-new-grey { - background-position: -90px -120px; -} - -.icons-none-grey { - background-position: -105px -120px; -} - -.icons-normal-priority-grey { - background-position: -120px -120px; -} - -.icons-octocat-grey { - background-position: -135px -120px; -} - -.icons-ok-grey { - background-position: -150px -120px; -} - -.icons-pause-grey { - background-position: -165px -120px; -} - -.icons-perflab-grey { - background-position: -180px -120px; -} - -.icons-play-grey { - background-position: -195px -120px; -} - -.icons-popout-grey { - background-position: -210px -120px; -} - -.icons-preview-grey { - background-position: -225px -120px; -} - -.icons-project-grey { - background-position: 0px -135px; -} - -.icons-raise-priority-grey { - background-position: -15px -135px; -} - -.icons-refresh-grey { - background-position: -30px -135px; -} - -.icons-remove-grey { - background-position: -45px -135px; -} - -.icons-search-grey { - background-position: -60px -135px; -} - -.icons-start-sandcastle-grey { - background-position: -75px -135px; -} - -.icons-stop-grey { - background-position: -90px -135px; -} - -.icons-tag-grey { - background-position: -105px -135px; -} - -.icons-transcript-grey { - background-position: -120px -135px; -} - -.icons-undo-grey { - background-position: -135px -135px; -} - -.icons-unlock-grey { - background-position: -150px -135px; -} - -.icons-unmerge-grey { - background-position: -165px -135px; -} - -.icons-unpublish-grey { - background-position: -180px -135px; -} - -.icons-upload-grey { - background-position: -195px -135px; -} - -.icons-user-grey { - background-position: -210px -135px; -} - -.icons-warning-grey { - background-position: -225px -135px; -} - -.icons-workboard-grey { - background-position: 0px -150px; -} - -.icons-world-grey { - background-position: -15px -150px; -} - -.icons-wrench-grey { - background-position: -30px -150px; -} - -.icons-zip-grey { - background-position: -45px -150px; -} - -.icons-action-menu-white, .device-desktop .phabricator-action-view:hover .icons-action-menu, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-action-menu { - background-position: -60px -150px; -} - -.icons-arrow_left-white, .device-desktop .phabricator-action-view:hover .icons-arrow_left, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-arrow_left { - background-position: -75px -150px; -} - -.icons-arrow_right-white, .device-desktop .phabricator-action-view:hover .icons-arrow_right, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-arrow_right { - background-position: -90px -150px; -} - -.icons-attach-white, .device-desktop .phabricator-action-view:hover .icons-attach, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-attach { - background-position: -105px -150px; -} - -.icons-backward-white, .device-desktop .phabricator-action-view:hover .icons-backward, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-backward { - background-position: -120px -150px; -} - -.icons-blame-white, .device-desktop .phabricator-action-view:hover .icons-blame, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-blame { - background-position: -135px -150px; -} - -.icons-calendar-white, .device-desktop .phabricator-action-view:hover .icons-calendar, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-calendar { - background-position: -150px -150px; -} - -.icons-check-white, .device-desktop .phabricator-action-view:hover .icons-check, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-check { - background-position: -165px -150px; -} - -.icons-comment-white, .device-desktop .phabricator-action-view:hover .icons-comment, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-comment { - background-position: -180px -150px; -} - -.icons-computer-white, .device-desktop .phabricator-action-view:hover .icons-computer, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-computer { - background-position: -195px -150px; -} - -.icons-create-white, .device-desktop .phabricator-action-view:hover .icons-create, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-create { - background-position: -210px -150px; -} - -.icons-data-white, .device-desktop .phabricator-action-view:hover .icons-data, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-data { - background-position: -225px -150px; -} - -.icons-delete-white, .device-desktop .phabricator-action-view:hover .icons-delete, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-delete { - background-position: 0px -165px; -} - -.icons-disable-white, .device-desktop .phabricator-action-view:hover .icons-disable, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-disable { - background-position: -15px -165px; -} - -.icons-dislike-white, .device-desktop .phabricator-action-view:hover .icons-dislike, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-dislike { - background-position: -30px -165px; -} - -.icons-download-alt-white, .device-desktop .phabricator-action-view:hover .icons-download-alt, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-download-alt { - background-position: -45px -165px; -} - -.icons-download-white, .device-desktop .phabricator-action-view:hover .icons-download, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-download { - background-position: -60px -165px; -} - -.icons-edit-white, .device-desktop .phabricator-action-view:hover .icons-edit, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-edit { - background-position: -75px -165px; -} - -.icons-enable-white, .device-desktop .phabricator-action-view:hover .icons-enable, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-enable { - background-position: -90px -165px; -} - -.icons-file-white, .device-desktop .phabricator-action-view:hover .icons-file, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-file { - background-position: -105px -165px; -} - -.icons-film-white, .device-desktop .phabricator-action-view:hover .icons-film, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-film { - background-position: -120px -165px; -} - -.icons-flag-0-white, .device-desktop .phabricator-action-view:hover .icons-flag-0, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-0 { - background-position: -135px -165px; -} - -.icons-flag-1-white, .device-desktop .phabricator-action-view:hover .icons-flag-1, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-1 { - background-position: -150px -165px; -} - -.icons-flag-2-white, .device-desktop .phabricator-action-view:hover .icons-flag-2, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-2 { - background-position: -165px -165px; -} - -.icons-flag-3-white, .device-desktop .phabricator-action-view:hover .icons-flag-3, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-3 { - background-position: -180px -165px; -} - -.icons-flag-4-white, .device-desktop .phabricator-action-view:hover .icons-flag-4, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-4 { - background-position: -195px -165px; -} - -.icons-flag-5-white, .device-desktop .phabricator-action-view:hover .icons-flag-5, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-5 { - background-position: -210px -165px; -} - -.icons-flag-6-white, .device-desktop .phabricator-action-view:hover .icons-flag-6, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-6 { - background-position: -225px -165px; -} - -.icons-flag-7-white, .device-desktop .phabricator-action-view:hover .icons-flag-7, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-7 { - background-position: 0px -180px; -} - -.icons-flag-ghost-white, .device-desktop .phabricator-action-view:hover .icons-flag-ghost, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-ghost { - background-position: -15px -180px; -} - -.icons-flag-white, .device-desktop .phabricator-action-view:hover .icons-flag, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag { - background-position: -30px -180px; -} - -.icons-folder-open-white, .device-desktop .phabricator-action-view:hover .icons-folder-open, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-folder-open { - background-position: -45px -180px; -} - -.icons-fork-white, .device-desktop .phabricator-action-view:hover .icons-fork, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-fork { - background-position: -60px -180px; -} - -.icons-forward-white, .device-desktop .phabricator-action-view:hover .icons-forward, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-forward { - background-position: -75px -180px; -} - -.icons-herald-white, .device-desktop .phabricator-action-view:hover .icons-herald, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-herald { - background-position: -90px -180px; -} - -.icons-highlight-white, .device-desktop .phabricator-action-view:hover .icons-highlight, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-highlight { - background-position: -105px -180px; -} - -.icons-history-white, .device-desktop .phabricator-action-view:hover .icons-history, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-history { - background-position: -120px -180px; -} - -.icons-home-white, .device-desktop .phabricator-action-view:hover .icons-home, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-home { - background-position: -135px -180px; -} - -.icons-image-white, .device-desktop .phabricator-action-view:hover .icons-image, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-image { - background-position: -150px -180px; -} - -.icons-like-white, .device-desktop .phabricator-action-view:hover .icons-like, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-like { - background-position: -165px -180px; -} - -.icons-link-white, .device-desktop .phabricator-action-view:hover .icons-link, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-link { - background-position: -180px -180px; -} - -.icons-lint-info-white, .device-desktop .phabricator-action-view:hover .icons-lint-info, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lint-info { - background-position: -195px -180px; -} - -.icons-lint-ok-white, .device-desktop .phabricator-action-view:hover .icons-lint-ok, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lint-ok { - background-position: -210px -180px; -} - -.icons-lint-warning-white, .device-desktop .phabricator-action-view:hover .icons-lint-warning, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lint-warning { - background-position: -225px -180px; -} - -.icons-lock-white, .device-desktop .phabricator-action-view:hover .icons-lock, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lock { - background-position: 0px -195px; -} - -.icons-love-white, .device-desktop .phabricator-action-view:hover .icons-love, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-love { - background-position: -15px -195px; -} - -.icons-lower-priority-white, .device-desktop .phabricator-action-view:hover .icons-lower-priority, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lower-priority { - background-position: -30px -195px; -} - -.icons-merge-white, .device-desktop .phabricator-action-view:hover .icons-merge, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-merge { - background-position: -45px -195px; -} - -.icons-message-white, .device-desktop .phabricator-action-view:hover .icons-message, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-message { - background-position: -60px -195px; -} - -.icons-meta-mta-white, .device-desktop .phabricator-action-view:hover .icons-meta-mta, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-meta-mta { - background-position: -75px -195px; -} - -.icons-move-white, .device-desktop .phabricator-action-view:hover .icons-move, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-move { - background-position: -90px -195px; -} - -.icons-music-white, .device-desktop .phabricator-action-view:hover .icons-music, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-music { - background-position: -105px -195px; -} - -.icons-new-white, .device-desktop .phabricator-action-view:hover .icons-new, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-new { - background-position: -120px -195px; -} - -.icons-none-white, .device-desktop .phabricator-action-view:hover .icons-none, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-none { - background-position: -135px -195px; -} - -.icons-normal-priority-white, .device-desktop .phabricator-action-view:hover .icons-normal-priority, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-normal-priority { - background-position: -150px -195px; -} - -.icons-octocat-white, .device-desktop .phabricator-action-view:hover .icons-octocat, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-octocat { - background-position: -165px -195px; -} - -.icons-ok-white, .device-desktop .phabricator-action-view:hover .icons-ok, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-ok { - background-position: -180px -195px; -} - -.icons-pause-white, .device-desktop .phabricator-action-view:hover .icons-pause, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-pause { - background-position: -195px -195px; -} - -.icons-perflab-white, .device-desktop .phabricator-action-view:hover .icons-perflab, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-perflab { - background-position: -210px -195px; -} - -.icons-play-white, .device-desktop .phabricator-action-view:hover .icons-play, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-play { - background-position: -225px -195px; -} - -.icons-popout-white, .device-desktop .phabricator-action-view:hover .icons-popout, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-popout { - background-position: 0px -210px; -} - -.icons-preview-white, .device-desktop .phabricator-action-view:hover .icons-preview, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-preview { - background-position: -15px -210px; -} - -.icons-project-white, .device-desktop .phabricator-action-view:hover .icons-project, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-project { - background-position: -30px -210px; -} - -.icons-raise-priority-white, .device-desktop .phabricator-action-view:hover .icons-raise-priority, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-raise-priority { - background-position: -45px -210px; -} - -.icons-refresh-white, .device-desktop .phabricator-action-view:hover .icons-refresh, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-refresh { - background-position: -60px -210px; -} - -.icons-remove-white, .device-desktop .phabricator-action-view:hover .icons-remove, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-remove { - background-position: -75px -210px; -} - -.icons-search-white, .device-desktop .phabricator-action-view:hover .icons-search, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-search { - background-position: -90px -210px; -} - -.icons-start-sandcastle-white, .device-desktop .phabricator-action-view:hover .icons-start-sandcastle, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-start-sandcastle { - background-position: -105px -210px; -} - -.icons-stop-white, .device-desktop .phabricator-action-view:hover .icons-stop, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-stop { - background-position: -120px -210px; -} - -.icons-tag-white, .device-desktop .phabricator-action-view:hover .icons-tag, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-tag { - background-position: -135px -210px; -} - -.icons-transcript-white, .device-desktop .phabricator-action-view:hover .icons-transcript, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-transcript { - background-position: -150px -210px; -} - -.icons-undo-white, .device-desktop .phabricator-action-view:hover .icons-undo, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-undo { - background-position: -165px -210px; -} - -.icons-unlock-white, .device-desktop .phabricator-action-view:hover .icons-unlock, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-unlock { - background-position: -180px -210px; -} - -.icons-unmerge-white, .device-desktop .phabricator-action-view:hover .icons-unmerge, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-unmerge { - background-position: -195px -210px; -} - -.icons-unpublish-white, .device-desktop .phabricator-action-view:hover .icons-unpublish, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-unpublish { - background-position: -210px -210px; -} - -.icons-upload-white, .device-desktop .phabricator-action-view:hover .icons-upload, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-upload { - background-position: -225px -210px; -} - -.icons-user-white, .device-desktop .phabricator-action-view:hover .icons-user, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-user { - background-position: 0px -225px; -} - -.icons-warning-white, .device-desktop .phabricator-action-view:hover .icons-warning, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-warning { - background-position: -15px -225px; -} - -.icons-workboard-white, .device-desktop .phabricator-action-view:hover .icons-workboard, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-workboard { - background-position: -30px -225px; -} - -.icons-world-white, .device-desktop .phabricator-action-view:hover .icons-world, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-world { - background-position: -45px -225px; -} - -.icons-wrench-white, .device-desktop .phabricator-action-view:hover .icons-wrench, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-wrench { - background-position: -60px -225px; -} - -.icons-zip-white, .device-desktop .phabricator-action-view:hover .icons-zip, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-zip { - background-position: -75px -225px; -} - -.remarkup-assist-b { - background-position: -90px -225px; -} - -.remarkup-assist-code { - background-position: -105px -225px; -} - -.remarkup-assist-fullscreen { - background-position: -120px -225px; -} - -.remarkup-control-fullscreen-mode .remarkup-assist-fullscreen { - background-position: -135px -225px; -} - -.remarkup-assist-help { - background-position: -150px -225px; -} - -.remarkup-assist-i { - background-position: -165px -225px; -} - -.remarkup-assist-image { - background-position: -180px -225px; -} - -.remarkup-assist-larger { - background-position: -195px -225px; -} - -.remarkup-assist-link { - background-position: -210px -225px; -} - -.remarkup-assist-meme { - background-position: -225px -225px; -} - -.remarkup-assist-ol { - background-position: 0px -240px; -} - -.remarkup-assist-table { - background-position: -15px -240px; -} - -.remarkup-assist-tag { - background-position: -30px -240px; -} - -.remarkup-assist-tt { - background-position: -45px -240px; -} - -.remarkup-assist-ul { - background-position: -60px -240px; -} diff --git a/webroot/rsrc/css/sprite-remarkup.css b/webroot/rsrc/css/sprite-remarkup.css new file mode 100644 --- /dev/null +++ b/webroot/rsrc/css/sprite-remarkup.css @@ -0,0 +1,83 @@ +/** + * @provides sprite-remarkup-css + * @generated + */ + +.sprite-remarkup { + background-image: url(/rsrc/image/sprite-remarkup.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-remarkup { + background-image: url(/rsrc/image/sprite-remarkup-X2.png); + background-size: 60px 60px; + } +} + + +.remarkup-assist- { + background-position: 0px 0px; +} + +.remarkup-assist-b { + background-position: -15px 0px; +} + +.remarkup-assist-code { + background-position: -30px 0px; +} + +.remarkup-assist-fullscreen { + background-position: -45px 0px; +} + +.remarkup-control-fullscreen-mode .remarkup-assist-fullscreen { + background-position: 0px -15px; +} + +.remarkup-assist-help { + background-position: -15px -15px; +} + +.remarkup-assist-i { + background-position: -30px -15px; +} + +.remarkup-assist-image { + background-position: -45px -15px; +} + +.remarkup-assist-larger { + background-position: 0px -30px; +} + +.remarkup-assist-link { + background-position: -15px -30px; +} + +.remarkup-assist-meme { + background-position: -30px -30px; +} + +.remarkup-assist-ol { + background-position: -45px -30px; +} + +.remarkup-assist-table { + background-position: 0px -45px; +} + +.remarkup-assist-tag { + background-position: -15px -45px; +} + +.remarkup-assist-tt { + background-position: -30px -45px; +} + +.remarkup-assist-ul { + background-position: -45px -45px; +} diff --git a/webroot/rsrc/image/sprite-icons-X2.png b/webroot/rsrc/image/sprite-icons-X2.png deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@