diff --git a/resources/sprite/actions_dark_1x/close.png b/resources/sprite/actions_dark_1x/close.png new file mode 100644 index 0000000000..65d8b1922c Binary files /dev/null and b/resources/sprite/actions_dark_1x/close.png differ diff --git a/resources/sprite/actions_dark_2x/close.png b/resources/sprite/actions_dark_2x/close.png new file mode 100644 index 0000000000..bca1a00508 Binary files /dev/null and b/resources/sprite/actions_dark_2x/close.png differ diff --git a/resources/sprite/actions_grey_1x/close.png b/resources/sprite/actions_grey_1x/close.png new file mode 100644 index 0000000000..d488e851e5 Binary files /dev/null and b/resources/sprite/actions_grey_1x/close.png differ diff --git a/resources/sprite/actions_grey_2x/close.png b/resources/sprite/actions_grey_2x/close.png new file mode 100644 index 0000000000..ca606f46a1 Binary files /dev/null and b/resources/sprite/actions_grey_2x/close.png differ diff --git a/resources/sprite/actions_white_1x/close.png b/resources/sprite/actions_white_1x/close.png new file mode 100644 index 0000000000..86c77e1ddc Binary files /dev/null and b/resources/sprite/actions_white_1x/close.png differ diff --git a/resources/sprite/actions_white_2x/close.png b/resources/sprite/actions_white_2x/close.png new file mode 100644 index 0000000000..e5cfd26f8c Binary files /dev/null and b/resources/sprite/actions_white_2x/close.png differ diff --git a/resources/sprite/manifest/actions.json b/resources/sprite/manifest/actions.json index 658ab9d611..75799137c5 100644 --- a/resources/sprite/manifest/actions.json +++ b/resources/sprite/manifest/actions.json @@ -1,6 +1,21 @@ { "version" : 1, "sprites" : { + "actions-close-dark" : { + "name" : "actions-close-dark", + "rule" : ".actions-close-dark, .device-desktop .actions-close-grey.phabricator-action-icon-item-link:hover", + "hash" : "f04c5692010a6d96b6fa83a26d73737e" + }, + "actions-close-grey" : { + "name" : "actions-close-grey", + "rule" : ".actions-close-grey", + "hash" : "22d7706066666cf0ba91f5ae4ef96f1f" + }, + "actions-close-white" : { + "name" : "actions-close-white", + "rule" : ".actions-close-white", + "hash" : "8d6ad8fc33b0e9471dc2c6d4de6e7341" + }, "actions-flag-dark" : { "name" : "actions-flag-dark", "rule" : ".actions-flag-dark, .device-desktop .actions-flag-grey.phabricator-action-icon-item-link:hover", diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 31946bdb69..cb0da5fe16 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -513,15 +513,15 @@ celerity_register_resource_map(array( ), '/rsrc/image/sprite-actions-X2.png' => array( - 'hash' => 'dee876887537d0f941f89ea41adf6631', - 'uri' => '/res/dee87688/rsrc/image/sprite-actions-X2.png', + 'hash' => '92a9013097669d06db2e48724e7acdb3', + 'uri' => '/res/92a90130/rsrc/image/sprite-actions-X2.png', 'disk' => '/rsrc/image/sprite-actions-X2.png', 'type' => 'png', ), '/rsrc/image/sprite-actions.png' => array( - 'hash' => '6b58724a27c34412edb421dc25b4b091', - 'uri' => '/res/6b58724a/rsrc/image/sprite-actions.png', + 'hash' => '1c4119f9e4d940d6881842a710de3839', + 'uri' => '/res/1c4119f9/rsrc/image/sprite-actions.png', 'disk' => '/rsrc/image/sprite-actions.png', 'type' => 'png', ), @@ -3639,6 +3639,33 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/application/ponder/vote.css', ), + 'raphael-core' => + array( + 'uri' => '/res/3f48575a/rsrc/js/raphael/raphael.js', + 'type' => 'js', + 'requires' => + array( + ), + 'disk' => '/rsrc/js/raphael/raphael.js', + ), + 'raphael-g' => + array( + 'uri' => '/res/b07e5245/rsrc/js/raphael/g.raphael.js', + 'type' => 'js', + 'requires' => + array( + ), + 'disk' => '/rsrc/js/raphael/g.raphael.js', + ), + 'raphael-g-line' => + array( + 'uri' => '/res/a59c8556/rsrc/js/raphael/g.raphael.line.js', + 'type' => 'js', + 'requires' => + array( + ), + 'disk' => '/rsrc/js/raphael/g.raphael.line.js', + ), 'releeph-branch' => array( 'uri' => '/res/6ad6420d/rsrc/css/application/releeph/releeph-branch.css', @@ -3740,7 +3767,7 @@ celerity_register_resource_map(array( ), 'sprite-actions-css' => array( - 'uri' => '/res/41ef6a23/rsrc/css/sprite-actions.css', + 'uri' => '/res/00b8f8bc/rsrc/css/sprite-actions.css', 'type' => 'css', 'requires' => array( @@ -3837,6 +3864,15 @@ celerity_register_resource_map(array( ), 'disk' => '/rsrc/css/sprite-tokens.css', ), + 'stripe-core' => + array( + 'uri' => '/res/3b0f0ad4/rsrc/js/stripe/stripe_core.js', + 'type' => 'js', + 'requires' => + array( + ), + 'disk' => '/rsrc/js/stripe/stripe_core.js', + ), 'stripe-payment-form-css' => array( 'uri' => '/res/634a6371/rsrc/css/application/phortune/stripe-payment-form.css', diff --git a/webroot/rsrc/css/sprite-actions.css b/webroot/rsrc/css/sprite-actions.css index 8663bdb25d..98ce7049bf 100644 --- a/webroot/rsrc/css/sprite-actions.css +++ b/webroot/rsrc/css/sprite-actions.css @@ -18,110 +18,122 @@ only screen and (-webkit-min-device-pixel-ratio: 1.5) { } -.actions-flag-dark, .device-desktop .actions-flag-grey.phabricator-action-icon-item-link:hover { +.actions-close-dark, .device-desktop .actions-close-grey.phabricator-action-icon-item-link:hover { background-position: 0px 0px; } -.actions-heart-dark, .device-desktop .actions-heart-grey.phabricator-action-icon-item-link:hover { +.actions-flag-dark, .device-desktop .actions-flag-grey.phabricator-action-icon-item-link:hover { background-position: -25px 0px; } -.actions-move-dark, .device-desktop .actions-move-grey.phabricator-action-icon-item-link:hover { +.actions-heart-dark, .device-desktop .actions-heart-grey.phabricator-action-icon-item-link:hover { background-position: -50px 0px; } -.actions-new-dark, .device-desktop .actions-new-grey.phabricator-action-icon-item-link:hover { +.actions-move-dark, .device-desktop .actions-move-grey.phabricator-action-icon-item-link:hover { background-position: -75px 0px; } -.actions-search-dark, .device-desktop .actions-search-grey.phabricator-action-icon-item-link:hover { +.actions-new-dark, .device-desktop .actions-new-grey.phabricator-action-icon-item-link:hover { background-position: -100px 0px; } -.actions-settings-dark, .device-desktop .actions-settings-grey.phabricator-action-icon-item-link:hover { +.actions-search-dark, .device-desktop .actions-search-grey.phabricator-action-icon-item-link:hover { background-position: 0px -25px; } -.actions-star-dark, .device-desktop .actions-star-grey.phabricator-action-icon-item-link:hover { +.actions-settings-dark, .device-desktop .actions-settings-grey.phabricator-action-icon-item-link:hover { background-position: -25px -25px; } -.actions-tag-dark, .device-desktop .actions-tag-grey.phabricator-action-icon-item-link:hover { +.actions-star-dark, .device-desktop .actions-star-grey.phabricator-action-icon-item-link:hover { background-position: -50px -25px; } -.actions-wrench-dark, .device-desktop .actions-wrench-grey.phabricator-action-icon-item-link:hover { +.actions-tag-dark, .device-desktop .actions-tag-grey.phabricator-action-icon-item-link:hover { background-position: -75px -25px; } -.actions-flag-grey { +.actions-wrench-dark, .device-desktop .actions-wrench-grey.phabricator-action-icon-item-link:hover { background-position: -100px -25px; } -.actions-heart-grey { +.actions-close-grey { background-position: 0px -50px; } -.actions-move-grey { +.actions-flag-grey { background-position: -25px -50px; } -.actions-new-grey { +.actions-heart-grey { background-position: -50px -50px; } -.actions-search-grey { +.actions-move-grey { background-position: -75px -50px; } -.actions-settings-grey { +.actions-new-grey { background-position: -100px -50px; } -.actions-star-grey { +.actions-search-grey { background-position: 0px -75px; } -.actions-tag-grey { +.actions-settings-grey { background-position: -25px -75px; } -.actions-wrench-grey { +.actions-star-grey { background-position: -50px -75px; } -.actions-flag-white { +.actions-tag-grey { background-position: -75px -75px; } -.actions-heart-white { +.actions-wrench-grey { background-position: -100px -75px; } -.actions-move-white { +.actions-close-white { background-position: 0px -100px; } -.actions-new-white { +.actions-flag-white { background-position: -25px -100px; } -.actions-search-white { +.actions-heart-white { background-position: -50px -100px; } -.actions-settings-white { +.actions-move-white { background-position: -75px -100px; } -.actions-star-white { +.actions-new-white { background-position: -100px -100px; } -.actions-tag-white { +.actions-search-white { background-position: 0px -125px; } -.actions-wrench-white { +.actions-settings-white { background-position: -25px -125px; } + +.actions-star-white { + background-position: -50px -125px; +} + +.actions-tag-white { + background-position: -75px -125px; +} + +.actions-wrench-white { + background-position: -100px -125px; +} diff --git a/webroot/rsrc/image/sprite-actions-X2.png b/webroot/rsrc/image/sprite-actions-X2.png index 472d387128..1df20a57ca 100644 Binary files a/webroot/rsrc/image/sprite-actions-X2.png and b/webroot/rsrc/image/sprite-actions-X2.png differ diff --git a/webroot/rsrc/image/sprite-actions.png b/webroot/rsrc/image/sprite-actions.png index 61ff1a96be..aefd59cd5a 100644 Binary files a/webroot/rsrc/image/sprite-actions.png and b/webroot/rsrc/image/sprite-actions.png differ