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' => '59ea1706', - 'core.pkg.js' => 'b2ed04a2', + 'core.pkg.css' => 'e62084f9', + 'core.pkg.js' => 'ab0d6d3d', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => '382ca868', - 'differential.pkg.js' => '36bec171', + 'differential.pkg.js' => '68d225fb', 'diffusion.pkg.css' => '3783278d', 'diffusion.pkg.js' => '077e3ad0', 'javelin.pkg.js' => 'b4831ebf', @@ -35,7 +35,7 @@ 'rsrc/css/aphront/tooltip.css' => '9c90229d', 'rsrc/css/aphront/transaction.css' => 'ce491938', 'rsrc/css/aphront/two-column.css' => '16ab3ad2', - 'rsrc/css/aphront/typeahead.css' => '466ac215', + 'rsrc/css/aphront/typeahead.css' => '1f4c9e23', 'rsrc/css/application/auth/auth.css' => '1e655982', 'rsrc/css/application/base/main-menu-view.css' => '0207239c', 'rsrc/css/application/base/notification-menu.css' => '99ffef72', @@ -132,14 +132,14 @@ 'rsrc/css/phui/phui-fontkit.css' => 'de84aa4a', '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' => '00abbd26', + 'rsrc/css/phui/phui-header-view.css' => '689dbc38', + 'rsrc/css/phui/phui-icon.css' => 'ef701b9b', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', 'rsrc/css/phui/phui-list.css' => '65eab261', 'rsrc/css/phui/phui-object-box.css' => 'ce92d8ec', '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-property-list-view.css' => 'c7cbe471', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', 'rsrc/css/phui/phui-spacing.css' => '042804d6', 'rsrc/css/phui/phui-status.css' => '2f562399', @@ -163,7 +163,6 @@ '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' => '1cab0752', 'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => '2ff84fd2', @@ -335,8 +334,6 @@ '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', 'rsrc/image/sprite-tokens.png' => '25b75533', 'rsrc/image/texture/card-gradient.png' => '815f26e8', @@ -365,7 +362,7 @@ 'rsrc/js/application/differential/behavior-comment-jump.js' => '71755c79', 'rsrc/js/application/differential/behavior-comment-preview.js' => '127f2018', 'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1', - 'rsrc/js/application/differential/behavior-dropdown-menus.js' => '7f93ef26', + 'rsrc/js/application/differential/behavior-dropdown-menus.js' => 'dfd45180', 'rsrc/js/application/differential/behavior-edit-inline-comments.js' => '00861799', 'rsrc/js/application/differential/behavior-keyboard-nav.js' => '173ce7e7', 'rsrc/js/application/differential/behavior-populate.js' => 'dfdf9f34', @@ -407,7 +404,7 @@ 'rsrc/js/application/phortune/behavior-stripe-payment-form.js' => '1693a296', 'rsrc/js/application/phortune/behavior-test-payment-form.js' => 'b3e5ee60', 'rsrc/js/application/phortune/phortune-credit-card-form.js' => '2290aeef', - 'rsrc/js/application/policy/behavior-policy-control.js' => 'bc99b0f2', + 'rsrc/js/application/policy/behavior-policy-control.js' => '71b4cbcc', 'rsrc/js/application/policy/behavior-policy-rule-editor.js' => '263aeb8c', 'rsrc/js/application/ponder/behavior-votebox.js' => '327dbe61', 'rsrc/js/application/projects/behavior-project-boards.js' => 'd8e135db', @@ -442,7 +439,7 @@ 'rsrc/js/core/KeyboardShortcutManager.js' => 'ad7a69ca', 'rsrc/js/core/MultirowRowManager.js' => '50395a1b', 'rsrc/js/core/Notification.js' => '0c6946e7', - 'rsrc/js/core/Prefab.js' => '0326e5d0', + 'rsrc/js/core/Prefab.js' => '41ed7994', 'rsrc/js/core/ShapedRequest.js' => '7cbe244b', 'rsrc/js/core/TextAreaUtils.js' => 'b3ec3cfc', 'rsrc/js/core/ToolTip.js' => '3915d490', @@ -486,7 +483,7 @@ 'rsrc/js/phui/behavior-phui-object-box-tabs.js' => 'a3e2244e', 'rsrc/js/phui/behavior-phui-timeline-dropdown-menu.js' => '4d94d9c3', 'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8', - 'rsrc/js/phuix/PHUIXActionView.js' => '19a0b148', + 'rsrc/js/phuix/PHUIXActionView.js' => '6e8cefa4', 'rsrc/js/phuix/PHUIXDropdownMenu.js' => 'bd4c8dca', 'rsrc/swf/aphlict.swf' => 'abac967d', ), @@ -506,7 +503,7 @@ 'aphront-tokenizer-control-css' => '36903077', 'aphront-tooltip-css' => '9c90229d', 'aphront-two-column-view-css' => '16ab3ad2', - 'aphront-typeahead-control-css' => '466ac215', + 'aphront-typeahead-control-css' => '1f4c9e23', 'auth-css' => '1e655982', 'config-options-css' => '7fedf08b', 'conpherence-menu-css' => '561348ac', @@ -559,7 +556,7 @@ 'javelin-behavior-differential-add-reviewers-and-ccs' => '533a187b', 'javelin-behavior-differential-comment-jump' => '71755c79', 'javelin-behavior-differential-diff-radios' => 'e1ff79b1', - 'javelin-behavior-differential-dropdown-menus' => '7f93ef26', + 'javelin-behavior-differential-dropdown-menus' => 'dfd45180', 'javelin-behavior-differential-edit-inline-comments' => '00861799', 'javelin-behavior-differential-feedback-preview' => '127f2018', 'javelin-behavior-differential-keyboard-navigation' => '173ce7e7', @@ -624,7 +621,7 @@ 'javelin-behavior-pholio-mock-view' => '28497740', 'javelin-behavior-phui-object-box-tabs' => 'a3e2244e', 'javelin-behavior-phui-timeline-dropdown-menu' => '4d94d9c3', - 'javelin-behavior-policy-control' => 'bc99b0f2', + 'javelin-behavior-policy-control' => '71b4cbcc', 'javelin-behavior-policy-rule-editor' => '263aeb8c', 'javelin-behavior-ponder-votebox' => '327dbe61', 'javelin-behavior-project-boards' => 'd8e135db', @@ -721,7 +718,7 @@ 'phabricator-notification-menu-css' => '99ffef72', 'phabricator-object-selector-css' => '029a133d', 'phabricator-phtize' => 'd254d646', - 'phabricator-prefab' => '0326e5d0', + 'phabricator-prefab' => '41ed7994', 'phabricator-profile-css' => '33e6f703', 'phabricator-project-tag-css' => '095c9404', 'phabricator-remarkup-css' => '80c3a48c', @@ -767,14 +764,14 @@ 'phui-fontkit-css' => 'de84aa4a', 'phui-form-css' => 'b78ec020', 'phui-form-view-css' => '867463b4', - 'phui-header-view-css' => '5d245c9c', - 'phui-icon-view-css' => '00abbd26', + 'phui-header-view-css' => '689dbc38', + 'phui-icon-view-css' => 'ef701b9b', 'phui-info-panel-css' => '27ea50a1', 'phui-list-view-css' => '65eab261', 'phui-object-box-css' => 'ce92d8ec', 'phui-object-item-list-view-css' => '64b6b266', 'phui-pinboard-view-css' => '874c22f9', - 'phui-property-list-view-css' => 'af4b381f', + 'phui-property-list-view-css' => 'c7cbe471', 'phui-remarkup-preview-css' => '19ad512b', 'phui-spacing-css' => '042804d6', 'phui-status-list-view-css' => '2f562399', @@ -784,7 +781,7 @@ 'phui-workboard-view-css' => '2bf82d00', 'phui-workpanel-view-css' => 'fddd97bf', 'phuix-action-list-view' => 'b5c256b8', - 'phuix-action-view' => '19a0b148', + 'phuix-action-view' => '6e8cefa4', 'phuix-dropdown-menu' => 'bd4c8dca', 'policy-css' => '957ea14c', 'policy-edit-css' => '05cca26a', @@ -816,7 +813,6 @@ 'sprite-payments-css' => 'cc085d44', 'sprite-projects-css' => '7578fa56', 'sprite-remarkup-css' => '5c396a57', - 'sprite-status-css' => '25d7f92f', 'sprite-tokens-css' => '1706b943', 'subscribers-list-css' => '5bb30c78', 'syntax-highlighting-css' => '3c18c1cb', @@ -837,19 +833,6 @@ array( 0 => 'aphront-dialog-view-css', ), - '0326e5d0' => - array( - 0 => 'javelin-install', - 1 => 'javelin-util', - 2 => 'javelin-dom', - 3 => 'javelin-typeahead', - 4 => 'javelin-tokenizer', - 5 => 'javelin-typeahead-preloaded-source', - 6 => 'javelin-typeahead-ondemand-source', - 7 => 'javelin-dom', - 8 => 'javelin-stratcom', - 9 => 'javelin-util', - ), '03d6ed07' => array( 0 => 'javelin-behavior', @@ -978,12 +961,6 @@ 1 => 'javelin-dom', 2 => 'javelin-reactor-dom', ), - '19a0b148' => - array( - 0 => 'javelin-install', - 1 => 'javelin-dom', - 2 => 'javelin-util', - ), '1ae869f2' => array( 0 => 'javelin-install', @@ -1133,6 +1110,19 @@ 8 => 'phuix-action-list-view', 9 => 'phuix-action-view', ), + '41ed7994' => + array( + 0 => 'javelin-install', + 1 => 'javelin-util', + 2 => 'javelin-dom', + 3 => 'javelin-typeahead', + 4 => 'javelin-tokenizer', + 5 => 'javelin-typeahead-preloaded-source', + 6 => 'javelin-typeahead-ondemand-source', + 7 => 'javelin-dom', + 8 => 'javelin-stratcom', + 9 => 'javelin-util', + ), '441f2137' => array( 0 => 'javelin-behavior', @@ -1264,13 +1254,6 @@ 2 => 'javelin-util', 3 => 'phabricator-shaped-request', ), - '62e18640' => - array( - 0 => 'javelin-install', - 1 => 'javelin-util', - 2 => 'javelin-dom', - 3 => 'javelin-typeahead-normalizer', - ), '6453c869' => array( 0 => 'javelin-install', @@ -1312,17 +1295,40 @@ 3 => 'javelin-typeahead', 4 => 'javelin-uri', ), + '6e8cefa4' => + array( + 0 => 'javelin-install', + 1 => 'javelin-dom', + 2 => 'javelin-util', + ), '71755c79' => array( 0 => 'javelin-behavior', 1 => 'javelin-stratcom', 2 => 'javelin-dom', ), + '71b4cbcc' => + array( + 0 => 'javelin-behavior', + 1 => 'javelin-dom', + 2 => 'javelin-util', + 3 => 'phuix-dropdown-menu', + 4 => 'phuix-action-list-view', + 5 => 'phuix-action-view', + 6 => 'javelin-workflow', + ), '7319e029' => array( 0 => 'javelin-behavior', 1 => 'javelin-dom', ), + '62e18640' => + array( + 0 => 'javelin-install', + 1 => 'javelin-util', + 2 => 'javelin-dom', + 3 => 'javelin-typeahead-normalizer', + ), '76f4ebed' => array( 0 => 'javelin-install', @@ -1404,17 +1410,6 @@ 0 => 'javelin-behavior', 1 => 'javelin-history', ), - '7f93ef26' => - array( - 0 => 'javelin-behavior', - 1 => 'javelin-dom', - 2 => 'javelin-util', - 3 => 'javelin-stratcom', - 4 => 'phuix-dropdown-menu', - 5 => 'phuix-action-list-view', - 6 => 'phuix-action-view', - 7 => 'phabricator-phtize', - ), '82f568cd' => array( 0 => 'javelin-install', @@ -1685,16 +1680,6 @@ 2 => 'javelin-dom', 3 => 'javelin-history', ), - 'bc99b0f2' => - array( - 0 => 'javelin-behavior', - 1 => 'javelin-dom', - 2 => 'javelin-util', - 3 => 'phuix-dropdown-menu', - 4 => 'phuix-action-list-view', - 5 => 'phuix-action-view', - 6 => 'javelin-workflow', - ), 'bd0aedcd' => array( 0 => 'javelin-install', @@ -1897,6 +1882,17 @@ 1 => 'javelin-dom', 2 => 'phabricator-prefab', ), + 'dfd45180' => + array( + 0 => 'javelin-behavior', + 1 => 'javelin-dom', + 2 => 'javelin-util', + 3 => 'javelin-stratcom', + 4 => 'phuix-dropdown-menu', + 5 => 'phuix-action-list-view', + 6 => 'phuix-action-view', + 7 => 'phabricator-phtize', + ), 'dfdf9f34' => array( 0 => 'javelin-behavior', @@ -2124,26 +2120,25 @@ 20 => 'sprite-gradient-css', 21 => 'sprite-menu-css', 22 => 'sprite-apps-large-css', - 23 => 'sprite-status-css', - 24 => 'phabricator-main-menu-view', - 25 => 'phabricator-notification-css', - 26 => 'phabricator-notification-menu-css', - 27 => 'lightbox-attachment-css', - 28 => 'phui-header-view-css', - 29 => 'phabricator-filetree-view-css', - 30 => 'phabricator-nav-view-css', - 31 => 'phabricator-side-menu-view-css', - 32 => 'phabricator-crumbs-view-css', - 33 => 'phui-object-item-list-view-css', - 34 => 'global-drag-and-drop-css', - 35 => 'phui-spacing-css', - 36 => 'phui-form-css', - 37 => 'phui-icon-view-css', - 38 => 'phabricator-application-launch-view-css', - 39 => 'phabricator-action-list-view-css', - 40 => 'phui-property-list-view-css', - 41 => 'phui-tag-view-css', - 42 => 'phui-list-view-css', + 23 => 'phabricator-main-menu-view', + 24 => 'phabricator-notification-css', + 25 => 'phabricator-notification-menu-css', + 26 => 'lightbox-attachment-css', + 27 => 'phui-header-view-css', + 28 => 'phabricator-filetree-view-css', + 29 => 'phabricator-nav-view-css', + 30 => 'phabricator-side-menu-view-css', + 31 => 'phabricator-crumbs-view-css', + 32 => 'phui-object-item-list-view-css', + 33 => 'global-drag-and-drop-css', + 34 => 'phui-spacing-css', + 35 => 'phui-form-css', + 36 => 'phui-icon-view-css', + 37 => 'phabricator-application-launch-view-css', + 38 => 'phabricator-action-list-view-css', + 39 => 'phui-property-list-view-css', + 40 => 'phui-tag-view-css', + 41 => 'phui-list-view-css', ), 'core.pkg.js' => array( diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php --- a/resources/celerity/packages.php +++ b/resources/celerity/packages.php @@ -93,7 +93,6 @@ 'sprite-gradient-css', 'sprite-menu-css', 'sprite-apps-large-css', - 'sprite-status-css', 'phabricator-main-menu-view', 'phabricator-notification-css', diff --git a/resources/sprite/manifest/status.json b/resources/sprite/manifest/status.json deleted file mode 100644 --- a/resources/sprite/manifest/status.json +++ /dev/null @@ -1,526 +0,0 @@ -{ - "version" : 1, - "sprites" : { - "status-accept" : { - "name" : "status-accept", - "rule" : ".status-accept", - "hash" : "6493498ca9beb344cffa6211fb80cbfd" - }, - "status-accept-blue" : { - "name" : "status-accept-blue", - "rule" : ".status-accept-blue", - "hash" : "c3bde2e1361bcd7259825ecaf2d4b2ff" - }, - "status-accept-dark" : { - "name" : "status-accept-dark", - "rule" : ".status-accept-dark", - "hash" : "a2ec73e144ea598be15b8acb63f3c096" - }, - "status-accept-green" : { - "name" : "status-accept-green", - "rule" : ".status-accept-green", - "hash" : "cf0c2339a111f54adfdcc0de5c18be22" - }, - "status-accept-red" : { - "name" : "status-accept-red", - "rule" : ".status-accept-red", - "hash" : "1466a3ed72f63971e38e669715cf5b98" - }, - "status-accept-white" : { - "name" : "status-accept-white", - "rule" : ".status-accept-white", - "hash" : "8ecccf5e2ce6658d8a1e963e4be6f6e9" - }, - "status-add" : { - "name" : "status-add", - "rule" : ".status-add", - "hash" : "165d43c1451fb9ffd69c36ede87c7875" - }, - "status-add-blue" : { - "name" : "status-add-blue", - "rule" : ".status-add-blue", - "hash" : "8860efdd8f90eed700ae48595ace6b38" - }, - "status-add-dark" : { - "name" : "status-add-dark", - "rule" : ".status-add-dark", - "hash" : "38dc8634ccfe6fa30f467e97436e1a30" - }, - "status-add-green" : { - "name" : "status-add-green", - "rule" : ".status-add-green", - "hash" : "5610cd9924ad6b3461a20dd050ef4866" - }, - "status-add-red" : { - "name" : "status-add-red", - "rule" : ".status-add-red", - "hash" : "9e0abe2b6e37ef5a1a2522ad01002704" - }, - "status-add-white" : { - "name" : "status-add-white", - "rule" : ".status-add-white", - "hash" : "1a8ab412f40c569acdc709fb281fefde" - }, - "status-down" : { - "name" : "status-down", - "rule" : ".status-down", - "hash" : "85d3b2376bbed1b48cb777f07a4e244e" - }, - "status-down-blue" : { - "name" : "status-down-blue", - "rule" : ".status-down-blue", - "hash" : "25baf216cd311f321656a5f3a327c38c" - }, - "status-down-dark" : { - "name" : "status-down-dark", - "rule" : ".status-down-dark", - "hash" : "bb82d18b729ac30956200b655eafeeb8" - }, - "status-down-green" : { - "name" : "status-down-green", - "rule" : ".status-down-green", - "hash" : "c29ad19910664ecc94e0d1fa99a0a6c0" - }, - "status-down-red" : { - "name" : "status-down-red", - "rule" : ".status-down-red", - "hash" : "644f0d38cad5cc6797fe81ed30b9bc6a" - }, - "status-down-white" : { - "name" : "status-down-white", - "rule" : ".status-down-white", - "hash" : "5bc0af6641ef545218ecced2d25e9a10" - }, - "status-info" : { - "name" : "status-info", - "rule" : ".status-info", - "hash" : "3b9d6abe2fb44b0959208632a77d3582" - }, - "status-info-blue" : { - "name" : "status-info-blue", - "rule" : ".status-info-blue", - "hash" : "2acc8c62d8963bec9ce632de60a4da41" - }, - "status-info-dark" : { - "name" : "status-info-dark", - "rule" : ".status-info-dark", - "hash" : "d96f44c17e67d7c0c10a400e6ff294f1" - }, - "status-info-green" : { - "name" : "status-info-green", - "rule" : ".status-info-green", - "hash" : "28fc83a1f5bee4ac39a0dcd52e180818" - }, - "status-info-red" : { - "name" : "status-info-red", - "rule" : ".status-info-red", - "hash" : "fc26e5509140d8e9a3305a39c44773f0" - }, - "status-info-white" : { - "name" : "status-info-white", - "rule" : ".status-info-white", - "hash" : "b70025f459685371f8397b61944bef7d" - }, - "status-left" : { - "name" : "status-left", - "rule" : ".status-left", - "hash" : "4649139ffc7e668b67d6978bbd5cbf15" - }, - "status-left-blue" : { - "name" : "status-left-blue", - "rule" : ".status-left-blue", - "hash" : "cdec5d2617cb7fcfbfea336881d267f0" - }, - "status-left-dark" : { - "name" : "status-left-dark", - "rule" : ".status-left-dark", - "hash" : "83b58d1cde130deb01971888ad0bcfc1" - }, - "status-left-green" : { - "name" : "status-left-green", - "rule" : ".status-left-green", - "hash" : "6b34445f1a034e71432a5823bed1c4d7" - }, - "status-left-red" : { - "name" : "status-left-red", - "rule" : ".status-left-red", - "hash" : "38ebb75c0fbcf6fe96def6c2ab70b343" - }, - "status-left-white" : { - "name" : "status-left-white", - "rule" : ".status-left-white", - "hash" : "9e89400271b55590e610188d93671934" - }, - "status-minus" : { - "name" : "status-minus", - "rule" : ".status-minus", - "hash" : "a232bd27513a71ce8f4cd163d8aa05cf" - }, - "status-minus-blue" : { - "name" : "status-minus-blue", - "rule" : ".status-minus-blue", - "hash" : "61ef81a9b78b4de4bf6303f8d51c86ef" - }, - "status-minus-dark" : { - "name" : "status-minus-dark", - "rule" : ".status-minus-dark", - "hash" : "db4ddb69a22c7f6f09669fe3c488c4f0" - }, - "status-minus-green" : { - "name" : "status-minus-green", - "rule" : ".status-minus-green", - "hash" : "9e5402f65601ced38a967d4e17b80f1c" - }, - "status-minus-red" : { - "name" : "status-minus-red", - "rule" : ".status-minus-red", - "hash" : "bcaf148bc842e398f08d8c01506bd5b6" - }, - "status-minus-white" : { - "name" : "status-minus-white", - "rule" : ".status-minus-white", - "hash" : "c5a3771452dda603fbaee87371044f5a" - }, - "status-oh-closed" : { - "name" : "status-oh-closed", - "rule" : ".status-oh-closed", - "hash" : "fa5f2ef65de3e55c9251aebbed662f7a" - }, - "status-oh-closed-dark" : { - "name" : "status-oh-closed-dark", - "rule" : ".status-oh-closed-dark", - "hash" : "926d6a4e9530a20cd9cd655b334e4f89" - }, - "status-oh-ok" : { - "name" : "status-oh-ok", - "rule" : ".status-oh-ok", - "hash" : "0d1a2962da8fa12dd41a11316ba7f2eb" - }, - "status-oh-ok-dark" : { - "name" : "status-oh-ok-dark", - "rule" : ".status-oh-ok-dark", - "hash" : "2daa23d9b1b6c66daac93625dbd26dbc" - }, - "status-oh-open" : { - "name" : "status-oh-open", - "rule" : ".status-oh-open", - "hash" : "8d759391597ad3925abf2b4b4aaed537" - }, - "status-oh-open-green" : { - "name" : "status-oh-open-green", - "rule" : ".status-oh-open-green", - "hash" : "18fbeb777a9c5a7d46e0ba0760d3a557" - }, - "status-oh-open-red" : { - "name" : "status-oh-open-red", - "rule" : ".status-oh-open-red", - "hash" : "982610ba3d0bad1aaa11dcd3b593adbf" - }, - "status-open" : { - "name" : "status-open", - "rule" : ".status-open", - "hash" : "5b6b67382052982358d0047f07dd0424" - }, - "status-open-blue" : { - "name" : "status-open-blue", - "rule" : ".status-open-blue", - "hash" : "9632bb52d5f24941202848c2e3d4488a" - }, - "status-open-dark" : { - "name" : "status-open-dark", - "rule" : ".status-open-dark", - "hash" : "ca38ff5fc8a327d96cd1bbc23043fbb4" - }, - "status-open-green" : { - "name" : "status-open-green", - "rule" : ".status-open-green", - "hash" : "b4a2c17594a5301e2bd52a9df71819d3" - }, - "status-open-red" : { - "name" : "status-open-red", - "rule" : ".status-open-red", - "hash" : "f92b1544978d691da6912f937df54273" - }, - "status-open-white" : { - "name" : "status-open-white", - "rule" : ".status-open-white", - "hash" : "169dc0e8f36444ea30163181f9c88dc2" - }, - "status-pl-summary" : { - "name" : "status-pl-summary", - "rule" : ".status-pl-summary", - "hash" : "0abd0eab8617fb88f9b8f4d2f00e17b8" - }, - "status-pl-testplan" : { - "name" : "status-pl-testplan", - "rule" : ".status-pl-testplan", - "hash" : "03dbb3c53bfddfb553d49c6f27a76765" - }, - "status-policy-admin" : { - "name" : "status-policy-admin", - "rule" : ".status-policy-admin", - "hash" : "16c86a605a15a7a87f4d706c2122834c" - }, - "status-policy-admin-white" : { - "name" : "status-policy-admin-white", - "rule" : ".status-policy-admin-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-admin", - "hash" : "4b16ec5170bc30fb688f7e086e61a7f1" - }, - "status-policy-all" : { - "name" : "status-policy-all", - "rule" : ".status-policy-all", - "hash" : "7e8f9e8019ad7f668e51a097f0554ace" - }, - "status-policy-all-white" : { - "name" : "status-policy-all-white", - "rule" : ".status-policy-all-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-all", - "hash" : "24ed12bf6f58c21a82be125ace2ff0d0" - }, - "status-policy-custom" : { - "name" : "status-policy-custom", - "rule" : ".status-policy-custom", - "hash" : "3cf516b1e50412ec95594b9866ab1c39" - }, - "status-policy-custom-white" : { - "name" : "status-policy-custom-white", - "rule" : ".status-policy-custom-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-custom", - "hash" : "ff8b4cbe21f3b4254f343fffc170ef4b" - }, - "status-policy-elist" : { - "name" : "status-policy-elist", - "rule" : ".status-policy-elist", - "hash" : "da03d710291f394933260dbf43dbc654" - }, - "status-policy-elist-white" : { - "name" : "status-policy-elist-white", - "rule" : ".status-policy-elist-white", - "hash" : "57e90e9c91fd640e6a778ddc9a2fa015" - }, - "status-policy-noone" : { - "name" : "status-policy-noone", - "rule" : ".status-policy-noone", - "hash" : "e3403fb78718660105d86029518cf43c" - }, - "status-policy-noone-white" : { - "name" : "status-policy-noone-white", - "rule" : ".status-policy-noone-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-noone", - "hash" : "80fb9b153fec4d8136242c5ddc2d8e77" - }, - "status-policy-project" : { - "name" : "status-policy-project", - "rule" : ".status-policy-project", - "hash" : "2b77235f7057f3b29075d153345eacc6" - }, - "status-policy-project-white" : { - "name" : "status-policy-project-white", - "rule" : ".status-policy-project-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-project", - "hash" : "ac2b6f19edb8d6c40f0bcb3fd477a067" - }, - "status-policy-public" : { - "name" : "status-policy-public", - "rule" : ".status-policy-public", - "hash" : "e7959890117091fb185816dbc888dfd2" - }, - "status-policy-public-white" : { - "name" : "status-policy-public-white", - "rule" : ".status-policy-public-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-public", - "hash" : "cf809ca49eefed5375c2ea081e721971" - }, - "status-policy-unknown" : { - "name" : "status-policy-unknown", - "rule" : ".status-policy-unknown", - "hash" : "0235fd879547c98ad658fa0375c386b6" - }, - "status-policy-unknown-white" : { - "name" : "status-policy-unknown-white", - "rule" : ".status-policy-unknown-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-unknown", - "hash" : "98985bfa005672c4b88feaf88cfa72bc" - }, - "status-policy-user" : { - "name" : "status-policy-user", - "rule" : ".status-policy-user", - "hash" : "6c21aa20866d5b86f074bdcf4f487d40" - }, - "status-policy-user-white" : { - "name" : "status-policy-user-white", - "rule" : ".status-policy-user-white", - "hash" : "97a569e973df3f1e4fe012adf216ca40" - }, - "status-question" : { - "name" : "status-question", - "rule" : ".status-question", - "hash" : "f7290c6ba78eb37a6641eecfdc128f08" - }, - "status-question-blue" : { - "name" : "status-question-blue", - "rule" : ".status-question-blue", - "hash" : "44ebbdbe059ca77ae4dc6a6b98de1ccf" - }, - "status-question-dark" : { - "name" : "status-question-dark", - "rule" : ".status-question-dark", - "hash" : "5fdd5f2b089f4481a39760a50224d8b2" - }, - "status-question-green" : { - "name" : "status-question-green", - "rule" : ".status-question-green", - "hash" : "326dfc6c1841410ce0f22d702c872c01" - }, - "status-question-red" : { - "name" : "status-question-red", - "rule" : ".status-question-red", - "hash" : "18dbec41627f8c047c4e736f84dacb33" - }, - "status-question-white" : { - "name" : "status-question-white", - "rule" : ".status-question-white", - "hash" : "5e7f546f978d1d0545cad127ea3bcf80" - }, - "status-reject" : { - "name" : "status-reject", - "rule" : ".status-reject", - "hash" : "288489e716b390c5404969f9979b9ded" - }, - "status-reject-blue" : { - "name" : "status-reject-blue", - "rule" : ".status-reject-blue", - "hash" : "b0f51db6aa6ee85a24a1f4c13812d7ef" - }, - "status-reject-dark" : { - "name" : "status-reject-dark", - "rule" : ".status-reject-dark", - "hash" : "9b28c36f6cbd6d5d5731b971193a151e" - }, - "status-reject-green" : { - "name" : "status-reject-green", - "rule" : ".status-reject-green", - "hash" : "fc171843df97bcdc6e4679682b3b31e4" - }, - "status-reject-red" : { - "name" : "status-reject-red", - "rule" : ".status-reject-red", - "hash" : "6de0dd95a92d33bda228aaa9ba6deee5" - }, - "status-reject-white" : { - "name" : "status-reject-white", - "rule" : ".status-reject-white", - "hash" : "e709a3fb3081a395900deaef0591066c" - }, - "status-right" : { - "name" : "status-right", - "rule" : ".status-right", - "hash" : "cd61a821b88b7c76a43d7f405d54b6cc" - }, - "status-right-blue" : { - "name" : "status-right-blue", - "rule" : ".status-right-blue", - "hash" : "ca1cae1d93486785ec50458ba3b19082" - }, - "status-right-dark" : { - "name" : "status-right-dark", - "rule" : ".status-right-dark", - "hash" : "fb6600fd1775a8a4fb85709dc4f6c28c" - }, - "status-right-green" : { - "name" : "status-right-green", - "rule" : ".status-right-green", - "hash" : "9a52218e6c6d3968a05eb51865ed3cba" - }, - "status-right-red" : { - "name" : "status-right-red", - "rule" : ".status-right-red", - "hash" : "06bd9747ce4cc87282b2fb207c525f0c" - }, - "status-right-white" : { - "name" : "status-right-white", - "rule" : ".status-right-white", - "hash" : "be2ffb65a7799cd9a5e00c2334e378b2" - }, - "status-time-green" : { - "name" : "status-time-green", - "rule" : ".status-time-green", - "hash" : "5cb4771e10aaf79ac490bc93bd029d8f" - }, - "status-time-orange" : { - "name" : "status-time-orange", - "rule" : ".status-time-orange", - "hash" : "aa48043beff2c8576402dbccbe4ad3e2" - }, - "status-time-red" : { - "name" : "status-time-red", - "rule" : ".status-time-red", - "hash" : "e4dbf14f1ac16338b5e01aa04f2e267e" - }, - "status-time-yellow" : { - "name" : "status-time-yellow", - "rule" : ".status-time-yellow", - "hash" : "79756bcf7f2401d7e3a97ff03b981dcb" - }, - "status-up" : { - "name" : "status-up", - "rule" : ".status-up", - "hash" : "d42ac0a3f7bbae3bf57478f533ae88f4" - }, - "status-up-blue" : { - "name" : "status-up-blue", - "rule" : ".status-up-blue", - "hash" : "44fc24b3646e29c949b639157c315140" - }, - "status-up-dark" : { - "name" : "status-up-dark", - "rule" : ".status-up-dark", - "hash" : "459ed916291bfa905676ae0818bb2e1b" - }, - "status-up-green" : { - "name" : "status-up-green", - "rule" : ".status-up-green", - "hash" : "6a682e48fc2f240b19bd175be52c9256" - }, - "status-up-red" : { - "name" : "status-up-red", - "rule" : ".status-up-red", - "hash" : "0e38f6282e542470ecb68e55fad7eb76" - }, - "status-up-white" : { - "name" : "status-up-white", - "rule" : ".status-up-white", - "hash" : "ce80e291bc905b2692ad9f3ece7cf206" - }, - "status-warning" : { - "name" : "status-warning", - "rule" : ".status-warning", - "hash" : "425a02c06f9590e9f7c078badf832d0c" - }, - "status-warning-blue" : { - "name" : "status-warning-blue", - "rule" : ".status-warning-blue", - "hash" : "93f5e066a01a874adc2c120cca4bd1fc" - }, - "status-warning-dark" : { - "name" : "status-warning-dark", - "rule" : ".status-warning-dark", - "hash" : "273a519299d7063710452d21c0bc6406" - }, - "status-warning-green" : { - "name" : "status-warning-green", - "rule" : ".status-warning-green", - "hash" : "991514e5b75509b27fd68d21755b9fa6" - }, - "status-warning-red" : { - "name" : "status-warning-red", - "rule" : ".status-warning-red", - "hash" : "b15f61f314cbda5486d3aa21990153ae" - }, - "status-warning-white" : { - "name" : "status-warning-white", - "rule" : ".status-warning-white", - "hash" : "62ff8f6bf696e58f71eb4e1c6fe9b2e1" - } - }, - "scales" : [ - 1, - 2 - ], - "header" : "\/**\n * @provides sprite-status-css\n * @generated\n *\/\n\n.sprite-status {\n background-image: url(\/rsrc\/image\/sprite-status.png);\n background-repeat: no-repeat;\n}\n\n@media\nonly screen and (min-device-pixel-ratio: 1.5),\nonly screen and (-webkit-min-device-pixel-ratio: 1.5) {\n .sprite-status {\n background-image: url(\/rsrc\/image\/sprite-status-X2.png);\n background-size: {X}px {Y}px;\n }\n}\n", - "type" : "standard" -} diff --git a/resources/sprite/status_1x/accept-blue.png b/resources/sprite/status_1x/accept-blue.png deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ $generator->buildGradientSheet(), 'main-header' => $generator->buildMainHeaderSheet(), 'login' => $generator->buildLoginSheet(), - 'status' => $generator->buildStatusSheet(), 'projects' => $generator->buildProjectsSheet(), ); diff --git a/src/applications/conpherence/view/ConpherenceLayoutView.php b/src/applications/conpherence/view/ConpherenceLayoutView.php --- a/src/applications/conpherence/view/ConpherenceLayoutView.php +++ b/src/applications/conpherence/view/ConpherenceLayoutView.php @@ -81,13 +81,13 @@ 'widgetRegistry' => array( 'conpherence-message-pane' => array( 'name' => pht('Thread'), - 'icon' => 'comment', + 'icon' => 'fa-comment', 'deviceOnly' => true, 'hasCreate' => false ), 'widgets-people' => array( 'name' => pht('Participants'), - 'icon' => 'user', + 'icon' => 'fa-users', 'deviceOnly' => false, 'hasCreate' => true, 'createData' => array( @@ -98,13 +98,13 @@ ), 'widgets-files' => array( 'name' => pht('Files'), - 'icon' => 'file', + 'icon' => 'fa-files-o', 'deviceOnly' => false, 'hasCreate' => false ), 'widgets-calendar' => array( 'name' => pht('Calendar'), - 'icon' => 'calendar', + 'icon' => 'fa-calendar', 'deviceOnly' => false, 'hasCreate' => true, 'createData' => array( @@ -115,7 +115,7 @@ ), 'widgets-settings' => array( 'name' => pht('Settings'), - 'icon' => 'wrench', + 'icon' => 'fa-wrench', 'deviceOnly' => false, 'hasCreate' => false ), diff --git a/src/applications/differential/constants/DifferentialRevisionStatus.php b/src/applications/differential/constants/DifferentialRevisionStatus.php --- a/src/applications/differential/constants/DifferentialRevisionStatus.php +++ b/src/applications/differential/constants/DifferentialRevisionStatus.php @@ -36,23 +36,23 @@ } public static function getRevisionStatusIcon($status) { - $default = 'oh-open'; + $default = 'fa-square-o bluegrey'; $map = array( ArcanistDifferentialRevisionStatus::NEEDS_REVIEW => - 'oh-open', + 'fa-square-o bluegrey', ArcanistDifferentialRevisionStatus::NEEDS_REVISION => - 'oh-open-red', + 'fa-square-o red', ArcanistDifferentialRevisionStatus::CHANGES_PLANNED => - 'oh-open-red', + 'fa-square-o red', ArcanistDifferentialRevisionStatus::ACCEPTED => - 'oh-open-green', + 'fa-square-o green', ArcanistDifferentialRevisionStatus::CLOSED => - 'oh-closed-dark', + 'fa-check-square-o', ArcanistDifferentialRevisionStatus::ABANDONED => - 'oh-closed-dark', + 'fa-check-square-o', ArcanistDifferentialRevisionStatus::IN_PREPARATION => - 'question-blue', + 'fa-question-circle blue', ); return idx($map, $status, $default); } @@ -63,8 +63,7 @@ ArcanistDifferentialRevisionStatus::getNameForRevisionStatus($status); $img = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_STATUS) - ->setSpriteIcon(self::getRevisionStatusIcon($status)); + ->setIconFont(self::getRevisionStatusIcon($status)); $tag = phutil_tag( 'span', 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 @@ -150,11 +150,11 @@ ->setPolicyObject($repository); if (!$repository->isTracked()) { - $header->setStatus('policy-noone', '', pht('Inactive')); + $header->setStatus('fa-ban', 'dark', pht('Inactive')); } else if ($repository->isImporting()) { - $header->setStatus('time', 'red', pht('Importing...')); + $header->setStatus('fa-clock-o', 'indigo', pht('Importing...')); } else { - $header->setStatus('oh-ok', '', pht('Active')); + $header->setStatus('fa-check', 'bluegrey', pht('Active')); } 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 @@ -39,9 +39,9 @@ $header = id(new PHUIHeaderView()) ->setHeader($title); if ($repository->isTracked()) { - $header->setStatus('oh-ok', '', pht('Active')); + $header->setStatus('fa-check', 'bluegrey', pht('Active')); } else { - $header->setStatus('policy-noone', '', pht('Inactive')); + $header->setStatus('fa-ban', 'dark', pht('Inactive')); } $basic_actions = $this->buildBasicActions($repository); diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php --- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php +++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php @@ -31,11 +31,11 @@ ->setPolicyObject($build); if ($build->isRestarting()) { - $header->setStatus('warning', 'red', pht('Restarting')); + $header->setStatus('fa-exclamation-triangle', 'red', pht('Restarting')); } else if ($build->isStopping()) { - $header->setStatus('warning', 'red', pht('Stopping')); + $header->setStatus('fa-exclamation-triangle', 'red', pht('Stopping')); } else if ($build->isResuming()) { - $header->setStatus('warning', 'red', pht('Resuming')); + $header->setStatus('fa-exclamation-triangle', 'red', pht('Resuming')); } $box = id(new PHUIObjectBoxView()) diff --git a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php --- a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php +++ b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php @@ -203,7 +203,7 @@ } if ($buildable->getIsManualBuildable()) { - $item->addIcon('wrench-grey', pht('Manual')); + $item->addIcon('fa-wrench grey', pht('Manual')); } switch ($buildable->getBuildableStatus()) { 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 @@ -28,13 +28,13 @@ if ($rule->getIsDisabled()) { $header->setStatus( - 'oh-open', - 'red', + 'fa-ban', + 'dark', pht('Disabled')); } else { $header->setStatus( - 'oh-open', - null, + 'fa-check', + 'bluegrey', pht('Active')); } diff --git a/src/applications/maniphest/constants/ManiphestTaskStatus.php b/src/applications/maniphest/constants/ManiphestTaskStatus.php --- a/src/applications/maniphest/constants/ManiphestTaskStatus.php +++ b/src/applications/maniphest/constants/ManiphestTaskStatus.php @@ -54,15 +54,14 @@ public static function renderFullDescription($status) { if (self::isOpenStatus($status)) { $color = 'status'; - $icon = 'oh-open'; + $icon = 'fa-square-o bluegrey'; } else { $color = 'status-dark'; - $icon = 'oh-closed-dark'; + $icon = 'fa-check-square-o'; } $img = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_STATUS) - ->setSpriteIcon($icon); + ->setIconFont($icon); $tag = phutil_tag( 'span', 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 @@ -32,9 +32,9 @@ ->setPolicyObject($selected); if ($selected->isInstalled()) { - $header->setStatus('oh-ok', null, pht('Installed')); + $header->setStatus('fa-check', 'bluegrey', pht('Installed')); } else { - $header->setStatus('policy-noone', null, pht('Uninstalled')); + $header->setStatus('fa-ban', 'dark', pht('Uninstalled')); } $actions = $this->buildActionView($user, $selected); 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 @@ -72,7 +72,7 @@ ->setPolicyObject($credential); if ($credential->getIsDestroyed()) { - $header->setStatus('reject', 'red', pht('Destroyed')); + $header->setStatus('fa-ban', 'red', pht('Destroyed')); } return $header; diff --git a/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php b/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php --- a/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php +++ b/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php @@ -96,14 +96,14 @@ pht('Login: %s', $credential->getUsername())); if ($credential->getIsDestroyed()) { - $item->addIcon('disable', pht('Destroyed')); + $item->addIcon('fa-ban', pht('Destroyed')); $item->setDisabled(true); } $type = PassphraseCredentialType::getTypeByConstant( $credential->getCredentialType()); if ($type) { - $item->addIcon('wrench', $type->getCredentialTypeName()); + $item->addIcon('fa-wrench', $type->getCredentialTypeName()); } $list->addItem($item); diff --git a/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php b/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php --- a/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php +++ b/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php @@ -17,7 +17,7 @@ } public function getTypeIcon() { - return 'policy-all'; + return 'fa-user bluegrey'; } public function newObject() { diff --git a/src/applications/policy/storage/PhabricatorPolicy.php b/src/applications/policy/storage/PhabricatorPolicy.php --- a/src/applications/policy/storage/PhabricatorPolicy.php +++ b/src/applications/policy/storage/PhabricatorPolicy.php @@ -146,21 +146,21 @@ switch ($this->getType()) { case PhabricatorPolicyType::TYPE_GLOBAL: static $map = array( - PhabricatorPolicies::POLICY_PUBLIC => 'policy-public', - PhabricatorPolicies::POLICY_USER => 'policy-all', - PhabricatorPolicies::POLICY_ADMIN => 'policy-admin', - PhabricatorPolicies::POLICY_NOONE => 'policy-noone', + PhabricatorPolicies::POLICY_PUBLIC => 'fa-globe', + PhabricatorPolicies::POLICY_USER => 'fa-users', + PhabricatorPolicies::POLICY_ADMIN => 'fa-eye', + PhabricatorPolicies::POLICY_NOONE => 'fa-ban', ); - return idx($map, $this->getPHID(), 'policy-unknown'); + return idx($map, $this->getPHID(), 'fa-question-circle'); case PhabricatorPolicyType::TYPE_USER: - return 'policy-user'; + return 'fa-user'; case PhabricatorPolicyType::TYPE_PROJECT: - return 'policy-project'; + return 'fa-briefcase'; case PhabricatorPolicyType::TYPE_CUSTOM: case PhabricatorPolicyType::TYPE_MASKED: - return 'policy-custom'; + return 'fa-certificate'; default: - return 'policy-unknown'; + return 'fa-question-circle'; } } @@ -239,8 +239,7 @@ $img = null; if ($icon) { $img = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_STATUS) - ->setSpriteIcon($this->getIcon()); + ->setIconFont($this->getIcon()); } if ($this->getHref()) { 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 @@ -90,7 +90,7 @@ ->setPolicyObject($column); if ($column->isDeleted()) { - $header->setStatus('reject', 'red', pht('Deleted')); + $header->setStatus('fa-ban', 'dark', pht('Deleted')); } return $header; 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 @@ -29,9 +29,9 @@ ->setImage($project->getProfileImageURI()); if ($project->getStatus() == PhabricatorProjectStatus::STATUS_ACTIVE) { - $header->setStatus('oh-ok', '', pht('Active')); + $header->setStatus('fa-check', 'bluegrey', pht('Active')); } else { - $header->setStatus('policy-noone', '', pht('Archived')); + $header->setStatus('fa-ban', 'dark', pht('Archived')); } $actions = $this->buildActionListView($project); @@ -106,7 +106,7 @@ $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Unarchive Project')) - ->setIcon('fa-circle-check') + ->setIcon('fa-check') ->setHref($this->getApplicationURI("archive/{$id}/")) ->setDisabled(!$can_edit) ->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 @@ -64,9 +64,9 @@ ->addActionLink($board_btn); if ($project->getStatus() == PhabricatorProjectStatus::STATUS_ACTIVE) { - $header->setStatus('oh-ok', '', pht('Active')); + $header->setStatus('fa-check', 'bluegrey', pht('Active')); } else { - $header->setStatus('policy-noone', '', pht('Archived')); + $header->setStatus('fa-ban', 'dark', pht('Archived')); } $actions = $this->buildActionListView($project); diff --git a/src/applications/project/phid/PhabricatorProjectPHIDTypeColumn.php b/src/applications/project/phid/PhabricatorProjectPHIDTypeColumn.php --- a/src/applications/project/phid/PhabricatorProjectPHIDTypeColumn.php +++ b/src/applications/project/phid/PhabricatorProjectPHIDTypeColumn.php @@ -16,6 +16,10 @@ return new PhabricatorProjectColumn(); } + public function getTypeIcon() { + return 'fa-columns bluegrey'; + } + protected function buildQueryForObjects( PhabricatorObjectQuery $query, array $phids) { diff --git a/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php b/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php --- a/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php +++ b/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php @@ -17,7 +17,7 @@ } public function getTypeIcon() { - return 'policy-project'; + return 'fa-briefcase bluegrey'; } public function newObject() { 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 @@ -132,9 +132,9 @@ ->setPolicyObject($branch); if ($branch->getIsActive()) { - $header->setStatus('oh-ok', '', pht('Active')); + $header->setStatus('fa-check', 'bluegrey', pht('Active')); } else { - $header->setStatus('policy-noone', '', pht('Closed')); + $header->setStatus('fa-ban', 'dark', pht('Closed')); } $actions = id(new PhabricatorActionListView()) 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 @@ -175,9 +175,9 @@ ->setPolicyObject($product); if ($product->getIsActive()) { - $header->setStatus('oh-ok', '', pht('Active')); + $header->setStatus('fa-check', 'bluegrey', pht('Active')); } else { - $header->setStatus('policy-noone', '', pht('Inactive')); + $header->setStatus('fa-ban', 'dark', pht('Inactive')); } $actions = id(new PhabricatorActionListView()) 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 @@ -41,13 +41,14 @@ )); } - $header_icon = $poll->getIsClosed() ? 'oh-closed' : 'open'; + $header_icon = $poll->getIsClosed() ? 'fa-ban' : 'fa-circle-o'; $header_name = $poll->getIsClosed() ? pht('Closed') : pht('Open'); + $header_color = $poll->getIsClosed() ? 'dark' : 'bluegrey'; $header = id(new PHUIHeaderView()) ->setHeader($poll->getQuestion()) ->setUser($user) - ->setStatus($header_icon, '', $header_name) + ->setStatus($header_icon, $header_color, $header_name) ->setPolicyObject($poll); $actions = $this->buildActionView($poll); diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php --- a/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php +++ b/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php @@ -198,7 +198,7 @@ ->setURI('/p/'.$user->getUsername()) ->setPHID($user->getPHID()) ->setPriorityString($user->getUsername()) - ->setIcon('policy-all') + ->setIcon('fa-user bluegrey') ->setPriorityType('user') ->setClosed($closed); @@ -288,7 +288,7 @@ ->setDisplayType("Project") ->setURI('/project/view/'.$proj->getID().'/') ->setPHID($proj->getPHID()) - ->setIcon('policy-project') + ->setIcon('fa-briefcase bluegrey') ->setClosed($closed); $proj_result->setImageURI($proj->getProfileImageURI()); 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 @@ -506,50 +506,6 @@ return $sheet; } - public function buildStatusSheet() { - $icons = $this->getDirectoryList('status_1x'); - $scales = array( - '1x' => 1, - '2x' => 2, - ); - $template = id(new PhutilSprite()) - ->setSourceSize(14, 14); - - $sprites = array(); - $prefix = 'status_'; - - $pre_rule = ', .phuix-dropdown-menu .phabricator-action-view:hover '; - $extra_css = array( - 'policy-custom-white' => $pre_rule.'.status-policy-custom', - 'policy-all-white' => $pre_rule.'.status-policy-all', - 'policy-unknown-white' => $pre_rule.'.status-policy-unknown', - 'policy-admin-white' => $pre_rule.'.status-policy-admin', - 'policy-public-white' => $pre_rule.'.status-policy-public', - 'policy-project-white' => $pre_rule.'.status-policy-project', - 'policy-noone-white' => $pre_rule.'.status-policy-noone', - ); - - foreach ($icons as $icon) { - $sprite = id(clone $template) - ->setName('status-'.$icon) - ->setTargetCSS('.status-'.$icon.idx($extra_css, $icon)); - - foreach ($scales as $scale_key => $scale) { - $path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png'); - $sprite->setSourceFile($path, $scale); - } - $sprites[] = $sprite; - } - - $sheet = $this->buildSheet('status', true); - $sheet->setScales($scales); - foreach ($sprites as $sprite) { - $sheet->addSprite($sprite); - } - - return $sheet; - } - public function buildGradientSheet() { $gradients = $this->getDirectoryList('gradients'); diff --git a/src/view/control/AphrontTokenizerTemplateView.php b/src/view/control/AphrontTokenizerTemplateView.php --- a/src/view/control/AphrontTokenizerTemplateView.php +++ b/src/view/control/AphrontTokenizerTemplateView.php @@ -42,7 +42,7 @@ $tokens[] = $this->renderToken( $value->getPHID(), $value->getFullName(), - $value->getTypeIcon()); + $value->getType()); } $input = javelin_tag( @@ -81,7 +81,7 @@ phutil_tag( 'span', array( - 'class' => 'phui-icon-view sprite-status status-'.$icon, + 'class' => 'phui-icon-view phui-font-fa bluegrey '.$icon, )), $value); } diff --git a/src/view/form/control/AphrontFormPolicyControl.php b/src/view/form/control/AphrontFormPolicyControl.php --- a/src/view/form/control/AphrontFormPolicyControl.php +++ b/src/view/form/control/AphrontFormPolicyControl.php @@ -161,8 +161,7 @@ $icons = array(); foreach (igroup($flat_options, 'icon') as $icon => $ignored) { $icons[$icon] = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_STATUS) - ->setSpriteIcon($icon); + ->setIconFont($icon); } diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php --- a/src/view/phui/PHUIHeaderView.php +++ b/src/view/phui/PHUIHeaderView.php @@ -87,13 +87,12 @@ $header_class = 'phui-header-status'; if ($color) { - $icon = $icon.'-'.$color; + $icon = $icon.' '.$color; $header_class = $header_class.'-'.$color; } $img = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_STATUS) - ->setSpriteIcon($icon); + ->setIconFont($icon); $tag = phutil_tag( 'span', @@ -258,8 +257,7 @@ $phid = $object->getPHID(); $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_STATUS) - ->setSpriteIcon($policy->getIcon()); + ->setIconFont($policy->getIcon().' bluegrey'); $link = javelin_tag( 'a', diff --git a/src/view/phui/PHUIIconView.php b/src/view/phui/PHUIIconView.php --- a/src/view/phui/PHUIIconView.php +++ b/src/view/phui/PHUIIconView.php @@ -9,7 +9,6 @@ const SPRITE_PAYMENTS = 'payments'; const SPRITE_ICONS = 'icons'; const SPRITE_LOGIN = 'login'; - const SPRITE_STATUS = 'status'; const SPRITE_PROJECTS = 'projects'; const SPRITE_BUTTONBAR = 'buttonbar'; diff --git a/src/view/phui/PHUIPropertyListView.php b/src/view/phui/PHUIPropertyListView.php --- a/src/view/phui/PHUIPropertyListView.php +++ b/src/view/phui/PHUIPropertyListView.php @@ -10,8 +10,8 @@ private $classes = array(); private $stacked; - const ICON_SUMMARY = 'pl-summary'; - const ICON_TESTPLAN = 'pl-testplan'; + const ICON_SUMMARY = 'fa-align-left bluegrey'; + const ICON_TESTPLAN = 'fa-file-text-o bluegrey'; protected function canAppendChild() { return false; @@ -211,8 +211,7 @@ $name = $part['name']; if ($part['icon']) { $icon = id(new PHUIIconView()) - ->setSpriteSheet(PHUIIconView::SPRITE_STATUS) - ->setSpriteIcon($part['icon']); + ->setIconFont($part['icon']); $name = phutil_tag( 'span', array( diff --git a/webroot/rsrc/css/aphront/typeahead.css b/webroot/rsrc/css/aphront/typeahead.css --- a/webroot/rsrc/css/aphront/typeahead.css +++ b/webroot/rsrc/css/aphront/typeahead.css @@ -4,7 +4,7 @@ div.jx-typeahead-hardpoint { position: relative; - _zoom: 1; /* Some kind of IE6 fix? */ /* yes */ + _zoom: 1; /* Some kind of IE6 fix? */ /* yes */ /* why? */ } div.jx-typeahead-results { @@ -35,12 +35,16 @@ div.jx-typeahead-results a.jx-result:hover, div.jx-typeahead-results a.focused { display: block; - background: #dde6f9; - border-top: 1px solid #dde6f9; - border-bottom: 1px solid #d0dbf3; + background: {$lightblue}; + border-top: 1px solid {$thinblueborder}; + border-bottom: 1px solid {$thinblueborder}; text-decoration: none; } +div.jx-typeahead-results .phui-icon-view { + margin-top: 2px; +} + table.jx-typeahead button { margin-left: 3px; } diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css --- a/webroot/rsrc/css/phui/phui-header-view.css +++ b/webroot/rsrc/css/phui/phui-header-view.css @@ -106,7 +106,7 @@ margin-top: 4px; } -.phui-header-subheader .sprite-status { +.phui-header-subheader .phui-icon-view { display: inline-block; margin: -2px 4px -2px 0; } 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-status, .phui-icon-view.sprite-buttonbar { height: 14px; width: 14px; diff --git a/webroot/rsrc/css/phui/phui-property-list-view.css b/webroot/rsrc/css/phui/phui-property-list-view.css --- a/webroot/rsrc/css/phui/phui-property-list-view.css +++ b/webroot/rsrc/css/phui/phui-property-list-view.css @@ -103,7 +103,7 @@ padding-left: 8px; } -.phui-property-list-section-header-icon .sprite-status { +.phui-property-list-section-header-icon .phui-icon-view { display: inline-block; margin: -2px 4px -2px 0; } diff --git a/webroot/rsrc/css/sprite-status.css b/webroot/rsrc/css/sprite-status.css deleted file mode 100644 --- a/webroot/rsrc/css/sprite-status.css +++ /dev/null @@ -1,431 +0,0 @@ -/** - * @provides sprite-status-css - * @generated - */ - -.sprite-status { - background-image: url(/rsrc/image/sprite-status.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-status { - background-image: url(/rsrc/image/sprite-status-X2.png); - background-size: 150px 165px; - } -} - - -.status-accept-blue { - background-position: 0px 0px; -} - -.status-accept-dark { - background-position: -15px 0px; -} - -.status-accept-green { - background-position: -30px 0px; -} - -.status-accept-red { - background-position: -45px 0px; -} - -.status-accept-white { - background-position: -60px 0px; -} - -.status-accept { - background-position: -75px 0px; -} - -.status-add-blue { - background-position: -90px 0px; -} - -.status-add-dark { - background-position: -105px 0px; -} - -.status-add-green { - background-position: -120px 0px; -} - -.status-add-red { - background-position: -135px 0px; -} - -.status-add-white { - background-position: 0px -15px; -} - -.status-add { - background-position: -15px -15px; -} - -.status-down-blue { - background-position: -30px -15px; -} - -.status-down-dark { - background-position: -45px -15px; -} - -.status-down-green { - background-position: -60px -15px; -} - -.status-down-red { - background-position: -75px -15px; -} - -.status-down-white { - background-position: -90px -15px; -} - -.status-down { - background-position: -105px -15px; -} - -.status-info-blue { - background-position: -120px -15px; -} - -.status-info-dark { - background-position: -135px -15px; -} - -.status-info-green { - background-position: 0px -30px; -} - -.status-info-red { - background-position: -15px -30px; -} - -.status-info-white { - background-position: -30px -30px; -} - -.status-info { - background-position: -45px -30px; -} - -.status-left-blue { - background-position: -60px -30px; -} - -.status-left-dark { - background-position: -75px -30px; -} - -.status-left-green { - background-position: -90px -30px; -} - -.status-left-red { - background-position: -105px -30px; -} - -.status-left-white { - background-position: -120px -30px; -} - -.status-left { - background-position: -135px -30px; -} - -.status-minus-blue { - background-position: 0px -45px; -} - -.status-minus-dark { - background-position: -15px -45px; -} - -.status-minus-green { - background-position: -30px -45px; -} - -.status-minus-red { - background-position: -45px -45px; -} - -.status-minus-white { - background-position: -60px -45px; -} - -.status-minus { - background-position: -75px -45px; -} - -.status-oh-closed-dark { - background-position: -90px -45px; -} - -.status-oh-closed { - background-position: -105px -45px; -} - -.status-oh-ok-dark { - background-position: -120px -45px; -} - -.status-oh-ok { - background-position: -135px -45px; -} - -.status-oh-open-green { - background-position: 0px -60px; -} - -.status-oh-open-red { - background-position: -15px -60px; -} - -.status-oh-open { - background-position: -30px -60px; -} - -.status-open-blue { - background-position: -45px -60px; -} - -.status-open-dark { - background-position: -60px -60px; -} - -.status-open-green { - background-position: -75px -60px; -} - -.status-open-red { - background-position: -90px -60px; -} - -.status-open-white { - background-position: -105px -60px; -} - -.status-open { - background-position: -120px -60px; -} - -.status-pl-summary { - background-position: -135px -60px; -} - -.status-pl-testplan { - background-position: 0px -75px; -} - -.status-policy-admin-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-admin { - background-position: -15px -75px; -} - -.status-policy-admin { - background-position: -30px -75px; -} - -.status-policy-all-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-all { - background-position: -45px -75px; -} - -.status-policy-all { - background-position: -60px -75px; -} - -.status-policy-custom-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-custom { - background-position: -75px -75px; -} - -.status-policy-custom { - background-position: -90px -75px; -} - -.status-policy-elist-white { - background-position: -105px -75px; -} - -.status-policy-elist { - background-position: -120px -75px; -} - -.status-policy-noone-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-noone { - background-position: -135px -75px; -} - -.status-policy-noone { - background-position: 0px -90px; -} - -.status-policy-project-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-project { - background-position: -15px -90px; -} - -.status-policy-project { - background-position: -30px -90px; -} - -.status-policy-public-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-public { - background-position: -45px -90px; -} - -.status-policy-public { - background-position: -60px -90px; -} - -.status-policy-unknown-white, .phuix-dropdown-menu .phabricator-action-view:hover .status-policy-unknown { - background-position: -75px -90px; -} - -.status-policy-unknown { - background-position: -90px -90px; -} - -.status-policy-user-white { - background-position: -105px -90px; -} - -.status-policy-user { - background-position: -120px -90px; -} - -.status-question-blue { - background-position: -135px -90px; -} - -.status-question-dark { - background-position: 0px -105px; -} - -.status-question-green { - background-position: -15px -105px; -} - -.status-question-red { - background-position: -30px -105px; -} - -.status-question-white { - background-position: -45px -105px; -} - -.status-question { - background-position: -60px -105px; -} - -.status-reject-blue { - background-position: -75px -105px; -} - -.status-reject-dark { - background-position: -90px -105px; -} - -.status-reject-green { - background-position: -105px -105px; -} - -.status-reject-red { - background-position: -120px -105px; -} - -.status-reject-white { - background-position: -135px -105px; -} - -.status-reject { - background-position: 0px -120px; -} - -.status-right-blue { - background-position: -15px -120px; -} - -.status-right-dark { - background-position: -30px -120px; -} - -.status-right-green { - background-position: -45px -120px; -} - -.status-right-red { - background-position: -60px -120px; -} - -.status-right-white { - background-position: -75px -120px; -} - -.status-right { - background-position: -90px -120px; -} - -.status-time-green { - background-position: -105px -120px; -} - -.status-time-orange { - background-position: -120px -120px; -} - -.status-time-red { - background-position: -135px -120px; -} - -.status-time-yellow { - background-position: 0px -135px; -} - -.status-up-blue { - background-position: -15px -135px; -} - -.status-up-dark { - background-position: -30px -135px; -} - -.status-up-green { - background-position: -45px -135px; -} - -.status-up-red { - background-position: -60px -135px; -} - -.status-up-white { - background-position: -75px -135px; -} - -.status-up { - background-position: -90px -135px; -} - -.status-warning-blue { - background-position: -105px -135px; -} - -.status-warning-dark { - background-position: -120px -135px; -} - -.status-warning-green { - background-position: -135px -135px; -} - -.status-warning-red { - background-position: 0px -150px; -} - -.status-warning-white { - background-position: -15px -150px; -} - -.status-warning { - background-position: -30px -150px; -} diff --git a/webroot/rsrc/image/sprite-status-X2.png b/webroot/rsrc/image/sprite-status-X2.png deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@