@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Clean up some more sprite stuff

Summary:
- Remove unused CSS rules and non-sprite images.
- Sprite the logo.

Test Plan: Looked at site, looked good.

Reviewers: chad

Reviewed By: chad

CC: aran

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

+84 -105
+5
resources/sprite/manifest/menu.json
··· 21 21 "rule" : ".menu-icon-eye", 22 22 "hash" : "d598b1acb1933a86eaed3dea3347f7b0" 23 23 }, 24 + "logo" : { 25 + "name" : "logo", 26 + "rule" : ".phabricator-main-menu-logo-image", 27 + "hash" : "c6c7ab165dce13a51ef329928c7c4aba" 28 + }, 24 29 "round_bubble" : { 25 30 "name" : "round_bubble", 26 31 "rule" : ".phabricator-main-menu-alert-bubble",
resources/sprite/menu_1x/logo.png

This is a binary file and will not be displayed.

resources/sprite/menu_2x/logo.png

This is a binary file and will not be displayed.

+47 -82
src/__celerity_resource_map__.php
··· 7 7 */ 8 8 9 9 celerity_register_resource_map(array( 10 - '/rsrc/image/2x/header_logo.png' => 11 - array( 12 - 'hash' => '89ac510efefeffb048a3d7e85161b7b6', 13 - 'uri' => '/res/89ac510e/rsrc/image/2x/header_logo.png', 14 - 'disk' => '/rsrc/image/2x/header_logo.png', 15 - 'type' => 'png', 16 - ), 17 10 '/rsrc/image/apps.png' => 18 11 array( 19 12 'hash' => 'f7cb4abeb73245fea4098a02fd784653', ··· 56 49 'disk' => '/rsrc/image/avatar.png', 57 50 'type' => 'png', 58 51 ), 59 - '/rsrc/image/button_apps.png' => 60 - array( 61 - 'hash' => 'cc29f793afd01b15af613562225118f3', 62 - 'uri' => '/res/cc29f793/rsrc/image/button_apps.png', 63 - 'disk' => '/rsrc/image/button_apps.png', 64 - 'type' => 'png', 65 - ), 66 - '/rsrc/image/button_menu.png' => 67 - array( 68 - 'hash' => '5742857c7734d9d25be1125f5737fe0e', 69 - 'uri' => '/res/5742857c/rsrc/image/button_menu.png', 70 - 'disk' => '/rsrc/image/button_menu.png', 71 - 'type' => 'png', 72 - ), 73 52 '/rsrc/image/checker_dark.png' => 74 53 array( 75 54 'hash' => '640f795343df76ebe5409aae6187e57f', ··· 103 82 'hash' => 'a8945e12ceeaddd5b491a8d81cfa19c1', 104 83 'uri' => '/res/a8945e12/rsrc/image/grippy_texture.png', 105 84 'disk' => '/rsrc/image/grippy_texture.png', 106 - 'type' => 'png', 107 - ), 108 - '/rsrc/image/header_logo.png' => 109 - array( 110 - 'hash' => '96a289484c7a0e2bf1553e422f4d33bd', 111 - 'uri' => '/res/96a28948/rsrc/image/header_logo.png', 112 - 'disk' => '/rsrc/image/header_logo.png', 113 85 'type' => 'png', 114 86 ), 115 87 '/rsrc/image/icon/fatcow/arrow_branch.png' => ··· 469 441 'disk' => '/rsrc/image/icon/unsubscribe.png', 470 442 'type' => 'png', 471 443 ), 472 - '/rsrc/image/lines.png' => 473 - array( 474 - 'hash' => '0eb5778b34dd4fcee53b9924b88e0828', 475 - 'uri' => '/res/0eb5778b/rsrc/image/lines.png', 476 - 'disk' => '/rsrc/image/lines.png', 477 - 'type' => 'png', 478 - ), 479 444 '/rsrc/image/loading.gif' => 480 445 array( 481 446 'hash' => '664297671941142f37d8c89e717ff2ce', ··· 569 534 ), 570 535 '/rsrc/image/sprite-menu-X2.png' => 571 536 array( 572 - 'hash' => '5d0b746c644d491e45a37583abca6e5d', 573 - 'uri' => '/res/5d0b746c/rsrc/image/sprite-menu-X2.png', 537 + 'hash' => '11017d94e949aa169361b966716e8729', 538 + 'uri' => '/res/11017d94/rsrc/image/sprite-menu-X2.png', 574 539 'disk' => '/rsrc/image/sprite-menu-X2.png', 575 540 'type' => 'png', 576 541 ), 577 542 '/rsrc/image/sprite-menu.png' => 578 543 array( 579 - 'hash' => '6b4631ed124f1e7d470330a4c11b34cb', 580 - 'uri' => '/res/6b4631ed/rsrc/image/sprite-menu.png', 544 + 'hash' => 'ba0f7d61f49ea50e9c3ff93b160e14c5', 545 + 'uri' => '/res/ba0f7d61/rsrc/image/sprite-menu.png', 581 546 'disk' => '/rsrc/image/sprite-menu.png', 582 547 'type' => 'png', 583 548 ), ··· 2481 2446 ), 2482 2447 'phabricator-crumbs-view-css' => 2483 2448 array( 2484 - 'uri' => '/res/6b672934/rsrc/css/layout/phabricator-crumbs-view.css', 2449 + 'uri' => '/res/4bd2376f/rsrc/css/layout/phabricator-crumbs-view.css', 2485 2450 'type' => 'css', 2486 2451 'requires' => 2487 2452 array( ··· 2621 2586 ), 2622 2587 'phabricator-main-menu-view' => 2623 2588 array( 2624 - 'uri' => '/res/f322cd13/rsrc/css/application/base/main-menu-view.css', 2589 + 'uri' => '/res/c0631d5f/rsrc/css/application/base/main-menu-view.css', 2625 2590 'type' => 'css', 2626 2591 'requires' => 2627 2592 array( ··· 3190 3155 ), 3191 3156 'sprite-menu-css' => 3192 3157 array( 3193 - 'uri' => '/res/c73eac19/rsrc/css/sprite-menu.css', 3158 + 'uri' => '/res/3d9f75af/rsrc/css/sprite-menu.css', 3194 3159 'type' => 'css', 3195 3160 'requires' => 3196 3161 array( ··· 3227 3192 ), array( 3228 3193 'packages' => 3229 3194 array( 3230 - 'e546f70c' => 3195 + '668bdb91' => 3231 3196 array( 3232 3197 'name' => 'core.pkg.css', 3233 3198 'symbols' => ··· 3271 3236 36 => 'phabricator-crumbs-view-css', 3272 3237 37 => 'phabricator-object-item-list-view-css', 3273 3238 ), 3274 - 'uri' => '/res/pkg/e546f70c/core.pkg.css', 3239 + 'uri' => '/res/pkg/668bdb91/core.pkg.css', 3275 3240 'type' => 'css', 3276 3241 ), 3277 3242 '5673560d' => ··· 3459 3424 'reverse' => 3460 3425 array( 3461 3426 'aphront-attached-file-view-css' => '7839ae2d', 3462 - 'aphront-crumbs-view-css' => 'e546f70c', 3463 - 'aphront-dialog-view-css' => 'e546f70c', 3464 - 'aphront-error-view-css' => 'e546f70c', 3465 - 'aphront-form-view-css' => 'e546f70c', 3427 + 'aphront-crumbs-view-css' => '668bdb91', 3428 + 'aphront-dialog-view-css' => '668bdb91', 3429 + 'aphront-error-view-css' => '668bdb91', 3430 + 'aphront-form-view-css' => '668bdb91', 3466 3431 'aphront-headsup-action-list-view-css' => 'c904bbee', 3467 - 'aphront-headsup-view-css' => 'e546f70c', 3468 - 'aphront-list-filter-view-css' => 'e546f70c', 3469 - 'aphront-pager-view-css' => 'e546f70c', 3470 - 'aphront-panel-view-css' => 'e546f70c', 3471 - 'aphront-side-nav-view-css' => 'e546f70c', 3472 - 'aphront-table-view-css' => 'e546f70c', 3473 - 'aphront-tokenizer-control-css' => 'e546f70c', 3474 - 'aphront-tooltip-css' => 'e546f70c', 3475 - 'aphront-typeahead-control-css' => 'e546f70c', 3432 + 'aphront-headsup-view-css' => '668bdb91', 3433 + 'aphront-list-filter-view-css' => '668bdb91', 3434 + 'aphront-pager-view-css' => '668bdb91', 3435 + 'aphront-panel-view-css' => '668bdb91', 3436 + 'aphront-side-nav-view-css' => '668bdb91', 3437 + 'aphront-table-view-css' => '668bdb91', 3438 + 'aphront-tokenizer-control-css' => '668bdb91', 3439 + 'aphront-tooltip-css' => '668bdb91', 3440 + 'aphront-typeahead-control-css' => '668bdb91', 3476 3441 'differential-changeset-view-css' => 'c904bbee', 3477 3442 'differential-core-view-css' => 'c904bbee', 3478 3443 'differential-inline-comment-editor' => '7ecd31fa', ··· 3553 3518 'javelin-util' => 'db6d724d', 3554 3519 'javelin-vector' => 'db6d724d', 3555 3520 'javelin-workflow' => 'db6d724d', 3556 - 'lightbox-attachment-css' => 'e546f70c', 3521 + 'lightbox-attachment-css' => '668bdb91', 3557 3522 'maniphest-task-summary-css' => '7839ae2d', 3558 3523 'maniphest-transaction-detail-css' => '7839ae2d', 3559 - 'phabricator-app-buttons-css' => 'e546f70c', 3524 + 'phabricator-app-buttons-css' => '668bdb91', 3560 3525 'phabricator-busy' => '5673560d', 3561 3526 'phabricator-content-source-view-css' => 'c904bbee', 3562 - 'phabricator-core-buttons-css' => 'e546f70c', 3563 - 'phabricator-core-css' => 'e546f70c', 3564 - 'phabricator-crumbs-view-css' => 'e546f70c', 3565 - 'phabricator-directory-css' => 'e546f70c', 3527 + 'phabricator-core-buttons-css' => '668bdb91', 3528 + 'phabricator-core-css' => '668bdb91', 3529 + 'phabricator-crumbs-view-css' => '668bdb91', 3530 + 'phabricator-directory-css' => '668bdb91', 3566 3531 'phabricator-drag-and-drop-file-upload' => '7ecd31fa', 3567 3532 'phabricator-dropdown-menu' => '5673560d', 3568 3533 'phabricator-file-upload' => '5673560d', 3569 - 'phabricator-filetree-view-css' => 'e546f70c', 3570 - 'phabricator-flag-css' => 'e546f70c', 3571 - 'phabricator-form-view-css' => 'e546f70c', 3572 - 'phabricator-header-view-css' => 'e546f70c', 3573 - 'phabricator-jump-nav' => 'e546f70c', 3534 + 'phabricator-filetree-view-css' => '668bdb91', 3535 + 'phabricator-flag-css' => '668bdb91', 3536 + 'phabricator-form-view-css' => '668bdb91', 3537 + 'phabricator-header-view-css' => '668bdb91', 3538 + 'phabricator-jump-nav' => '668bdb91', 3574 3539 'phabricator-keyboard-shortcut' => '5673560d', 3575 3540 'phabricator-keyboard-shortcut-manager' => '5673560d', 3576 - 'phabricator-main-menu-view' => 'e546f70c', 3541 + 'phabricator-main-menu-view' => '668bdb91', 3577 3542 'phabricator-menu-item' => '5673560d', 3578 - 'phabricator-nav-view-css' => 'e546f70c', 3543 + 'phabricator-nav-view-css' => '668bdb91', 3579 3544 'phabricator-notification' => '5673560d', 3580 - 'phabricator-notification-css' => 'e546f70c', 3581 - 'phabricator-notification-menu-css' => 'e546f70c', 3582 - 'phabricator-object-item-list-view-css' => 'e546f70c', 3545 + 'phabricator-notification-css' => '668bdb91', 3546 + 'phabricator-notification-menu-css' => '668bdb91', 3547 + 'phabricator-object-item-list-view-css' => '668bdb91', 3583 3548 'phabricator-object-selector-css' => 'c904bbee', 3584 3549 'phabricator-paste-file-upload' => '5673560d', 3585 3550 'phabricator-prefab' => '5673560d', 3586 3551 'phabricator-project-tag-css' => '7839ae2d', 3587 - 'phabricator-remarkup-css' => 'e546f70c', 3552 + 'phabricator-remarkup-css' => '668bdb91', 3588 3553 'phabricator-shaped-request' => '7ecd31fa', 3589 - 'phabricator-side-menu-view-css' => 'e546f70c', 3590 - 'phabricator-standard-page-view' => 'e546f70c', 3554 + 'phabricator-side-menu-view-css' => '668bdb91', 3555 + 'phabricator-standard-page-view' => '668bdb91', 3591 3556 'phabricator-textareautils' => '5673560d', 3592 3557 'phabricator-tooltip' => '5673560d', 3593 - 'phabricator-transaction-view-css' => 'e546f70c', 3594 - 'sprite-apps-large-css' => 'e546f70c', 3595 - 'sprite-gradient-css' => 'e546f70c', 3596 - 'sprite-icon-css' => 'e546f70c', 3597 - 'sprite-menu-css' => 'e546f70c', 3598 - 'syntax-highlighting-css' => 'e546f70c', 3558 + 'phabricator-transaction-view-css' => '668bdb91', 3559 + 'sprite-apps-large-css' => '668bdb91', 3560 + 'sprite-gradient-css' => '668bdb91', 3561 + 'sprite-icon-css' => '668bdb91', 3562 + 'sprite-menu-css' => '668bdb91', 3563 + 'syntax-highlighting-css' => '668bdb91', 3599 3564 ), 3600 3565 ));
+5
src/infrastructure/celerity/CeleritySpriteGenerator.php
··· 123 123 'y' => 20, 124 124 'css' => '.menu-icon-app', 125 125 ), 126 + 'logo' => array( 127 + 'x' => 139, 128 + 'y' => 25, 129 + 'css' => '.phabricator-main-menu-logo-image', 130 + ), 126 131 ); 127 132 128 133 $scales = array(
+6 -1
src/view/page/menu/PhabricatorMainMenuView.php
··· 288 288 'class' => 'phabricator-main-menu-logo', 289 289 'href' => '/', 290 290 ), 291 - ''); 291 + phutil_render_tag( 292 + 'span', 293 + array( 294 + 'class' => 'sprite-menu phabricator-main-menu-logo-image', 295 + ), 296 + '')); 292 297 } 293 298 294 299 private function renderNotificationMenu() {
+10 -2
webroot/rsrc/css/application/base/main-menu-view.css
··· 42 42 43 43 .phabricator-main-menu-logo { 44 44 display: inline-block; 45 + position: relative; 45 46 height: 44px; 46 - width: 170px; 47 + width: 139px; 47 48 margin-right: 12px; 48 - background: 6px 9px url(/rsrc/image/header_logo.png) no-repeat; 49 + margin-left: 6px; 50 + } 51 + 52 + .phabricator-main-menu-logo-image { 53 + position: absolute; 54 + width: 139px; 55 + height: 25px; 56 + top: 9px; 49 57 } 50 58 51 59 .device .phabricator-main-menu-logo {
-13
webroot/rsrc/css/layout/phabricator-crumbs-view.css
··· 69 69 vertical-align: top; 70 70 margin: 0 9px; 71 71 } 72 - 73 - .temporary-icon-apps { 74 - background-image: url(/rsrc/image/button_apps.png); 75 - background-position: center center; 76 - background-repeat: no-repeat; 77 - } 78 - 79 - .temporary-icon-list { 80 - background-image: url(/rsrc/image/button_menu.png); 81 - background-position: center center; 82 - background-repeat: no-repeat; 83 - background-size: 24px 15px; 84 - }
+11 -7
webroot/rsrc/css/sprite-menu.css
··· 13 13 only screen and (-webkit-min-device-pixel-ratio: 1.5) { 14 14 .sprite-menu { 15 15 background-image: url(/rsrc/image/sprite-menu-X2.png); 16 - background-size: 72px 101px; 16 + background-size: 140px 127px; 17 17 } 18 18 } 19 19 20 20 21 21 .phabricator-main-menu-alert-bubble { 22 - background-position: 0px -42px; 22 + background-position: 0px -68px; 23 23 } 24 24 25 25 .phabricator-main-menu-alert-bubble.alert-unread { 26 - background-position: 0px -15px; 26 + background-position: 0px -41px; 27 27 } 28 28 29 29 .alert-notifications .phabricator-main-menu-alert-icon { ··· 35 35 } 36 36 37 37 .alert-notifications.alert-unread .phabricator-main-menu-alert-icon { 38 - background-position: -27px -42px; 38 + background-position: -27px -68px; 39 39 } 40 40 41 41 .phabricator-crumb-divider { 42 - background-position: 0px -69px; 42 + background-position: 0px -95px; 43 43 } 44 44 45 45 .menu-icon-eye { 46 - background-position: -47px -15px; 46 + background-position: -47px -41px; 47 47 } 48 48 49 49 .menu-icon-app { 50 - background-position: -42px -42px; 50 + background-position: -42px -68px; 51 + } 52 + 53 + .phabricator-main-menu-logo-image { 54 + background-position: 0px -15px; 51 55 }
webroot/rsrc/image/2x/header_logo.png

This is a binary file and will not be displayed.

webroot/rsrc/image/button_apps.png

This is a binary file and will not be displayed.

webroot/rsrc/image/button_menu.png

This is a binary file and will not be displayed.

webroot/rsrc/image/header_logo.png

This is a binary file and will not be displayed.

webroot/rsrc/image/lines.png

This is a binary file and will not be displayed.

webroot/rsrc/image/sprite-menu-X2.png

This is a binary file and will not be displayed.

webroot/rsrc/image/sprite-menu.png

This is a binary file and will not be displayed.