Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15389502
D11025.id26473.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
12 KB
Referenced Files
None
Subscribers
None
D11025.id26473.diff
View Options
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => '08541675',
+ 'core.pkg.css' => '679c69f6',
'core.pkg.js' => 'bc72b978',
'darkconsole.pkg.js' => 'df001cab',
'differential.pkg.css' => '8af45893',
@@ -130,7 +130,7 @@
'rsrc/css/phui/phui-form-view.css' => 'aad06f2a',
'rsrc/css/phui/phui-form.css' => 'b78ec020',
'rsrc/css/phui/phui-header-view.css' => '39594ac0',
- 'rsrc/css/phui/phui-icon.css' => 'b4963a4f',
+ 'rsrc/css/phui/phui-icon.css' => 'a013a63d',
'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
'rsrc/css/phui/phui-list.css' => '43ed2d93',
@@ -153,7 +153,6 @@
'rsrc/css/sprite-login.css' => 'a355d921',
'rsrc/css/sprite-main-header.css' => '92720ee2',
'rsrc/css/sprite-menu.css' => '0ca5a908',
- 'rsrc/css/sprite-payments.css' => 'cc085d44',
'rsrc/css/sprite-projects.css' => '7578fa56',
'rsrc/css/sprite-tokens.css' => '1706b943',
'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '579d3140',
@@ -322,8 +321,6 @@
'rsrc/image/sprite-apps-large.png' => '4d41b94a',
'rsrc/image/sprite-apps-xlarge.png' => 'a751a580',
'rsrc/image/sprite-apps.png' => '5570df20',
- 'rsrc/image/sprite-conpherence-X2.png' => 'cd2d08d7',
- 'rsrc/image/sprite-conpherence.png' => 'a5ab2eb7',
'rsrc/image/sprite-docs-X2.png' => '6dc1adad',
'rsrc/image/sprite-docs.png' => '4636297f',
'rsrc/image/sprite-gradient.png' => 'ec15a417',
@@ -332,7 +329,6 @@
'rsrc/image/sprite-main-header.png' => '83521873',
'rsrc/image/sprite-menu-X2.png' => '89ae35f1',
'rsrc/image/sprite-menu.png' => 'b912a047',
- 'rsrc/image/sprite-payments.png' => 'd8576309',
'rsrc/image/sprite-projects-X2.png' => '218fdc8b',
'rsrc/image/sprite-projects.png' => '631ff9a7',
'rsrc/image/sprite-tokens-X2.png' => 'b4776580',
@@ -779,7 +775,7 @@
'phui-form-css' => 'b78ec020',
'phui-form-view-css' => 'aad06f2a',
'phui-header-view-css' => '39594ac0',
- 'phui-icon-view-css' => 'b4963a4f',
+ 'phui-icon-view-css' => 'a013a63d',
'phui-image-mask-css' => '5a8b09c8',
'phui-info-panel-css' => '27ea50a1',
'phui-list-view-css' => '43ed2d93',
@@ -821,7 +817,6 @@
'sprite-login-css' => 'a355d921',
'sprite-main-header-css' => '92720ee2',
'sprite-menu-css' => '0ca5a908',
- 'sprite-payments-css' => 'cc085d44',
'sprite-projects-css' => '7578fa56',
'sprite-tokens-css' => '1706b943',
'syntax-highlighting-css' => '56c1ba38',
diff --git a/resources/sprite/manifest/payments.json b/resources/sprite/manifest/payments.json
deleted file mode 100644
--- a/resources/sprite/manifest/payments.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "version" : 1,
- "sprites" : {
- "payments-americanexpress" : {
- "name" : "payments-americanexpress",
- "rule" : ".payments-americanexpress",
- "hash" : "e0e61821824d30679d0938a8b8b997ca"
- },
- "payments-discover" : {
- "name" : "payments-discover",
- "rule" : ".payments-discover",
- "hash" : "64553bcdfde3b182949c9305ee4dda94"
- },
- "payments-googlecheckout" : {
- "name" : "payments-googlecheckout",
- "rule" : ".payments-googlecheckout",
- "hash" : "4cbbb6450489adbb91eca0e3573df03e"
- },
- "payments-mastercard" : {
- "name" : "payments-mastercard",
- "rule" : ".payments-mastercard",
- "hash" : "cbe041c4467075e439b529e582e2ec6a"
- },
- "payments-paypal" : {
- "name" : "payments-paypal",
- "rule" : ".payments-paypal",
- "hash" : "6fd9c4b1aba0d7bf25b1888b5524dd33"
- },
- "payments-visa" : {
- "name" : "payments-visa",
- "rule" : ".payments-visa",
- "hash" : "517115136f37bd5647a502f7130bd63a"
- },
- "payments-worldpay" : {
- "name" : "payments-worldpay",
- "rule" : ".payments-worldpay",
- "hash" : "f93c40f9f8a2df9418d29d8f1208c47c"
- }
- },
- "scales" : [
- 1
- ],
- "header" : "\/**\n * @provides sprite-payments-css\n * @generated\n *\/\n\n.sprite-payments {\n background-image: url(\/rsrc\/image\/sprite-payments.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-payments {\n background-image: url(\/rsrc\/image\/sprite-payments-X2.png);\n background-size: {X}px {Y}px;\n }\n}\n",
- "type" : "standard"
-}
diff --git a/resources/sprite/payments_2x/americanexpress.png b/resources/sprite/payments_2x/americanexpress.png
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/payments_2x/discover.png b/resources/sprite/payments_2x/discover.png
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/payments_2x/googlecheckout.png b/resources/sprite/payments_2x/googlecheckout.png
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/payments_2x/mastercard.png b/resources/sprite/payments_2x/mastercard.png
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/payments_2x/paypal.png b/resources/sprite/payments_2x/paypal.png
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/payments_2x/visa.png b/resources/sprite/payments_2x/visa.png
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/resources/sprite/payments_2x/worldpay.png b/resources/sprite/payments_2x/worldpay.png
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/scripts/celerity/generate_sprites.php b/scripts/celerity/generate_sprites.php
--- a/scripts/celerity/generate_sprites.php
+++ b/scripts/celerity/generate_sprites.php
@@ -30,7 +30,6 @@
'menu' => $generator->buildMenuSheet(),
'apps' => $generator->buildAppsSheet(),
'apps-large' => $generator->buildAppsLargeSheet(),
- 'payments' => $generator->buildPaymentsSheet(),
'tokens' => $generator->buildTokenSheet(),
'docs' => $generator->buildDocsSheet(),
'gradient' => $generator->buildGradientSheet(),
diff --git a/src/applications/celerity/CeleritySpriteGenerator.php b/src/applications/celerity/CeleritySpriteGenerator.php
--- a/src/applications/celerity/CeleritySpriteGenerator.php
+++ b/src/applications/celerity/CeleritySpriteGenerator.php
@@ -117,37 +117,6 @@
return $sheet;
}
- public function buildPaymentsSheet() {
- $icons = $this->getDirectoryList('payments_2x');
- $scales = array(
- '2x' => 1,
- );
- $template = id(new PhutilSprite())
- ->setSourceSize(60, 32);
-
- $sprites = array();
- $prefix = 'payments_';
- foreach ($icons as $icon) {
- $sprite = id(clone $template)
- ->setName('payments-'.$icon)
- ->setTargetCSS('.payments-'.$icon);
-
- foreach ($scales as $scale_key => $scale) {
- $path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png');
- $sprite->setSourceFile($path, $scale);
- }
- $sprites[] = $sprite;
- }
-
- $sheet = $this->buildSheet('payments', true);
- $sheet->setScales($scales);
- foreach ($sprites as $sprite) {
- $sheet->addSprite($sprite);
- }
-
- return $sheet;
- }
-
public function buildDocsSheet() {
$icons = $this->getDirectoryList('docs_1x');
$scales = array(
diff --git a/src/applications/uiexample/examples/PHUIIconExample.php b/src/applications/uiexample/examples/PHUIIconExample.php
--- a/src/applications/uiexample/examples/PHUIIconExample.php
+++ b/src/applications/uiexample/examples/PHUIIconExample.php
@@ -81,30 +81,6 @@
$person6->setImage(
celerity_get_resource_uri('/rsrc/image/people/taft.png'));
- $card1 = id(new PHUIIconView())
- ->setSpriteSheet(PHUIIconView::SPRITE_PAYMENTS)
- ->setSpriteIcon('visa')
- ->addClass(PHUI::MARGIN_SMALL_RIGHT);
-
- $card2 = id(new PHUIIconView())
- ->setSpriteSheet(PHUIIconView::SPRITE_PAYMENTS)
- ->setSpriteIcon('mastercard')
- ->addClass(PHUI::MARGIN_SMALL_RIGHT);
-
- $card3 = id(new PHUIIconView())
- ->setSpriteSheet(PHUIIconView::SPRITE_PAYMENTS)
- ->setSpriteIcon('paypal')
- ->addClass(PHUI::MARGIN_SMALL_RIGHT);
-
- $card4 = id(new PHUIIconView())
- ->setSpriteSheet(PHUIIconView::SPRITE_PAYMENTS)
- ->setSpriteIcon('americanexpress')
- ->addClass(PHUI::MARGIN_SMALL_RIGHT);
-
- $card5 = id(new PHUIIconView())
- ->setSpriteSheet(PHUIIconView::SPRITE_PAYMENTS)
- ->setSpriteIcon('googlecheckout');
-
$tokens = array(
'like-1',
'like-2',
@@ -154,10 +130,6 @@
->appendChild($tokenview)
->addMargin(PHUI::MARGIN_MEDIUM);
- $layout4 = id(new PHUIBoxView())
- ->appendChild(array($card1, $card2, $card3, $card4, $card5))
- ->addMargin(PHUI::MARGIN_MEDIUM);
-
$layout5 = id(new PHUIBoxView())
->appendChild($loginview)
->addMargin(PHUI::MARGIN_MEDIUM);
@@ -186,10 +158,6 @@
->setHeaderText(pht('Tokens'))
->appendChild($layout3);
- $wrap4 = id(new PHUIObjectBoxView())
- ->setHeaderText(pht('Payments'))
- ->appendChild($layout4);
-
$wrap5 = id(new PHUIObjectBoxView())
->setHeaderText(pht('Authentication'))
->appendChild($layout5);
@@ -204,7 +172,6 @@
$transforms,
$wrap2,
$wrap3,
- $wrap4,
$wrap5,
));
}
diff --git a/src/view/phui/PHUIIconView.php b/src/view/phui/PHUIIconView.php
--- a/src/view/phui/PHUIIconView.php
+++ b/src/view/phui/PHUIIconView.php
@@ -4,7 +4,6 @@
const SPRITE_APPS = 'apps';
const SPRITE_TOKENS = 'tokens';
- const SPRITE_PAYMENTS = 'payments';
const SPRITE_LOGIN = 'login';
const SPRITE_PROJECTS = 'projects';
diff --git a/webroot/rsrc/css/phui/phui-icon.css b/webroot/rsrc/css/phui/phui-icon.css
--- a/webroot/rsrc/css/phui/phui-icon.css
+++ b/webroot/rsrc/css/phui/phui-icon.css
@@ -19,11 +19,6 @@
vertical-align: top;
}
-.phui-icon-view.sprite-payments {
- height: 32px;
- width: 60px;
-}
-
.phui-icon-view.sprite-login {
height: 34px;
width: 34px;
diff --git a/webroot/rsrc/css/sprite-payments.css b/webroot/rsrc/css/sprite-payments.css
deleted file mode 100644
--- a/webroot/rsrc/css/sprite-payments.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @provides sprite-payments-css
- * @generated
- */
-
-.sprite-payments {
- background-image: url(/rsrc/image/sprite-payments.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-payments {
- background-image: url(/rsrc/image/sprite-payments-X2.png);
- background-size: 122px 132px;
- }
-}
-
-
-.payments-americanexpress {
- background-position: 0px 0px;
-}
-
-.payments-discover {
- background-position: -61px 0px;
-}
-
-.payments-googlecheckout {
- background-position: 0px -33px;
-}
-
-.payments-mastercard {
- background-position: -61px -33px;
-}
-
-.payments-paypal {
- background-position: 0px -66px;
-}
-
-.payments-visa {
- background-position: -61px -66px;
-}
-
-.payments-worldpay {
- background-position: 0px -99px;
-}
diff --git a/webroot/rsrc/image/sprite-conpherence-X2.png b/webroot/rsrc/image/sprite-conpherence-X2.png
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/image/sprite-conpherence.png b/webroot/rsrc/image/sprite-conpherence.png
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/image/sprite-payments.png b/webroot/rsrc/image/sprite-payments.png
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Mar 16, 5:21 AM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7705821
Default Alt Text
D11025.id26473.diff (12 KB)
Attached To
Mode
D11025: Remove payments sprite
Attached
Detach File
Event Timeline
Log In to Comment