diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 913cfc06f5..37ba01a32f 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '232f2fa7', + 'core.pkg.css' => 'bfa98093', 'core.pkg.js' => '63963771', 'darkconsole.pkg.js' => '8ab24e01', 'differential.pkg.css' => '8af45893', @@ -36,9 +36,9 @@ return array( 'rsrc/css/aphront/typeahead.css' => '0e403212', 'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', 'rsrc/css/application/auth/auth.css' => '1e655982', - 'rsrc/css/application/base/main-menu-view.css' => '3cf893a9', + 'rsrc/css/application/base/main-menu-view.css' => '7bb9c588', 'rsrc/css/application/base/notification-menu.css' => '6aa0a74b', - 'rsrc/css/application/base/phabricator-application-launch-view.css' => '5d71008f', + 'rsrc/css/application/base/phabricator-application-launch-view.css' => '16ca323f', 'rsrc/css/application/base/standard-page-view.css' => '6dafdb3b', 'rsrc/css/application/chatlog/chatlog.css' => '852140ff', 'rsrc/css/application/config/config-options.css' => '7fedf08b', @@ -124,19 +124,19 @@ return array( 'rsrc/css/phui/phui-action-list.css' => '9ee9910a', 'rsrc/css/phui/phui-box.css' => '7b3a2eed', 'rsrc/css/phui/phui-button.css' => '008ba5e2', - 'rsrc/css/phui/phui-crumbs-view.css' => '1705bce6', + 'rsrc/css/phui/phui-crumbs-view.css' => 'cd08e0bf', 'rsrc/css/phui/phui-document.css' => 'bbeb1890', 'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5', 'rsrc/css/phui/phui-fontkit.css' => '9c3d2dce', 'rsrc/css/phui/phui-form-view.css' => 'aad06f2a', 'rsrc/css/phui/phui-form.css' => '9aecbda1', 'rsrc/css/phui/phui-header-view.css' => '083669db', - 'rsrc/css/phui/phui-icon.css' => 'a013a63d', + 'rsrc/css/phui/phui-icon.css' => 'd35aa857', 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', 'rsrc/css/phui/phui-list.css' => '53deb25c', 'rsrc/css/phui/phui-object-box.css' => '0d47b3c8', - 'rsrc/css/phui/phui-object-item-list-view.css' => 'de963765', + 'rsrc/css/phui/phui-object-item-list-view.css' => 'b9f11c9e', 'rsrc/css/phui/phui-pinboard-view.css' => '3dd4a269', 'rsrc/css/phui/phui-property-list-view.css' => '51480060', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', @@ -147,7 +147,6 @@ return array( 'rsrc/css/phui/phui-timeline-view.css' => '415bf348', 'rsrc/css/phui/phui-workboard-view.css' => '8896938c', 'rsrc/css/phui/phui-workpanel-view.css' => 'e495a5cc', - 'rsrc/css/sprite-apps-large.css' => '20ec0cc0', 'rsrc/css/sprite-gradient.css' => '4bdb98a7', 'rsrc/css/sprite-login.css' => 'a355d921', 'rsrc/css/sprite-main-header.css' => '92720ee2', @@ -317,8 +316,6 @@ return array( 'rsrc/image/phrequent_inactive.png' => 'bfc15a69', 'rsrc/image/search-white.png' => '64cc0d45', 'rsrc/image/search.png' => '82625a7e', - 'rsrc/image/sprite-apps-large-X2.png' => '79e15268', - 'rsrc/image/sprite-apps-large.png' => '4d41b94a', 'rsrc/image/sprite-gradient.png' => 'ec15a417', 'rsrc/image/sprite-login-X2.png' => '5ae6de3a', 'rsrc/image/sprite-login.png' => '07f2c67c', @@ -701,7 +698,7 @@ return array( 'path-typeahead' => 'f7fc67ec', 'people-profile-css' => '25970776', 'phabricator-action-list-view-css' => '9ee9910a', - 'phabricator-application-launch-view-css' => '5d71008f', + 'phabricator-application-launch-view-css' => '16ca323f', 'phabricator-busy' => '6453c869', 'phabricator-chatlog-css' => '852140ff', 'phabricator-content-source-view-css' => '4b8b05d4', @@ -719,7 +716,7 @@ return array( 'phabricator-hovercard-view-css' => '893f4783', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'c1700f6f', - 'phabricator-main-menu-view' => '3cf893a9', + 'phabricator-main-menu-view' => '7bb9c588', 'phabricator-nav-view-css' => '7aeaf435', 'phabricator-notification' => '0c6946e7', 'phabricator-notification-css' => '9c279160', @@ -767,7 +764,7 @@ return array( 'phui-calendar-day-css' => 'de035c8a', 'phui-calendar-list-css' => 'c1d0ca59', 'phui-calendar-month-css' => 'a92e47d2', - 'phui-crumbs-view-css' => '1705bce6', + 'phui-crumbs-view-css' => 'cd08e0bf', 'phui-document-view-css' => 'bbeb1890', 'phui-feed-story-css' => 'c9f3a0b5', 'phui-font-icon-base-css' => '3dad2ae3', @@ -775,12 +772,12 @@ return array( 'phui-form-css' => '9aecbda1', 'phui-form-view-css' => 'aad06f2a', 'phui-header-view-css' => '083669db', - 'phui-icon-view-css' => 'a013a63d', + 'phui-icon-view-css' => 'd35aa857', 'phui-image-mask-css' => '5a8b09c8', 'phui-info-panel-css' => '27ea50a1', 'phui-list-view-css' => '53deb25c', 'phui-object-box-css' => '0d47b3c8', - 'phui-object-item-list-view-css' => 'de963765', + 'phui-object-item-list-view-css' => 'b9f11c9e', 'phui-pinboard-view-css' => '3dd4a269', 'phui-property-list-view-css' => '51480060', 'phui-remarkup-preview-css' => '19ad512b', @@ -810,7 +807,6 @@ return array( 'releeph-request-differential-create-dialog' => '8d8b92cd', 'releeph-request-typeahead-css' => '667a48ae', 'setup-issue-css' => '8f852bc0', - 'sprite-apps-large-css' => '20ec0cc0', 'sprite-gradient-css' => '4bdb98a7', 'sprite-login-css' => 'a355d921', 'sprite-main-header-css' => '92720ee2', @@ -2006,7 +2002,6 @@ return array( 'aphront-error-view-css', 'sprite-gradient-css', 'sprite-menu-css', - 'sprite-apps-large-css', 'phabricator-main-menu-view', 'phabricator-notification-css', 'phabricator-notification-menu-css', diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php index adac28251d..1ab48eb2fc 100644 --- a/resources/celerity/packages.php +++ b/resources/celerity/packages.php @@ -98,7 +98,6 @@ return array( 'sprite-gradient-css', 'sprite-menu-css', - 'sprite-apps-large-css', 'phabricator-main-menu-view', 'phabricator-notification-css', diff --git a/resources/sprite/manifest/apps-large.json b/resources/sprite/manifest/apps-large.json deleted file mode 100644 index a91d690ef3..0000000000 --- a/resources/sprite/manifest/apps-large.json +++ /dev/null @@ -1,351 +0,0 @@ -{ - "version" : 1, - "sprites" : { - "apps-adventure-dark-large" : { - "name" : "apps-adventure-dark-large", - "rule" : ".apps-adventure-dark-large", - "hash" : "ac9a5f5d00378649c14ea1b429c69fca" - }, - "apps-aphlict-dark-large" : { - "name" : "apps-aphlict-dark-large", - "rule" : ".apps-aphlict-dark-large", - "hash" : "8a689233e9098eb0ed524327e4e112f1" - }, - "apps-application-dark-large" : { - "name" : "apps-application-dark-large", - "rule" : ".apps-application-dark-large", - "hash" : "af16a9e9a6516bcacb719d81e085c129" - }, - "apps-audit-dark-large" : { - "name" : "apps-audit-dark-large", - "rule" : ".apps-audit-dark-large", - "hash" : "d01e07c7e87c7fa6f427f95feeb22192" - }, - "apps-authentication-dark-large" : { - "name" : "apps-authentication-dark-large", - "rule" : ".apps-authentication-dark-large", - "hash" : "56db4ab718727653f2daac5a251fd41f" - }, - "apps-calendar-dark-large" : { - "name" : "apps-calendar-dark-large", - "rule" : ".apps-calendar-dark-large", - "hash" : "9d3959e72ac04ae22836a256de814d86" - }, - "apps-chatlog-dark-large" : { - "name" : "apps-chatlog-dark-large", - "rule" : ".apps-chatlog-dark-large", - "hash" : "9d717ce7abda2b1279370ef6c1688642" - }, - "apps-conduit-dark-large" : { - "name" : "apps-conduit-dark-large", - "rule" : ".apps-conduit-dark-large", - "hash" : "634beb502665bdfbb375f86dab49d959" - }, - "apps-conpherence-dark-large" : { - "name" : "apps-conpherence-dark-large", - "rule" : ".apps-conpherence-dark-large", - "hash" : "8c749f70c026e9d6c909e4daa997795f" - }, - "apps-countdown-dark-large" : { - "name" : "apps-countdown-dark-large", - "rule" : ".apps-countdown-dark-large", - "hash" : "241a6ce70113e8c43327671426a952df" - }, - "apps-daemon-dark-large" : { - "name" : "apps-daemon-dark-large", - "rule" : ".apps-daemon-dark-large", - "hash" : "6287264b9bace2426aa4cfec7acf66e0" - }, - "apps-differential-dark-large" : { - "name" : "apps-differential-dark-large", - "rule" : ".apps-differential-dark-large", - "hash" : "15e61c0223804b5088498132c9f5196c" - }, - "apps-diffusion-dark-large" : { - "name" : "apps-diffusion-dark-large", - "rule" : ".apps-diffusion-dark-large", - "hash" : "96fdef24a703faa202c432a6a0ca0e2b" - }, - "apps-diviner-dark-large" : { - "name" : "apps-diviner-dark-large", - "rule" : ".apps-diviner-dark-large", - "hash" : "0ad88239a3d381fa3f3e233dddf89f26" - }, - "apps-drydock-dark-large" : { - "name" : "apps-drydock-dark-large", - "rule" : ".apps-drydock-dark-large", - "hash" : "ef4312f74104b7ff5993d577acc26f17" - }, - "apps-fact-dark-large" : { - "name" : "apps-fact-dark-large", - "rule" : ".apps-fact-dark-large", - "hash" : "9f8e2397e153f10e75e89c329efb588a" - }, - "apps-fancyhome-dark-large" : { - "name" : "apps-fancyhome-dark-large", - "rule" : ".apps-fancyhome-dark-large", - "hash" : "54c808f54217be359bc60ab90c4f1d3d" - }, - "apps-feed-dark-large" : { - "name" : "apps-feed-dark-large", - "rule" : ".apps-feed-dark-large", - "hash" : "ef5a381d47b900636183e52486b1affa" - }, - "apps-files-dark-large" : { - "name" : "apps-files-dark-large", - "rule" : ".apps-files-dark-large", - "hash" : "ead4d25221603b4af20121148e1380d0" - }, - "apps-flags-dark-large" : { - "name" : "apps-flags-dark-large", - "rule" : ".apps-flags-dark-large", - "hash" : "0273622cdd9f2480f450107c1f6e98d6" - }, - "apps-harbormaster-dark-large" : { - "name" : "apps-harbormaster-dark-large", - "rule" : ".apps-harbormaster-dark-large", - "hash" : "f227a74101175c93816ff27c4995b03c" - }, - "apps-help-dark-large" : { - "name" : "apps-help-dark-large", - "rule" : ".apps-help-dark-large", - "hash" : "64697e20468a75831924f92a0a7849c2" - }, - "apps-herald-dark-large" : { - "name" : "apps-herald-dark-large", - "rule" : ".apps-herald-dark-large", - "hash" : "77aa7afcf26ad9696f9df328af7ac059" - }, - "apps-home-dark-large" : { - "name" : "apps-home-dark-large", - "rule" : ".apps-home-dark-large", - "hash" : "b70c636283e7cdba1dd487e9087db2e0" - }, - "apps-info-sm-dark-large" : { - "name" : "apps-info-sm-dark-large", - "rule" : ".apps-info-sm-dark-large", - "hash" : "2d0c7b925dcaa22610b5cdf461189d33" - }, - "apps-legalpad-dark-large" : { - "name" : "apps-legalpad-dark-large", - "rule" : ".apps-legalpad-dark-large", - "hash" : "45002f32bdf761716e0f372318bcdf7b" - }, - "apps-logo-dark-large" : { - "name" : "apps-logo-dark-large", - "rule" : ".apps-logo-dark-large", - "hash" : "9dd9b92461e6c51147d9d936f705c836" - }, - "apps-logout-sm-dark-large" : { - "name" : "apps-logout-sm-dark-large", - "rule" : ".apps-logout-sm-dark-large", - "hash" : "2116bc66ca9126616db42d8e9a2f7961" - }, - "apps-macro-dark-large" : { - "name" : "apps-macro-dark-large", - "rule" : ".apps-macro-dark-large", - "hash" : "919ba5a5ce40ae8ae91506abbee56475" - }, - "apps-mail-dark-large" : { - "name" : "apps-mail-dark-large", - "rule" : ".apps-mail-dark-large", - "hash" : "7234a6fc2a8fdaeed400aab12c920657" - }, - "apps-maniphest-dark-large" : { - "name" : "apps-maniphest-dark-large", - "rule" : ".apps-maniphest-dark-large", - "hash" : "8964f91f98699f19d480ec6b4531d065" - }, - "apps-metamta-dark-large" : { - "name" : "apps-metamta-dark-large", - "rule" : ".apps-metamta-dark-large", - "hash" : "2f4a0ea6601ced1d4533d59ee3b3573d" - }, - "apps-new-dark-large" : { - "name" : "apps-new-dark-large", - "rule" : ".apps-new-dark-large", - "hash" : "e463e2030b51e4cc3f92c8a7ea966a7a" - }, - "apps-new-sm-dark-large" : { - "name" : "apps-new-sm-dark-large", - "rule" : ".apps-new-sm-dark-large", - "hash" : "7473bcc3ea8df1d1e413ebadeba2e4f7" - }, - "apps-nuance-dark-large" : { - "name" : "apps-nuance-dark-large", - "rule" : ".apps-nuance-dark-large", - "hash" : "a179a6802048440f0c4dfd99784ad740" - }, - "apps-owners-dark-large" : { - "name" : "apps-owners-dark-large", - "rule" : ".apps-owners-dark-large", - "hash" : "7cb82da84fde145de88a0720d861c4b6" - }, - "apps-passphrase-dark-large" : { - "name" : "apps-passphrase-dark-large", - "rule" : ".apps-passphrase-dark-large", - "hash" : "9e3baef3c279b8527404a72b60f59b45" - }, - "apps-paste-dark-large" : { - "name" : "apps-paste-dark-large", - "rule" : ".apps-paste-dark-large", - "hash" : "fd88668942b2527aace60663e8832396" - }, - "apps-pebkac-dark-large" : { - "name" : "apps-pebkac-dark-large", - "rule" : ".apps-pebkac-dark-large", - "hash" : "762529054409c2b9eb350a5dfc7d3376" - }, - "apps-people-dark-large" : { - "name" : "apps-people-dark-large", - "rule" : ".apps-people-dark-large", - "hash" : "96227759b1298eddfd1e753a3d103883" - }, - "apps-phage-dark-large" : { - "name" : "apps-phage-dark-large", - "rule" : ".apps-phage-dark-large", - "hash" : "c50284d3e7d491f7d7299ee953363585" - }, - "apps-phame-dark-large" : { - "name" : "apps-phame-dark-large", - "rule" : ".apps-phame-dark-large", - "hash" : "f3c948e1155e8c7c857d5030822ea7c3" - }, - "apps-phid-dark-large" : { - "name" : "apps-phid-dark-large", - "rule" : ".apps-phid-dark-large", - "hash" : "8dc1b2d461337d8395b0346a31bc5bcf" - }, - "apps-phlux-dark-large" : { - "name" : "apps-phlux-dark-large", - "rule" : ".apps-phlux-dark-large", - "hash" : "5e64d21065ece70aa654b71c5ca08e7c" - }, - "apps-pholio-dark-large" : { - "name" : "apps-pholio-dark-large", - "rule" : ".apps-pholio-dark-large", - "hash" : "42455998f054a37db41344c960f5e92a" - }, - "apps-phortune-dark-large" : { - "name" : "apps-phortune-dark-large", - "rule" : ".apps-phortune-dark-large", - "hash" : "afe86ab1f4bf6dc444b79c5a706014f0" - }, - "apps-phpast-dark-large" : { - "name" : "apps-phpast-dark-large", - "rule" : ".apps-phpast-dark-large", - "hash" : "d7825195316c431dba348e61e6404192" - }, - "apps-phragment-dark-large" : { - "name" : "apps-phragment-dark-large", - "rule" : ".apps-phragment-dark-large", - "hash" : "a14041ec08c03c70b146dcc7b1ab3149" - }, - "apps-phrequent-dark-large" : { - "name" : "apps-phrequent-dark-large", - "rule" : ".apps-phrequent-dark-large", - "hash" : "f2580d807f34f2d300aa3f38d2291df3" - }, - "apps-phriction-dark-large" : { - "name" : "apps-phriction-dark-large", - "rule" : ".apps-phriction-dark-large", - "hash" : "a1ac9721097348668c145567a86a1a4c" - }, - "apps-phund-dark-large" : { - "name" : "apps-phund-dark-large", - "rule" : ".apps-phund-dark-large", - "hash" : "b932fadd547bc484862e73cf94823e17" - }, - "apps-policy-dark-large" : { - "name" : "apps-policy-dark-large", - "rule" : ".apps-policy-dark-large", - "hash" : "0904ba23bdd2377e3fb94c1ddb291f87" - }, - "apps-ponder-dark-large" : { - "name" : "apps-ponder-dark-large", - "rule" : ".apps-ponder-dark-large", - "hash" : "0c55d1462fdc117840cf30cfce9aa575" - }, - "apps-power-dark-large" : { - "name" : "apps-power-dark-large", - "rule" : ".apps-power-dark-large", - "hash" : "7986c116cd3902cd986789dddf8060c2" - }, - "apps-projects-dark-large" : { - "name" : "apps-projects-dark-large", - "rule" : ".apps-projects-dark-large", - "hash" : "dd87f19b9fdb1b13f00c637f34d7309d" - }, - "apps-releeph-dark-large" : { - "name" : "apps-releeph-dark-large", - "rule" : ".apps-releeph-dark-large", - "hash" : "023ef87d29093c3e77599cca33689e58" - }, - "apps-repositories-dark-large" : { - "name" : "apps-repositories-dark-large", - "rule" : ".apps-repositories-dark-large", - "hash" : "96d1a6555dbf378852e5620958f3599c" - }, - "apps-search-dark-large" : { - "name" : "apps-search-dark-large", - "rule" : ".apps-search-dark-large", - "hash" : "15f74cf1299fb4c14fee8aca889c997e" - }, - "apps-settings-dark-large" : { - "name" : "apps-settings-dark-large", - "rule" : ".apps-settings-dark-large", - "hash" : "eb3ecf190c0236f20cc7be6113b8b54a" - }, - "apps-settings-sm-dark-large" : { - "name" : "apps-settings-sm-dark-large", - "rule" : ".apps-settings-sm-dark-large", - "hash" : "d071ab50a627b837a0be85e00671b03e" - }, - "apps-setup-dark-large" : { - "name" : "apps-setup-dark-large", - "rule" : ".apps-setup-dark-large", - "hash" : "868b238ab08325d1e8be55fa62692685" - }, - "apps-slowvote-dark-large" : { - "name" : "apps-slowvote-dark-large", - "rule" : ".apps-slowvote-dark-large", - "hash" : "a8a245dab68213045304a9b2720c8dbb" - }, - "apps-spaces-dark-large" : { - "name" : "apps-spaces-dark-large", - "rule" : ".apps-spaces-dark-large", - "hash" : "1062cc2ff3813434f0df6e579e9c3d83" - }, - "apps-token-dark-large" : { - "name" : "apps-token-dark-large", - "rule" : ".apps-token-dark-large", - "hash" : "da4f9abdd3fc0356a76ca2c8d76b0f3f" - }, - "apps-uiexamples-dark-large" : { - "name" : "apps-uiexamples-dark-large", - "rule" : ".apps-uiexamples-dark-large", - "hash" : "a1934249d45094024613b92e73985c2a" - }, - "apps-workboard-dark-large" : { - "name" : "apps-workboard-dark-large", - "rule" : ".apps-workboard-dark-large", - "hash" : "9d553c0773b7c46477e6721eca766186" - }, - "apps-workphlow-dark-large" : { - "name" : "apps-workphlow-dark-large", - "rule" : ".apps-workphlow-dark-large", - "hash" : "45f421d16cb316cd68ef84869a7c0db0" - }, - "apps-xhprof-dark-large" : { - "name" : "apps-xhprof-dark-large", - "rule" : ".apps-xhprof-dark-large", - "hash" : "1dab981ce899cd35b58a8293530fda2c" - } - }, - "scales" : [ - 1, - 2 - ], - "header" : "\/**\n * @provides sprite-apps-large-css\n * @generated\n *\/\n\n.sprite-apps-large {\n background-image: url(\/rsrc\/image\/sprite-apps-large.png);\n background-repeat: no-repeat;\n}\n\n@media\nonly screen and (min-device-pixel-ratio: 1.5),\nonly screen and (-webkit-min-device-pixel-ratio: 1.5) {\n .sprite-apps-large {\n background-image: url(\/rsrc\/image\/sprite-apps-large-X2.png);\n background-size: {X}px {Y}px;\n }\n}\n", - "type" : "standard" -} diff --git a/resources/sprite/manifest/apps-xlarge.json b/resources/sprite/manifest/apps-xlarge.json deleted file mode 100644 index 9812599fa1..0000000000 --- a/resources/sprite/manifest/apps-xlarge.json +++ /dev/null @@ -1,200 +0,0 @@ -{ - "version" : 1, - "sprites" : { - "app-application-dark-xlarge" : { - "name" : "app-application-dark-xlarge", - "rule" : ".app-application-dark-xlarge", - "hash" : "7a643a12413cff83e4a80a1e845526f8" - }, - "app-audit-dark-xlarge" : { - "name" : "app-audit-dark-xlarge", - "rule" : ".app-audit-dark-xlarge", - "hash" : "5551492ef2b1f0c6dc29707a268abcb7" - }, - "app-calendar-dark-xlarge" : { - "name" : "app-calendar-dark-xlarge", - "rule" : ".app-calendar-dark-xlarge", - "hash" : "f38663d868c6865423ad7072f1031cdf" - }, - "app-conduit-dark-xlarge" : { - "name" : "app-conduit-dark-xlarge", - "rule" : ".app-conduit-dark-xlarge", - "hash" : "bcee651ff297aab466c388739c219a27" - }, - "app-countdown-dark-xlarge" : { - "name" : "app-countdown-dark-xlarge", - "rule" : ".app-countdown-dark-xlarge", - "hash" : "c3667959ddfebe2ae95681215a71fc6e" - }, - "app-daemon-dark-xlarge" : { - "name" : "app-daemon-dark-xlarge", - "rule" : ".app-daemon-dark-xlarge", - "hash" : "f7b12a99852a6b10c3a37c834924adc0" - }, - "app-differential-dark-xlarge" : { - "name" : "app-differential-dark-xlarge", - "rule" : ".app-differential-dark-xlarge", - "hash" : "4593b952ecfc1d34971519912bb929c5" - }, - "app-diffusion-dark-xlarge" : { - "name" : "app-diffusion-dark-xlarge", - "rule" : ".app-diffusion-dark-xlarge", - "hash" : "6db32b1bc12d289ef6f3961d8db835b2" - }, - "app-diviner-dark-xlarge" : { - "name" : "app-diviner-dark-xlarge", - "rule" : ".app-diviner-dark-xlarge", - "hash" : "99df86667a67c4790f7fafd836320811" - }, - "app-drydock-dark-xlarge" : { - "name" : "app-drydock-dark-xlarge", - "rule" : ".app-drydock-dark-xlarge", - "hash" : "7e3fca7e8a676f31a584bba714223be3" - }, - "app-fact-dark-xlarge" : { - "name" : "app-fact-dark-xlarge", - "rule" : ".app-fact-dark-xlarge", - "hash" : "d9b1d20ff52ca3e78a8d4f86d8cba80a" - }, - "app-feed-dark-xlarge" : { - "name" : "app-feed-dark-xlarge", - "rule" : ".app-feed-dark-xlarge", - "hash" : "e380a1ad743816ec1fb5a39f2bbd1ce9" - }, - "app-files-dark-xlarge" : { - "name" : "app-files-dark-xlarge", - "rule" : ".app-files-dark-xlarge", - "hash" : "f98aaf6cafcd39cfa45de67814c8e25c" - }, - "app-flags-dark-xlarge" : { - "name" : "app-flags-dark-xlarge", - "rule" : ".app-flags-dark-xlarge", - "hash" : "9c439bf054d35ebb5f06b22a9acb5d64" - }, - "app-help-dark-xlarge" : { - "name" : "app-help-dark-xlarge", - "rule" : ".app-help-dark-xlarge", - "hash" : "dea35456361ba0851085dd68c1f586e3" - }, - "app-herald-dark-xlarge" : { - "name" : "app-herald-dark-xlarge", - "rule" : ".app-herald-dark-xlarge", - "hash" : "dbff6868cd9046c41d7d9d1f57bb4bf8" - }, - "app-home-dark-xlarge" : { - "name" : "app-home-dark-xlarge", - "rule" : ".app-home-dark-xlarge", - "hash" : "c0758afffbbbe6cc076d2e6fa22ca809" - }, - "app-logo-dark-xlarge" : { - "name" : "app-logo-dark-xlarge", - "rule" : ".app-logo-dark-xlarge", - "hash" : "50a1a90428301872442f438a884053cd" - }, - "app-macro-dark-xlarge" : { - "name" : "app-macro-dark-xlarge", - "rule" : ".app-macro-dark-xlarge", - "hash" : "4992c19c9d883a7aa40d26a67253c4af" - }, - "app-mail-dark-xlarge" : { - "name" : "app-mail-dark-xlarge", - "rule" : ".app-mail-dark-xlarge", - "hash" : "47e47cf18b434e567fedd5ecd3b1dd06" - }, - "app-maniphest-dark-xlarge" : { - "name" : "app-maniphest-dark-xlarge", - "rule" : ".app-maniphest-dark-xlarge", - "hash" : "f50e0c476990448c594892e7436c3f25" - }, - "app-metamta-dark-xlarge" : { - "name" : "app-metamta-dark-xlarge", - "rule" : ".app-metamta-dark-xlarge", - "hash" : "48bbb5e9bf22c61f47f20e4d4f28e388" - }, - "app-owners-dark-xlarge" : { - "name" : "app-owners-dark-xlarge", - "rule" : ".app-owners-dark-xlarge", - "hash" : "cdd4aff8d915194a03f91bf179f769e3" - }, - "app-paste-dark-xlarge" : { - "name" : "app-paste-dark-xlarge", - "rule" : ".app-paste-dark-xlarge", - "hash" : "01fb15f0c1737b8ebfff35f2640f724b" - }, - "app-people-dark-xlarge" : { - "name" : "app-people-dark-xlarge", - "rule" : ".app-people-dark-xlarge", - "hash" : "84b938691e8bfe3a703bcb4268557c4f" - }, - "app-phame-dark-xlarge" : { - "name" : "app-phame-dark-xlarge", - "rule" : ".app-phame-dark-xlarge", - "hash" : "83c25a09a86864b2234b15a822bcc3ee" - }, - "app-phid-dark-xlarge" : { - "name" : "app-phid-dark-xlarge", - "rule" : ".app-phid-dark-xlarge", - "hash" : "920ce85f9599b2e108f91646d02d0d98" - }, - "app-pholio-dark-xlarge" : { - "name" : "app-pholio-dark-xlarge", - "rule" : ".app-pholio-dark-xlarge", - "hash" : "3df7131f4ba39cb1b41265a8c9ab21b4" - }, - "app-phpast-dark-xlarge" : { - "name" : "app-phpast-dark-xlarge", - "rule" : ".app-phpast-dark-xlarge", - "hash" : "a6e70722d85061c262cb7cb89a66d6e7" - }, - "app-phriction-dark-xlarge" : { - "name" : "app-phriction-dark-xlarge", - "rule" : ".app-phriction-dark-xlarge", - "hash" : "7abef95c6c378ab6bb3d08ca4a252c5c" - }, - "app-ponder-dark-xlarge" : { - "name" : "app-ponder-dark-xlarge", - "rule" : ".app-ponder-dark-xlarge", - "hash" : "fab5f0539a3e17ff9934b1165658987d" - }, - "app-power-dark-xlarge" : { - "name" : "app-power-dark-xlarge", - "rule" : ".app-power-dark-xlarge", - "hash" : "dcfbd602f69e65b52c42825fd65fdb15" - }, - "app-projects-dark-xlarge" : { - "name" : "app-projects-dark-xlarge", - "rule" : ".app-projects-dark-xlarge", - "hash" : "403790d745f6e385e2639d72d57f40e5" - }, - "app-repositories-dark-xlarge" : { - "name" : "app-repositories-dark-xlarge", - "rule" : ".app-repositories-dark-xlarge", - "hash" : "f3319bd72328ed112650b79f3bc06831" - }, - "app-settings-dark-xlarge" : { - "name" : "app-settings-dark-xlarge", - "rule" : ".app-settings-dark-xlarge", - "hash" : "48788e1a045452ae1c2ca179e623d056" - }, - "app-setup-dark-xlarge" : { - "name" : "app-setup-dark-xlarge", - "rule" : ".app-setup-dark-xlarge", - "hash" : "9ab00a533af4fa79018cd18aa605a1a3" - }, - "app-slowvote-dark-xlarge" : { - "name" : "app-slowvote-dark-xlarge", - "rule" : ".app-slowvote-dark-xlarge", - "hash" : "705b09e36b25a7ed4b4a9c924173e79e" - }, - "app-uiexamples-dark-xlarge" : { - "name" : "app-uiexamples-dark-xlarge", - "rule" : ".app-uiexamples-dark-xlarge", - "hash" : "3f58b1ab30daf4a5a8cedfc7484421bf" - } - }, - "scales" : [ - 1 - ], - "header" : "\/**\n * @provides sprite-apps-xlarge-css\n * @generated\n *\/\n\n.sprite-apps-xlarge {\n background-image: url(\/rsrc\/image\/sprite-apps-xlarge.png);\n background-repeat: no-repeat;\n}\n\n\n", - "type" : "standard" -} diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php index 6597ae7709..589c7fc061 100644 --- a/src/applications/base/controller/PhabricatorController.php +++ b/src/applications/base/controller/PhabricatorController.php @@ -434,15 +434,15 @@ abstract class PhabricatorController extends AphrontController { $application = $this->getCurrentApplication(); if ($application) { - $sprite = $application->getIconName(); - if (!$sprite) { - $sprite = 'application'; + $icon = $application->getFontIcon(); + if (!$icon) { + $icon = 'fa-puzzle'; } $crumbs[] = id(new PHUICrumbView()) ->setHref($this->getApplicationURI()) ->setAural($application->getName()) - ->setIcon($sprite); + ->setIcon($icon); } $view = new PHUICrumbsView(); diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php index 6c90d5cc34..e2be00715a 100644 --- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php +++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php @@ -19,7 +19,7 @@ final class PhabricatorDiffusionApplication extends PhabricatorApplication { } public function getFontIcon() { - return 'fa-file-code-o'; + return 'fa-code'; } public function isPinnedByDefault(PhabricatorUser $viewer) { diff --git a/src/applications/diviner/application/PhabricatorDivinerApplication.php b/src/applications/diviner/application/PhabricatorDivinerApplication.php index 0d517ed1e7..172d09b962 100644 --- a/src/applications/diviner/application/PhabricatorDivinerApplication.php +++ b/src/applications/diviner/application/PhabricatorDivinerApplication.php @@ -11,7 +11,7 @@ final class PhabricatorDivinerApplication extends PhabricatorApplication { } public function getFontIcon() { - return 'fa-sun'; + return 'fa-sun-o'; } public function getName() { diff --git a/src/applications/macro/application/PhabricatorMacroApplication.php b/src/applications/macro/application/PhabricatorMacroApplication.php index d8314f0a70..1dee8abf06 100644 --- a/src/applications/macro/application/PhabricatorMacroApplication.php +++ b/src/applications/macro/application/PhabricatorMacroApplication.php @@ -19,7 +19,7 @@ final class PhabricatorMacroApplication extends PhabricatorApplication { } public function getFontIcon() { - return 'fa-smile'; + return 'fa-smile-o'; } public function getTitleGlyph() { diff --git a/src/applications/meta/query/PhabricatorAppSearchEngine.php b/src/applications/meta/query/PhabricatorAppSearchEngine.php index 5a12da2ca1..6e9bd71239 100644 --- a/src/applications/meta/query/PhabricatorAppSearchEngine.php +++ b/src/applications/meta/query/PhabricatorAppSearchEngine.php @@ -191,7 +191,7 @@ final class PhabricatorAppSearchEngine $list->addClass('phui-object-item-launcher-list'); foreach ($applications as $application) { - $icon = $application->getIconName(); + $icon = $application->getFontIcon(); if (!$icon) { $icon = 'application'; } @@ -203,8 +203,7 @@ final class PhabricatorAppSearchEngine $icon_view = javelin_tag( 'span', array( - 'class' => 'phui-icon-view '. - 'sprite-apps-large apps-'.$icon.'-dark-large', + 'class' => 'phui-icon-view phui-font-fa '.$icon, 'aural' => false, ), ''); diff --git a/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php b/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php index 5173248988..19b40f727a 100644 --- a/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php +++ b/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php @@ -24,7 +24,7 @@ final class PhabricatorApplicationDatasource continue; } $name = $application->getName().' '.$application->getShortDescription(); - $img = 'apps-'.$application->getIconName().'-dark-large'; + $img = 'phui-font-fa phui-icon-view '.$application->getFontIcon(); $results[] = id(new PhabricatorTypeaheadResult()) ->setName($name) ->setURI($uri) @@ -34,7 +34,7 @@ final class PhabricatorApplicationDatasource ->setDisplayType($application->getShortDescription()) ->setImageuRI($application->getIconURI()) ->setPriorityType('apps') - ->setImageSprite('phabricator-search-icon sprite-apps-large '.$img); + ->setImageSprite('phabricator-search-icon '.$img); } return $results; diff --git a/src/applications/meta/view/PhabricatorApplicationLaunchView.php b/src/applications/meta/view/PhabricatorApplicationLaunchView.php index 914a9e4500..397838882e 100644 --- a/src/applications/meta/view/PhabricatorApplicationLaunchView.php +++ b/src/applications/meta/view/PhabricatorApplicationLaunchView.php @@ -31,7 +31,6 @@ final class PhabricatorApplicationLaunchView extends AphrontTagView { $application = $this->application; require_celerity_resource('phabricator-application-launch-view-css'); - require_celerity_resource('sprite-apps-large-css'); $content = array(); $icon = null; @@ -113,9 +112,9 @@ final class PhabricatorApplicationLaunchView extends AphrontTagView { if ($application->getIconURI()) { $styles[] = 'background-image: url('.$application->getIconURI().')'; } else { - $icon = $application->getIconName(); - $classes[] = 'sprite-apps-large'; - $classes[] = 'apps-'.$icon.'-dark-large'; + $classes[] = $application->getFontIcon(); + $classes[] = 'phui-icon-view'; + $classes[] = 'phui-font-fa'; } $icon = phutil_tag( diff --git a/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php b/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php index 495b7c06c2..58614bcedb 100644 --- a/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php @@ -141,7 +141,7 @@ final class PhabricatorHomePreferencesSettingsPanel continue; } - $icon = $application->getIconName(); + $icon = $application->getFontIcon(); if (!$icon) { $icon = 'application'; } @@ -149,8 +149,7 @@ final class PhabricatorHomePreferencesSettingsPanel $icon_view = javelin_tag( 'span', array( - 'class' => 'phui-icon-view '. - 'sprite-apps-large apps-'.$icon.'-dark-large', + 'class' => 'phui-icon-view phui-font-fa '.$icon, 'aural' => false, ), ''); diff --git a/src/view/phui/PHUICrumbView.php b/src/view/phui/PHUICrumbView.php index b4e69a479f..abaf4b7a1d 100644 --- a/src/view/phui/PHUICrumbView.php +++ b/src/view/phui/PHUICrumbView.php @@ -72,8 +72,7 @@ final class PHUICrumbView extends AphrontView { $icon = phutil_tag( 'span', array( - 'class' => 'phui-crumb-icon '. - 'sprite-apps-large apps-'.$this->icon.'-dark-large', + 'class' => 'phui-crumb-icon phui-icon-view phui-font-fa '.$this->icon, ), ''); } diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css index f2c3236e5d..4cc8e5e1e6 100644 --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -214,12 +214,14 @@ } .phabricator-main-search-typeahead-result .phabricator-search-icon { - display: inline-block; width: 28px; height: 28px; position: absolute; - top: 9px; - left: 9px; + top: 8px; + left: 8px; + font-size: 24px; + text-align: center; + vertical-align: bottom; } .phabricator-main-search-typeahead-result { diff --git a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css index 81117daa22..609029479c 100644 --- a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css +++ b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css @@ -38,12 +38,16 @@ div.phabricator-application-launch-container { } .phabricator-application-launch-icon { - display: block; position: absolute; width: 28px; height: 28px; - top: 8px; - left: 8px; + top: 12px; + left: 6px; + font-size: 20px; + text-align: center; + vertical-align: bottom; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9); + color: {$darkbluetext}; } .device-desktop a.phabricator-application-launch-container:hover { @@ -56,14 +60,14 @@ div.phabricator-application-launch-container { font-weight: bold; color: {$darkbluetext}; font-size: 13px; - margin: 6px 0 2px 44px; + margin: 6px 0 2px 38px; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9); } .phabricator-application-launch-description { - color: {$bluetext}; + color: {$darkbluetext}; font-size: 11px; - margin-left: 44px; + margin-left: 38px; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9); text-overflow: ellipsis; width: 150px; diff --git a/webroot/rsrc/css/phui/phui-crumbs-view.css b/webroot/rsrc/css/phui/phui-crumbs-view.css index f916622824..3536117631 100644 --- a/webroot/rsrc/css/phui/phui-crumbs-view.css +++ b/webroot/rsrc/css/phui/phui-crumbs-view.css @@ -55,8 +55,10 @@ display: inline-block; width: 28px; height: 28px; - margin: 2px 2px 2px 10px; + margin: 6px 2px 2px 10px; vertical-align: top; + font-size: 20px; + text-align: center; } .device-phone .phui-crumb-icon { diff --git a/webroot/rsrc/css/phui/phui-icon.css b/webroot/rsrc/css/phui/phui-icon.css index 799c6533da..d9ceaa74a4 100644 --- a/webroot/rsrc/css/phui/phui-icon.css +++ b/webroot/rsrc/css/phui/phui-icon.css @@ -7,11 +7,6 @@ vertical-align: top; } -.phui-icon-view.sprite-apps { - height: 14px; - width: 14px; -} - .phui-icon-view.sprite-tokens { height: 16px; width: 16px; diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css index 38de6f474a..46f5603c2e 100644 --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -737,10 +737,13 @@ ul.phui-object-item-icons { .phui-object-item-image-icon .phui-icon-view { position: absolute; - width: 28px; - height: 28px; - left: 8px; - top: 8px; + width: 24px; + height: 24px; + left: 6px; + top: 10px; + font-size: 24px; + text-align: center; + vertical-align: bottom; } .phui-object-item-with-image-icon .phui-object-item-frame { @@ -748,7 +751,7 @@ ul.phui-object-item-icons { } .phui-object-item-with-image-icon .phui-object-item-content-box { - margin-left: 44px; + margin-left: 36px; } .device-desktop .phui-object-item-launcher-list .phui-object-item-content { diff --git a/webroot/rsrc/css/sprite-apps-large.css b/webroot/rsrc/css/sprite-apps-large.css deleted file mode 100644 index 613cb2677a..0000000000 --- a/webroot/rsrc/css/sprite-apps-large.css +++ /dev/null @@ -1,291 +0,0 @@ -/** - * @provides sprite-apps-large-css - * @generated - */ - -.sprite-apps-large { - background-image: url(/rsrc/image/sprite-apps-large.png); - background-repeat: no-repeat; -} - -@media -only screen and (min-device-pixel-ratio: 1.5), -only screen and (-webkit-min-device-pixel-ratio: 1.5) { - .sprite-apps-large { - background-image: url(/rsrc/image/sprite-apps-large-X2.png); - background-size: 232px 261px; - } -} - - -.apps-adventure-dark-large { - background-position: 0px 0px; -} - -.apps-aphlict-dark-large { - background-position: -29px 0px; -} - -.apps-application-dark-large { - background-position: -58px 0px; -} - -.apps-audit-dark-large { - background-position: -87px 0px; -} - -.apps-authentication-dark-large { - background-position: -116px 0px; -} - -.apps-calendar-dark-large { - background-position: -145px 0px; -} - -.apps-chatlog-dark-large { - background-position: -174px 0px; -} - -.apps-conduit-dark-large { - background-position: -203px 0px; -} - -.apps-conpherence-dark-large { - background-position: 0px -29px; -} - -.apps-countdown-dark-large { - background-position: -29px -29px; -} - -.apps-daemon-dark-large { - background-position: -58px -29px; -} - -.apps-differential-dark-large { - background-position: -87px -29px; -} - -.apps-diffusion-dark-large { - background-position: -116px -29px; -} - -.apps-diviner-dark-large { - background-position: -145px -29px; -} - -.apps-drydock-dark-large { - background-position: -174px -29px; -} - -.apps-fact-dark-large { - background-position: -203px -29px; -} - -.apps-fancyhome-dark-large { - background-position: 0px -58px; -} - -.apps-feed-dark-large { - background-position: -29px -58px; -} - -.apps-files-dark-large { - background-position: -58px -58px; -} - -.apps-flags-dark-large { - background-position: -87px -58px; -} - -.apps-harbormaster-dark-large { - background-position: -116px -58px; -} - -.apps-help-dark-large { - background-position: -145px -58px; -} - -.apps-herald-dark-large { - background-position: -174px -58px; -} - -.apps-home-dark-large { - background-position: -203px -58px; -} - -.apps-info-sm-dark-large { - background-position: 0px -87px; -} - -.apps-legalpad-dark-large { - background-position: -29px -87px; -} - -.apps-logo-dark-large { - background-position: -58px -87px; -} - -.apps-logout-sm-dark-large { - background-position: -87px -87px; -} - -.apps-macro-dark-large { - background-position: -116px -87px; -} - -.apps-mail-dark-large { - background-position: -145px -87px; -} - -.apps-maniphest-dark-large { - background-position: -174px -87px; -} - -.apps-metamta-dark-large { - background-position: -203px -87px; -} - -.apps-new-sm-dark-large { - background-position: 0px -116px; -} - -.apps-new-dark-large { - background-position: -29px -116px; -} - -.apps-nuance-dark-large { - background-position: -58px -116px; -} - -.apps-owners-dark-large { - background-position: -87px -116px; -} - -.apps-passphrase-dark-large { - background-position: -116px -116px; -} - -.apps-paste-dark-large { - background-position: -145px -116px; -} - -.apps-pebkac-dark-large { - background-position: -174px -116px; -} - -.apps-people-dark-large { - background-position: -203px -116px; -} - -.apps-phage-dark-large { - background-position: 0px -145px; -} - -.apps-phame-dark-large { - background-position: -29px -145px; -} - -.apps-phid-dark-large { - background-position: -58px -145px; -} - -.apps-phlux-dark-large { - background-position: -87px -145px; -} - -.apps-pholio-dark-large { - background-position: -116px -145px; -} - -.apps-phortune-dark-large { - background-position: -145px -145px; -} - -.apps-phpast-dark-large { - background-position: -174px -145px; -} - -.apps-phragment-dark-large { - background-position: -203px -145px; -} - -.apps-phrequent-dark-large { - background-position: 0px -174px; -} - -.apps-phriction-dark-large { - background-position: -29px -174px; -} - -.apps-phund-dark-large { - background-position: -58px -174px; -} - -.apps-policy-dark-large { - background-position: -87px -174px; -} - -.apps-ponder-dark-large { - background-position: -116px -174px; -} - -.apps-power-dark-large { - background-position: -145px -174px; -} - -.apps-projects-dark-large { - background-position: -174px -174px; -} - -.apps-releeph-dark-large { - background-position: -203px -174px; -} - -.apps-repositories-dark-large { - background-position: 0px -203px; -} - -.apps-search-dark-large { - background-position: -29px -203px; -} - -.apps-settings-sm-dark-large { - background-position: -58px -203px; -} - -.apps-settings-dark-large { - background-position: -87px -203px; -} - -.apps-setup-dark-large { - background-position: -116px -203px; -} - -.apps-slowvote-dark-large { - background-position: -145px -203px; -} - -.apps-spaces-dark-large { - background-position: -174px -203px; -} - -.apps-token-dark-large { - background-position: -203px -203px; -} - -.apps-uiexamples-dark-large { - background-position: 0px -232px; -} - -.apps-workboard-dark-large { - background-position: -29px -232px; -} - -.apps-workphlow-dark-large { - background-position: -58px -232px; -} - -.apps-xhprof-dark-large { - background-position: -87px -232px; -} diff --git a/webroot/rsrc/image/sprite-apps-large-X2.png b/webroot/rsrc/image/sprite-apps-large-X2.png deleted file mode 100644 index f10a9dc70d..0000000000 Binary files a/webroot/rsrc/image/sprite-apps-large-X2.png and /dev/null differ diff --git a/webroot/rsrc/image/sprite-apps-large.png b/webroot/rsrc/image/sprite-apps-large.png deleted file mode 100644 index ecd9b5df31..0000000000 Binary files a/webroot/rsrc/image/sprite-apps-large.png and /dev/null differ