diff --git a/resources/sprite/manifest/menu.json b/resources/sprite/manifest/menu.json index d3c28971f5..a1f2c3f173 100644 --- a/resources/sprite/manifest/menu.json +++ b/resources/sprite/manifest/menu.json @@ -34,7 +34,7 @@ "logo" : { "name" : "logo", "rule" : ".phabricator-main-menu-logo-image", - "hash" : "6803a4d19da5223b72d9f8f1aa65a60c" + "hash" : "5fdebd09065245b4cc7becb61961cf0c" }, "search" : { "name" : "search", diff --git a/resources/sprite/menu_1x/logo.png b/resources/sprite/menu_1x/logo.png index 535c7616d6..9d1b5ffe74 100644 Binary files a/resources/sprite/menu_1x/logo.png and b/resources/sprite/menu_1x/logo.png differ diff --git a/resources/sprite/menu_2x/logo.png b/resources/sprite/menu_2x/logo.png index 094e942718..9df5adefd5 100644 Binary files a/resources/sprite/menu_2x/logo.png and b/resources/sprite/menu_2x/logo.png differ diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index da3105fad8..cb7e2b27bc 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -667,15 +667,15 @@ celerity_register_resource_map(array( ), '/rsrc/image/sprite-menu-X2.png' => array( - 'hash' => '867092041ce0a62b7e50136213ca7be1', - 'uri' => '/res/86709204/rsrc/image/sprite-menu-X2.png', + 'hash' => 'db65a4440f9c8d5c301948fe2f29713a', + 'uri' => '/res/db65a444/rsrc/image/sprite-menu-X2.png', 'disk' => '/rsrc/image/sprite-menu-X2.png', 'type' => 'png', ), '/rsrc/image/sprite-menu.png' => array( - 'hash' => '21508eebdf582d7251d62bb2cd09f66d', - 'uri' => '/res/21508eeb/rsrc/image/sprite-menu.png', + 'hash' => '06f2600b7048923fe74d62637bae04fb', + 'uri' => '/res/06f2600b/rsrc/image/sprite-menu.png', 'disk' => '/rsrc/image/sprite-menu.png', 'type' => 'png', ), @@ -756,6 +756,13 @@ celerity_register_resource_map(array( 'disk' => '/rsrc/image/texture/panel-header-gradient.png', 'type' => 'png', ), + '/rsrc/image/texture/phlnx-bg.png' => + array( + 'hash' => 'a55a694da8b3874ca7a3105b7818f3a0', + 'uri' => '/res/a55a694d/rsrc/image/texture/phlnx-bg.png', + 'disk' => '/rsrc/image/texture/phlnx-bg.png', + 'type' => 'png', + ), '/rsrc/image/texture/pholio-background.gif' => array( 'hash' => 'cf4561af116edf393dc583e5119fb412', @@ -3287,7 +3294,7 @@ celerity_register_resource_map(array( ), 'phabricator-main-menu-view' => array( - 'uri' => '/res/c9685da2/rsrc/css/application/base/main-menu-view.css', + 'uri' => '/res/2f866333/rsrc/css/application/base/main-menu-view.css', 'type' => 'css', 'requires' => array( @@ -4118,7 +4125,7 @@ celerity_register_resource_map(array( ), 'sprite-menu-css' => array( - 'uri' => '/res/e4e428f9/rsrc/css/sprite-menu.css', + 'uri' => '/res/f3d0c58e/rsrc/css/sprite-menu.css', 'type' => 'css', 'requires' => array( @@ -4182,7 +4189,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '510eac0d' => + '942a4cf7' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -4230,7 +4237,7 @@ celerity_register_resource_map(array( 40 => 'phabricator-property-list-view-css', 41 => 'phabricator-tag-view-css', ), - 'uri' => '/res/pkg/510eac0d/core.pkg.css', + 'uri' => '/res/pkg/942a4cf7/core.pkg.css', 'type' => 'css', ), '75ccea43' => @@ -4424,16 +4431,16 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => 'adc3c36d', - 'aphront-dialog-view-css' => '510eac0d', - 'aphront-error-view-css' => '510eac0d', - 'aphront-form-view-css' => '510eac0d', - 'aphront-list-filter-view-css' => '510eac0d', - 'aphront-pager-view-css' => '510eac0d', - 'aphront-panel-view-css' => '510eac0d', - 'aphront-table-view-css' => '510eac0d', - 'aphront-tokenizer-control-css' => '510eac0d', - 'aphront-tooltip-css' => '510eac0d', - 'aphront-typeahead-control-css' => '510eac0d', + 'aphront-dialog-view-css' => '942a4cf7', + 'aphront-error-view-css' => '942a4cf7', + 'aphront-form-view-css' => '942a4cf7', + 'aphront-list-filter-view-css' => '942a4cf7', + 'aphront-pager-view-css' => '942a4cf7', + 'aphront-panel-view-css' => '942a4cf7', + 'aphront-table-view-css' => '942a4cf7', + 'aphront-tokenizer-control-css' => '942a4cf7', + 'aphront-tooltip-css' => '942a4cf7', + 'aphront-typeahead-control-css' => '942a4cf7', 'differential-changeset-view-css' => 'dd27a69b', 'differential-core-view-css' => 'dd27a69b', 'differential-inline-comment-editor' => 'bb59a901', @@ -4447,7 +4454,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => 'dd27a69b', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => '510eac0d', + 'global-drag-and-drop-css' => '942a4cf7', 'inline-comment-summary-css' => 'dd27a69b', 'javelin-aphlict' => '75ccea43', 'javelin-behavior' => 'a9f14d76', @@ -4521,55 +4528,55 @@ celerity_register_resource_map(array( 'javelin-util' => 'a9f14d76', 'javelin-vector' => 'a9f14d76', 'javelin-workflow' => 'a9f14d76', - 'lightbox-attachment-css' => '510eac0d', + 'lightbox-attachment-css' => '942a4cf7', 'maniphest-task-summary-css' => 'adc3c36d', 'maniphest-transaction-detail-css' => 'adc3c36d', - 'phabricator-action-list-view-css' => '510eac0d', - 'phabricator-application-launch-view-css' => '510eac0d', + 'phabricator-action-list-view-css' => '942a4cf7', + 'phabricator-application-launch-view-css' => '942a4cf7', 'phabricator-busy' => '75ccea43', 'phabricator-content-source-view-css' => 'dd27a69b', - 'phabricator-core-css' => '510eac0d', - 'phabricator-crumbs-view-css' => '510eac0d', + 'phabricator-core-css' => '942a4cf7', + 'phabricator-crumbs-view-css' => '942a4cf7', 'phabricator-drag-and-drop-file-upload' => 'bb59a901', 'phabricator-dropdown-menu' => '75ccea43', 'phabricator-file-upload' => '75ccea43', - 'phabricator-filetree-view-css' => '510eac0d', - 'phabricator-flag-css' => '510eac0d', - 'phabricator-form-view-css' => '510eac0d', - 'phabricator-header-view-css' => '510eac0d', + 'phabricator-filetree-view-css' => '942a4cf7', + 'phabricator-flag-css' => '942a4cf7', + 'phabricator-form-view-css' => '942a4cf7', + 'phabricator-header-view-css' => '942a4cf7', 'phabricator-hovercard' => '75ccea43', - 'phabricator-jump-nav' => '510eac0d', + 'phabricator-jump-nav' => '942a4cf7', 'phabricator-keyboard-shortcut' => '75ccea43', 'phabricator-keyboard-shortcut-manager' => '75ccea43', - 'phabricator-main-menu-view' => '510eac0d', + 'phabricator-main-menu-view' => '942a4cf7', 'phabricator-menu-item' => '75ccea43', - 'phabricator-nav-view-css' => '510eac0d', + 'phabricator-nav-view-css' => '942a4cf7', 'phabricator-notification' => '75ccea43', - 'phabricator-notification-css' => '510eac0d', - 'phabricator-notification-menu-css' => '510eac0d', - 'phabricator-object-item-list-view-css' => '510eac0d', + 'phabricator-notification-css' => '942a4cf7', + 'phabricator-notification-menu-css' => '942a4cf7', + 'phabricator-object-item-list-view-css' => '942a4cf7', 'phabricator-object-selector-css' => 'dd27a69b', 'phabricator-phtize' => '75ccea43', 'phabricator-prefab' => '75ccea43', 'phabricator-project-tag-css' => 'adc3c36d', - 'phabricator-property-list-view-css' => '510eac0d', - 'phabricator-remarkup-css' => '510eac0d', + 'phabricator-property-list-view-css' => '942a4cf7', + 'phabricator-remarkup-css' => '942a4cf7', 'phabricator-shaped-request' => 'bb59a901', - 'phabricator-side-menu-view-css' => '510eac0d', - 'phabricator-standard-page-view' => '510eac0d', - 'phabricator-tag-view-css' => '510eac0d', + 'phabricator-side-menu-view-css' => '942a4cf7', + 'phabricator-standard-page-view' => '942a4cf7', + 'phabricator-tag-view-css' => '942a4cf7', 'phabricator-textareautils' => '75ccea43', 'phabricator-tooltip' => '75ccea43', - 'phabricator-transaction-view-css' => '510eac0d', - 'phabricator-zindex-css' => '510eac0d', - 'phui-button-css' => '510eac0d', - 'phui-form-css' => '510eac0d', - 'phui-icon-view-css' => '510eac0d', - 'phui-spacing-css' => '510eac0d', - 'sprite-apps-large-css' => '510eac0d', - 'sprite-gradient-css' => '510eac0d', - 'sprite-icons-css' => '510eac0d', - 'sprite-menu-css' => '510eac0d', - 'syntax-highlighting-css' => '510eac0d', + 'phabricator-transaction-view-css' => '942a4cf7', + 'phabricator-zindex-css' => '942a4cf7', + 'phui-button-css' => '942a4cf7', + 'phui-form-css' => '942a4cf7', + 'phui-icon-view-css' => '942a4cf7', + 'phui-spacing-css' => '942a4cf7', + 'sprite-apps-large-css' => '942a4cf7', + 'sprite-gradient-css' => '942a4cf7', + 'sprite-icons-css' => '942a4cf7', + 'sprite-menu-css' => '942a4cf7', + 'syntax-highlighting-css' => '942a4cf7', ), )); diff --git a/src/infrastructure/celerity/CeleritySpriteGenerator.php b/src/infrastructure/celerity/CeleritySpriteGenerator.php index 1f26a857f1..26e7cd0b7d 100644 --- a/src/infrastructure/celerity/CeleritySpriteGenerator.php +++ b/src/infrastructure/celerity/CeleritySpriteGenerator.php @@ -248,8 +248,8 @@ final class CeleritySpriteGenerator { 'css' => '.menu-icon-app-blue', ), 'logo' => array( - 'x' => 139, - 'y' => 25, + 'x' => 149, + 'y' => 26, 'css' => '.phabricator-main-menu-logo-image', ), 'conf-off' => array( diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css index 72c3f3a976..33855cfc4e 100644 --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -12,7 +12,7 @@ .phabricator-main-menu { background: #2d3236; - background-image: url(/rsrc/image/main_texture.png); + background-image: url(/rsrc/image/texture/phlnx-bg.png); background-repeat: repeat-x; position: relative; box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.25); @@ -41,7 +41,7 @@ .phabricator-main-menu-logo { display: inline-block; - width: 139px; + width: 149px; height: 44px; float: left; margin-right: 6px; @@ -55,8 +55,8 @@ .phabricator-main-menu-logo-image { position: absolute; - width: 139px; - height: 25px; + width: 149px; + height: 26px; top: 9px; } @@ -108,7 +108,7 @@ } .phabricator-main-menu-search-container { - padding: 10px 0; + padding: 9px 0 10px 0; position: relative; height: 24px; margin: 0 8px; @@ -184,7 +184,7 @@ height: 20px; width: 20px; - top: 11px; + top: 10px; right: 6px; } @@ -242,7 +242,7 @@ background: rgba(0,0,0,.2); height: 20px; padding: 2px 10px 3px 8px; - margin-top: 9px; + margin-top: 10px; } .phabricator-main-menu-alert-icon, diff --git a/webroot/rsrc/css/sprite-menu.css b/webroot/rsrc/css/sprite-menu.css index 91583f8307..d0841ebfdc 100644 --- a/webroot/rsrc/css/sprite-menu.css +++ b/webroot/rsrc/css/sprite-menu.css @@ -13,7 +13,7 @@ only screen and (min-device-pixel-ratio: 1.5), only screen and (-webkit-min-device-pixel-ratio: 1.5) { .sprite-menu { background-image: url(/rsrc/image/sprite-menu-X2.png); - background-size: 140px 121px; + background-size: 150px 122px; } } @@ -31,7 +31,7 @@ only screen and (-webkit-min-device-pixel-ratio: 1.5) { } .phabricator-crumb-divider { - background-position: 0px -89px; + background-position: 0px -90px; } .menu-icon-search { @@ -43,11 +43,11 @@ only screen and (-webkit-min-device-pixel-ratio: 1.5) { } .menu-icon-app { - background-position: -10px -89px; + background-position: -10px -90px; } .menu-icon-app-blue { - background-position: -35px -89px; + background-position: -35px -90px; } .phabricator-main-menu-logo-image { diff --git a/webroot/rsrc/image/sprite-menu-X2.png b/webroot/rsrc/image/sprite-menu-X2.png index 097be135a6..878c0439b2 100644 Binary files a/webroot/rsrc/image/sprite-menu-X2.png and b/webroot/rsrc/image/sprite-menu-X2.png differ diff --git a/webroot/rsrc/image/sprite-menu.png b/webroot/rsrc/image/sprite-menu.png index 54df80ce5d..defe9770a1 100644 Binary files a/webroot/rsrc/image/sprite-menu.png and b/webroot/rsrc/image/sprite-menu.png differ diff --git a/webroot/rsrc/image/texture/phlnx-bg.png b/webroot/rsrc/image/texture/phlnx-bg.png new file mode 100644 index 0000000000..89ceb51fdf Binary files /dev/null and b/webroot/rsrc/image/texture/phlnx-bg.png differ