@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
Remove payments sprite
Summary: Removes unused payments sprite and code, also some unused conpherence generated images. We use images in login (and could use FontAwesome, maybe).
Test Plan: grep codebase, pull up uiexamples icons page
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin, epriestley
Differential Revision: https://secure.phabricator.com/D11025
+3
-171
+3
-8
resources/celerity/map.php
+3
-8
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => '08541675',
10
+
'core.pkg.css' => '679c69f6',
11
11
'core.pkg.js' => 'bc72b978',
12
12
'darkconsole.pkg.js' => 'df001cab',
13
13
'differential.pkg.css' => '8af45893',
···
130
130
'rsrc/css/phui/phui-form-view.css' => 'aad06f2a',
131
131
'rsrc/css/phui/phui-form.css' => 'b78ec020',
132
132
'rsrc/css/phui/phui-header-view.css' => '39594ac0',
133
-
'rsrc/css/phui/phui-icon.css' => 'b4963a4f',
133
+
'rsrc/css/phui/phui-icon.css' => 'a013a63d',
134
134
'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
135
135
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
136
136
'rsrc/css/phui/phui-list.css' => '43ed2d93',
···
153
153
'rsrc/css/sprite-login.css' => 'a355d921',
154
154
'rsrc/css/sprite-main-header.css' => '92720ee2',
155
155
'rsrc/css/sprite-menu.css' => '0ca5a908',
156
-
'rsrc/css/sprite-payments.css' => 'cc085d44',
157
156
'rsrc/css/sprite-projects.css' => '7578fa56',
158
157
'rsrc/css/sprite-tokens.css' => '1706b943',
159
158
'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '579d3140',
···
322
321
'rsrc/image/sprite-apps-large.png' => '4d41b94a',
323
322
'rsrc/image/sprite-apps-xlarge.png' => 'a751a580',
324
323
'rsrc/image/sprite-apps.png' => '5570df20',
325
-
'rsrc/image/sprite-conpherence-X2.png' => 'cd2d08d7',
326
-
'rsrc/image/sprite-conpherence.png' => 'a5ab2eb7',
327
324
'rsrc/image/sprite-docs-X2.png' => '6dc1adad',
328
325
'rsrc/image/sprite-docs.png' => '4636297f',
329
326
'rsrc/image/sprite-gradient.png' => 'ec15a417',
···
332
329
'rsrc/image/sprite-main-header.png' => '83521873',
333
330
'rsrc/image/sprite-menu-X2.png' => '89ae35f1',
334
331
'rsrc/image/sprite-menu.png' => 'b912a047',
335
-
'rsrc/image/sprite-payments.png' => 'd8576309',
336
332
'rsrc/image/sprite-projects-X2.png' => '218fdc8b',
337
333
'rsrc/image/sprite-projects.png' => '631ff9a7',
338
334
'rsrc/image/sprite-tokens-X2.png' => 'b4776580',
···
779
775
'phui-form-css' => 'b78ec020',
780
776
'phui-form-view-css' => 'aad06f2a',
781
777
'phui-header-view-css' => '39594ac0',
782
-
'phui-icon-view-css' => 'b4963a4f',
778
+
'phui-icon-view-css' => 'a013a63d',
783
779
'phui-image-mask-css' => '5a8b09c8',
784
780
'phui-info-panel-css' => '27ea50a1',
785
781
'phui-list-view-css' => '43ed2d93',
···
821
817
'sprite-login-css' => 'a355d921',
822
818
'sprite-main-header-css' => '92720ee2',
823
819
'sprite-menu-css' => '0ca5a908',
824
-
'sprite-payments-css' => 'cc085d44',
825
820
'sprite-projects-css' => '7578fa56',
826
821
'sprite-tokens-css' => '1706b943',
827
822
'syntax-highlighting-css' => '56c1ba38',
-45
resources/sprite/manifest/payments.json
-45
resources/sprite/manifest/payments.json
···
1
-
{
2
-
"version" : 1,
3
-
"sprites" : {
4
-
"payments-americanexpress" : {
5
-
"name" : "payments-americanexpress",
6
-
"rule" : ".payments-americanexpress",
7
-
"hash" : "e0e61821824d30679d0938a8b8b997ca"
8
-
},
9
-
"payments-discover" : {
10
-
"name" : "payments-discover",
11
-
"rule" : ".payments-discover",
12
-
"hash" : "64553bcdfde3b182949c9305ee4dda94"
13
-
},
14
-
"payments-googlecheckout" : {
15
-
"name" : "payments-googlecheckout",
16
-
"rule" : ".payments-googlecheckout",
17
-
"hash" : "4cbbb6450489adbb91eca0e3573df03e"
18
-
},
19
-
"payments-mastercard" : {
20
-
"name" : "payments-mastercard",
21
-
"rule" : ".payments-mastercard",
22
-
"hash" : "cbe041c4467075e439b529e582e2ec6a"
23
-
},
24
-
"payments-paypal" : {
25
-
"name" : "payments-paypal",
26
-
"rule" : ".payments-paypal",
27
-
"hash" : "6fd9c4b1aba0d7bf25b1888b5524dd33"
28
-
},
29
-
"payments-visa" : {
30
-
"name" : "payments-visa",
31
-
"rule" : ".payments-visa",
32
-
"hash" : "517115136f37bd5647a502f7130bd63a"
33
-
},
34
-
"payments-worldpay" : {
35
-
"name" : "payments-worldpay",
36
-
"rule" : ".payments-worldpay",
37
-
"hash" : "f93c40f9f8a2df9418d29d8f1208c47c"
38
-
}
39
-
},
40
-
"scales" : [
41
-
1
42
-
],
43
-
"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",
44
-
"type" : "standard"
45
-
}
resources/sprite/payments_2x/americanexpress.png
resources/sprite/payments_2x/americanexpress.png
This is a binary file and will not be displayed.
resources/sprite/payments_2x/discover.png
resources/sprite/payments_2x/discover.png
This is a binary file and will not be displayed.
resources/sprite/payments_2x/googlecheckout.png
resources/sprite/payments_2x/googlecheckout.png
This is a binary file and will not be displayed.
resources/sprite/payments_2x/mastercard.png
resources/sprite/payments_2x/mastercard.png
This is a binary file and will not be displayed.
resources/sprite/payments_2x/paypal.png
resources/sprite/payments_2x/paypal.png
This is a binary file and will not be displayed.
resources/sprite/payments_2x/visa.png
resources/sprite/payments_2x/visa.png
This is a binary file and will not be displayed.
resources/sprite/payments_2x/worldpay.png
resources/sprite/payments_2x/worldpay.png
This is a binary file and will not be displayed.
-1
scripts/celerity/generate_sprites.php
-1
scripts/celerity/generate_sprites.php
···
30
30
'menu' => $generator->buildMenuSheet(),
31
31
'apps' => $generator->buildAppsSheet(),
32
32
'apps-large' => $generator->buildAppsLargeSheet(),
33
-
'payments' => $generator->buildPaymentsSheet(),
34
33
'tokens' => $generator->buildTokenSheet(),
35
34
'docs' => $generator->buildDocsSheet(),
36
35
'gradient' => $generator->buildGradientSheet(),
-31
src/applications/celerity/CeleritySpriteGenerator.php
-31
src/applications/celerity/CeleritySpriteGenerator.php
···
117
117
return $sheet;
118
118
}
119
119
120
-
public function buildPaymentsSheet() {
121
-
$icons = $this->getDirectoryList('payments_2x');
122
-
$scales = array(
123
-
'2x' => 1,
124
-
);
125
-
$template = id(new PhutilSprite())
126
-
->setSourceSize(60, 32);
127
-
128
-
$sprites = array();
129
-
$prefix = 'payments_';
130
-
foreach ($icons as $icon) {
131
-
$sprite = id(clone $template)
132
-
->setName('payments-'.$icon)
133
-
->setTargetCSS('.payments-'.$icon);
134
-
135
-
foreach ($scales as $scale_key => $scale) {
136
-
$path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png');
137
-
$sprite->setSourceFile($path, $scale);
138
-
}
139
-
$sprites[] = $sprite;
140
-
}
141
-
142
-
$sheet = $this->buildSheet('payments', true);
143
-
$sheet->setScales($scales);
144
-
foreach ($sprites as $sprite) {
145
-
$sheet->addSprite($sprite);
146
-
}
147
-
148
-
return $sheet;
149
-
}
150
-
151
120
public function buildDocsSheet() {
152
121
$icons = $this->getDirectoryList('docs_1x');
153
122
$scales = array(
-33
src/applications/uiexample/examples/PHUIIconExample.php
-33
src/applications/uiexample/examples/PHUIIconExample.php
···
81
81
$person6->setImage(
82
82
celerity_get_resource_uri('/rsrc/image/people/taft.png'));
83
83
84
-
$card1 = id(new PHUIIconView())
85
-
->setSpriteSheet(PHUIIconView::SPRITE_PAYMENTS)
86
-
->setSpriteIcon('visa')
87
-
->addClass(PHUI::MARGIN_SMALL_RIGHT);
88
-
89
-
$card2 = id(new PHUIIconView())
90
-
->setSpriteSheet(PHUIIconView::SPRITE_PAYMENTS)
91
-
->setSpriteIcon('mastercard')
92
-
->addClass(PHUI::MARGIN_SMALL_RIGHT);
93
-
94
-
$card3 = id(new PHUIIconView())
95
-
->setSpriteSheet(PHUIIconView::SPRITE_PAYMENTS)
96
-
->setSpriteIcon('paypal')
97
-
->addClass(PHUI::MARGIN_SMALL_RIGHT);
98
-
99
-
$card4 = id(new PHUIIconView())
100
-
->setSpriteSheet(PHUIIconView::SPRITE_PAYMENTS)
101
-
->setSpriteIcon('americanexpress')
102
-
->addClass(PHUI::MARGIN_SMALL_RIGHT);
103
-
104
-
$card5 = id(new PHUIIconView())
105
-
->setSpriteSheet(PHUIIconView::SPRITE_PAYMENTS)
106
-
->setSpriteIcon('googlecheckout');
107
-
108
84
$tokens = array(
109
85
'like-1',
110
86
'like-2',
···
154
130
->appendChild($tokenview)
155
131
->addMargin(PHUI::MARGIN_MEDIUM);
156
132
157
-
$layout4 = id(new PHUIBoxView())
158
-
->appendChild(array($card1, $card2, $card3, $card4, $card5))
159
-
->addMargin(PHUI::MARGIN_MEDIUM);
160
-
161
133
$layout5 = id(new PHUIBoxView())
162
134
->appendChild($loginview)
163
135
->addMargin(PHUI::MARGIN_MEDIUM);
···
186
158
->setHeaderText(pht('Tokens'))
187
159
->appendChild($layout3);
188
160
189
-
$wrap4 = id(new PHUIObjectBoxView())
190
-
->setHeaderText(pht('Payments'))
191
-
->appendChild($layout4);
192
-
193
161
$wrap5 = id(new PHUIObjectBoxView())
194
162
->setHeaderText(pht('Authentication'))
195
163
->appendChild($layout5);
···
204
172
$transforms,
205
173
$wrap2,
206
174
$wrap3,
207
-
$wrap4,
208
175
$wrap5,
209
176
));
210
177
}
-1
src/view/phui/PHUIIconView.php
-1
src/view/phui/PHUIIconView.php
-5
webroot/rsrc/css/phui/phui-icon.css
-5
webroot/rsrc/css/phui/phui-icon.css
-47
webroot/rsrc/css/sprite-payments.css
-47
webroot/rsrc/css/sprite-payments.css
···
1
-
/**
2
-
* @provides sprite-payments-css
3
-
* @generated
4
-
*/
5
-
6
-
.sprite-payments {
7
-
background-image: url(/rsrc/image/sprite-payments.png);
8
-
background-repeat: no-repeat;
9
-
}
10
-
11
-
@media
12
-
only screen and (min-device-pixel-ratio: 1.5),
13
-
only screen and (-webkit-min-device-pixel-ratio: 1.5) {
14
-
.sprite-payments {
15
-
background-image: url(/rsrc/image/sprite-payments-X2.png);
16
-
background-size: 122px 132px;
17
-
}
18
-
}
19
-
20
-
21
-
.payments-americanexpress {
22
-
background-position: 0px 0px;
23
-
}
24
-
25
-
.payments-discover {
26
-
background-position: -61px 0px;
27
-
}
28
-
29
-
.payments-googlecheckout {
30
-
background-position: 0px -33px;
31
-
}
32
-
33
-
.payments-mastercard {
34
-
background-position: -61px -33px;
35
-
}
36
-
37
-
.payments-paypal {
38
-
background-position: 0px -66px;
39
-
}
40
-
41
-
.payments-visa {
42
-
background-position: -61px -66px;
43
-
}
44
-
45
-
.payments-worldpay {
46
-
background-position: 0px -99px;
47
-
}
webroot/rsrc/image/sprite-conpherence-X2.png
webroot/rsrc/image/sprite-conpherence-X2.png
This is a binary file and will not be displayed.
webroot/rsrc/image/sprite-conpherence.png
webroot/rsrc/image/sprite-conpherence.png
This is a binary file and will not be displayed.
webroot/rsrc/image/sprite-payments.png
webroot/rsrc/image/sprite-payments.png
This is a binary file and will not be displayed.