diff --git a/resources/sprite/manifest/icon.json b/resources/sprite/manifest/icon.json index 9631e5028f..6352e4ada4 100644 --- a/resources/sprite/manifest/icon.json +++ b/resources/sprite/manifest/icon.json @@ -658,7 +658,7 @@ }, "action-new-white" : { "name" : "action-new-white", - "rule" : ".action-new-white, .device-desktop .phabricator-action-view:hover .action-new", + "rule" : ".action-new-white, .device-desktop .phabricator-action-view:hover .action-new, .phabricator-application-launch-create:hover .phabricator-application-create-icon.action-new-grey", "hash" : "99a86e78d0f9bd775e283484b2bba989" }, "action-none" : { diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 6c3cb156f1..8380bd004c 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -2534,7 +2534,7 @@ celerity_register_resource_map(array( ), 'phabricator-filetree-view-css' => array( - 'uri' => '/res/a81fc32b/rsrc/css/layout/phabricator-filetree-view.css', + 'uri' => '/res/c912ed91/rsrc/css/layout/phabricator-filetree-view.css', 'type' => 'css', 'requires' => array( @@ -3183,7 +3183,7 @@ celerity_register_resource_map(array( ), 'sprite-gradient-css' => array( - 'uri' => '/res/947de83c/rsrc/css/sprite-gradient.css', + 'uri' => '/res/e62e7a0f/rsrc/css/sprite-gradient.css', 'type' => 'css', 'requires' => array( @@ -3192,7 +3192,7 @@ celerity_register_resource_map(array( ), 'sprite-icon-css' => array( - 'uri' => '/res/ff841245/rsrc/css/sprite-icon.css', + 'uri' => '/res/698745d1/rsrc/css/sprite-icon.css', 'type' => 'css', 'requires' => array( @@ -3238,7 +3238,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - 'f95d7445' => + 57036208 => array( 'name' => 'core.pkg.css', 'symbols' => @@ -3282,7 +3282,7 @@ celerity_register_resource_map(array( 36 => 'phabricator-object-item-list-view-css', 37 => 'global-drag-and-drop-css', ), - 'uri' => '/res/pkg/f95d7445/core.pkg.css', + 'uri' => '/res/pkg/57036208/core.pkg.css', 'type' => 'css', ), 'c90b892e' => @@ -3472,19 +3472,19 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => '83f07678', - 'aphront-crumbs-view-css' => 'f95d7445', - 'aphront-dialog-view-css' => 'f95d7445', - 'aphront-error-view-css' => 'f95d7445', - 'aphront-form-view-css' => 'f95d7445', + 'aphront-crumbs-view-css' => '57036208', + 'aphront-dialog-view-css' => '57036208', + 'aphront-error-view-css' => '57036208', + 'aphront-form-view-css' => '57036208', 'aphront-headsup-action-list-view-css' => 'ec01d039', - 'aphront-headsup-view-css' => 'f95d7445', - 'aphront-list-filter-view-css' => 'f95d7445', - 'aphront-pager-view-css' => 'f95d7445', - 'aphront-panel-view-css' => 'f95d7445', - 'aphront-table-view-css' => 'f95d7445', - 'aphront-tokenizer-control-css' => 'f95d7445', - 'aphront-tooltip-css' => 'f95d7445', - 'aphront-typeahead-control-css' => 'f95d7445', + 'aphront-headsup-view-css' => '57036208', + 'aphront-list-filter-view-css' => '57036208', + 'aphront-pager-view-css' => '57036208', + 'aphront-panel-view-css' => '57036208', + 'aphront-table-view-css' => '57036208', + 'aphront-tokenizer-control-css' => '57036208', + 'aphront-tooltip-css' => '57036208', + 'aphront-typeahead-control-css' => '57036208', 'differential-changeset-view-css' => 'ec01d039', 'differential-core-view-css' => 'ec01d039', 'differential-inline-comment-editor' => 'ac53d36a', @@ -3498,7 +3498,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => 'ec01d039', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => 'f95d7445', + 'global-drag-and-drop-css' => '57036208', 'inline-comment-summary-css' => 'ec01d039', 'javelin-aphlict' => 'c90b892e', 'javelin-behavior' => 'fbeded59', @@ -3568,48 +3568,48 @@ celerity_register_resource_map(array( 'javelin-util' => 'fbeded59', 'javelin-vector' => 'fbeded59', 'javelin-workflow' => 'fbeded59', - 'lightbox-attachment-css' => 'f95d7445', + 'lightbox-attachment-css' => '57036208', 'maniphest-task-summary-css' => '83f07678', 'maniphest-transaction-detail-css' => '83f07678', 'phabricator-busy' => 'c90b892e', 'phabricator-content-source-view-css' => 'ec01d039', - 'phabricator-core-buttons-css' => 'f95d7445', - 'phabricator-core-css' => 'f95d7445', - 'phabricator-crumbs-view-css' => 'f95d7445', - 'phabricator-directory-css' => 'f95d7445', + 'phabricator-core-buttons-css' => '57036208', + 'phabricator-core-css' => '57036208', + 'phabricator-crumbs-view-css' => '57036208', + 'phabricator-directory-css' => '57036208', 'phabricator-drag-and-drop-file-upload' => 'ac53d36a', 'phabricator-dropdown-menu' => 'c90b892e', 'phabricator-file-upload' => 'c90b892e', - 'phabricator-filetree-view-css' => 'f95d7445', - 'phabricator-flag-css' => 'f95d7445', - 'phabricator-form-view-css' => 'f95d7445', - 'phabricator-header-view-css' => 'f95d7445', - 'phabricator-jump-nav' => 'f95d7445', + 'phabricator-filetree-view-css' => '57036208', + 'phabricator-flag-css' => '57036208', + 'phabricator-form-view-css' => '57036208', + 'phabricator-header-view-css' => '57036208', + 'phabricator-jump-nav' => '57036208', 'phabricator-keyboard-shortcut' => 'c90b892e', 'phabricator-keyboard-shortcut-manager' => 'c90b892e', - 'phabricator-main-menu-view' => 'f95d7445', + 'phabricator-main-menu-view' => '57036208', 'phabricator-menu-item' => 'c90b892e', - 'phabricator-nav-view-css' => 'f95d7445', + 'phabricator-nav-view-css' => '57036208', 'phabricator-notification' => 'c90b892e', - 'phabricator-notification-css' => 'f95d7445', - 'phabricator-notification-menu-css' => 'f95d7445', - 'phabricator-object-item-list-view-css' => 'f95d7445', + 'phabricator-notification-css' => '57036208', + 'phabricator-notification-menu-css' => '57036208', + 'phabricator-object-item-list-view-css' => '57036208', 'phabricator-object-selector-css' => 'ec01d039', 'phabricator-paste-file-upload' => 'c90b892e', 'phabricator-prefab' => 'c90b892e', 'phabricator-project-tag-css' => '83f07678', - 'phabricator-remarkup-css' => 'f95d7445', + 'phabricator-remarkup-css' => '57036208', 'phabricator-shaped-request' => 'ac53d36a', - 'phabricator-side-menu-view-css' => 'f95d7445', - 'phabricator-standard-page-view' => 'f95d7445', + 'phabricator-side-menu-view-css' => '57036208', + 'phabricator-standard-page-view' => '57036208', 'phabricator-textareautils' => 'c90b892e', 'phabricator-tooltip' => 'c90b892e', - 'phabricator-transaction-view-css' => 'f95d7445', - 'phabricator-zindex-css' => 'f95d7445', - 'sprite-apps-large-css' => 'f95d7445', - 'sprite-gradient-css' => 'f95d7445', - 'sprite-icon-css' => 'f95d7445', - 'sprite-menu-css' => 'f95d7445', - 'syntax-highlighting-css' => 'f95d7445', + 'phabricator-transaction-view-css' => '57036208', + 'phabricator-zindex-css' => '57036208', + 'sprite-apps-large-css' => '57036208', + 'sprite-gradient-css' => '57036208', + 'sprite-icon-css' => '57036208', + 'sprite-menu-css' => '57036208', + 'syntax-highlighting-css' => '57036208', ), )); diff --git a/src/infrastructure/celerity/CeleritySpriteGenerator.php b/src/infrastructure/celerity/CeleritySpriteGenerator.php index b9faed446d..deaffac9c7 100644 --- a/src/infrastructure/celerity/CeleritySpriteGenerator.php +++ b/src/infrastructure/celerity/CeleritySpriteGenerator.php @@ -35,14 +35,20 @@ final class CeleritySpriteGenerator { $sprite = id(clone $template) ->setName('action-'.$icon.$suffix); + $tcss = array(); + $tcss[] = '.action-'.$icon.$suffix; if ($color == 'white') { - $sprite->setTargetCSS( - '.action-'.$icon.$suffix.', '. - '.device-desktop .phabricator-action-view:hover .action-'.$icon); - } else { - $sprite->setTargetCSS('.action-'.$icon.$suffix); + $tcss[] = '.device-desktop .phabricator-action-view:hover '. + '.action-'.$icon; + if ($icon == 'new') { + // Hover state for the "+" icons on homepage tiles. + $tcss[] = '.phabricator-application-launch-create:hover '. + '.phabricator-application-create-icon.action-new-grey'; + } } + $sprite->setTargetCSS(implode(', ', $tcss)); + foreach ($scales as $scale_key => $scale) { $path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png'); $sprite->setSourceFile($path, $scale); diff --git a/webroot/rsrc/css/sprite-icon.css b/webroot/rsrc/css/sprite-icon.css index 96fe262d62..a96f31ef7e 100644 --- a/webroot/rsrc/css/sprite-icon.css +++ b/webroot/rsrc/css/sprite-icon.css @@ -694,7 +694,7 @@ only screen and (-webkit-min-device-pixel-ratio: 1.5) { background-position: 0px -180px; } -.action-new-white, .device-desktop .phabricator-action-view:hover .action-new { +.action-new-white, .device-desktop .phabricator-action-view:hover .action-new, .phabricator-application-launch-create:hover .phabricator-application-create-icon.action-new-grey { background-position: -15px -180px; }