Skip to content

Commit 1e0f1f4

Browse files
committed
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
1 parent f07f7bf commit 1e0f1f4

File tree

18 files changed

+3
-171
lines changed

18 files changed

+3
-171
lines changed

resources/celerity/map.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
return array(
99
'names' => array(
10-
'core.pkg.css' => '08541675',
10+
'core.pkg.css' => '679c69f6',
1111
'core.pkg.js' => 'bc72b978',
1212
'darkconsole.pkg.js' => 'df001cab',
1313
'differential.pkg.css' => '8af45893',
@@ -130,7 +130,7 @@
130130
'rsrc/css/phui/phui-form-view.css' => 'aad06f2a',
131131
'rsrc/css/phui/phui-form.css' => 'b78ec020',
132132
'rsrc/css/phui/phui-header-view.css' => '39594ac0',
133-
'rsrc/css/phui/phui-icon.css' => 'b4963a4f',
133+
'rsrc/css/phui/phui-icon.css' => 'a013a63d',
134134
'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
135135
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
136136
'rsrc/css/phui/phui-list.css' => '43ed2d93',
@@ -153,7 +153,6 @@
153153
'rsrc/css/sprite-login.css' => 'a355d921',
154154
'rsrc/css/sprite-main-header.css' => '92720ee2',
155155
'rsrc/css/sprite-menu.css' => '0ca5a908',
156-
'rsrc/css/sprite-payments.css' => 'cc085d44',
157156
'rsrc/css/sprite-projects.css' => '7578fa56',
158157
'rsrc/css/sprite-tokens.css' => '1706b943',
159158
'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '579d3140',
@@ -322,8 +321,6 @@
322321
'rsrc/image/sprite-apps-large.png' => '4d41b94a',
323322
'rsrc/image/sprite-apps-xlarge.png' => 'a751a580',
324323
'rsrc/image/sprite-apps.png' => '5570df20',
325-
'rsrc/image/sprite-conpherence-X2.png' => 'cd2d08d7',
326-
'rsrc/image/sprite-conpherence.png' => 'a5ab2eb7',
327324
'rsrc/image/sprite-docs-X2.png' => '6dc1adad',
328325
'rsrc/image/sprite-docs.png' => '4636297f',
329326
'rsrc/image/sprite-gradient.png' => 'ec15a417',
@@ -332,7 +329,6 @@
332329
'rsrc/image/sprite-main-header.png' => '83521873',
333330
'rsrc/image/sprite-menu-X2.png' => '89ae35f1',
334331
'rsrc/image/sprite-menu.png' => 'b912a047',
335-
'rsrc/image/sprite-payments.png' => 'd8576309',
336332
'rsrc/image/sprite-projects-X2.png' => '218fdc8b',
337333
'rsrc/image/sprite-projects.png' => '631ff9a7',
338334
'rsrc/image/sprite-tokens-X2.png' => 'b4776580',
@@ -779,7 +775,7 @@
779775
'phui-form-css' => 'b78ec020',
780776
'phui-form-view-css' => 'aad06f2a',
781777
'phui-header-view-css' => '39594ac0',
782-
'phui-icon-view-css' => 'b4963a4f',
778+
'phui-icon-view-css' => 'a013a63d',
783779
'phui-image-mask-css' => '5a8b09c8',
784780
'phui-info-panel-css' => '27ea50a1',
785781
'phui-list-view-css' => '43ed2d93',
@@ -821,7 +817,6 @@
821817
'sprite-login-css' => 'a355d921',
822818
'sprite-main-header-css' => '92720ee2',
823819
'sprite-menu-css' => '0ca5a908',
824-
'sprite-payments-css' => 'cc085d44',
825820
'sprite-projects-css' => '7578fa56',
826821
'sprite-tokens-css' => '1706b943',
827822
'syntax-highlighting-css' => '56c1ba38',

resources/sprite/manifest/payments.json

Lines changed: 0 additions & 45 deletions
This file was deleted.
-3.23 KB
Binary file not shown.
-2.5 KB
Binary file not shown.
-2.81 KB
Binary file not shown.
-2.55 KB
Binary file not shown.
-1.84 KB
Binary file not shown.

resources/sprite/payments_2x/visa.png

-2.08 KB
Binary file not shown.
-1.61 KB
Binary file not shown.

scripts/celerity/generate_sprites.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
'menu' => $generator->buildMenuSheet(),
3131
'apps' => $generator->buildAppsSheet(),
3232
'apps-large' => $generator->buildAppsLargeSheet(),
33-
'payments' => $generator->buildPaymentsSheet(),
3433
'tokens' => $generator->buildTokenSheet(),
3534
'docs' => $generator->buildDocsSheet(),
3635
'gradient' => $generator->buildGradientSheet(),

src/applications/celerity/CeleritySpriteGenerator.php

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -117,37 +117,6 @@ public function buildProjectsSheet() {
117117
return $sheet;
118118
}
119119

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-
151120
public function buildDocsSheet() {
152121
$icons = $this->getDirectoryList('docs_1x');
153122
$scales = array(

src/applications/uiexample/examples/PHUIIconExample.php

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -81,30 +81,6 @@ public function renderExample() {
8181
$person6->setImage(
8282
celerity_get_resource_uri('/rsrc/image/people/taft.png'));
8383

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-
10884
$tokens = array(
10985
'like-1',
11086
'like-2',
@@ -154,10 +130,6 @@ public function renderExample() {
154130
->appendChild($tokenview)
155131
->addMargin(PHUI::MARGIN_MEDIUM);
156132

157-
$layout4 = id(new PHUIBoxView())
158-
->appendChild(array($card1, $card2, $card3, $card4, $card5))
159-
->addMargin(PHUI::MARGIN_MEDIUM);
160-
161133
$layout5 = id(new PHUIBoxView())
162134
->appendChild($loginview)
163135
->addMargin(PHUI::MARGIN_MEDIUM);
@@ -186,10 +158,6 @@ public function renderExample() {
186158
->setHeaderText(pht('Tokens'))
187159
->appendChild($layout3);
188160

189-
$wrap4 = id(new PHUIObjectBoxView())
190-
->setHeaderText(pht('Payments'))
191-
->appendChild($layout4);
192-
193161
$wrap5 = id(new PHUIObjectBoxView())
194162
->setHeaderText(pht('Authentication'))
195163
->appendChild($layout5);
@@ -204,7 +172,6 @@ public function renderExample() {
204172
$transforms,
205173
$wrap2,
206174
$wrap3,
207-
$wrap4,
208175
$wrap5,
209176
));
210177
}

src/view/phui/PHUIIconView.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ final class PHUIIconView extends AphrontTagView {
44

55
const SPRITE_APPS = 'apps';
66
const SPRITE_TOKENS = 'tokens';
7-
const SPRITE_PAYMENTS = 'payments';
87
const SPRITE_LOGIN = 'login';
98
const SPRITE_PROJECTS = 'projects';
109

webroot/rsrc/css/phui/phui-icon.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
vertical-align: top;
2020
}
2121

22-
.phui-icon-view.sprite-payments {
23-
height: 32px;
24-
width: 60px;
25-
}
26-
2722
.phui-icon-view.sprite-login {
2823
height: 34px;
2924
width: 34px;

webroot/rsrc/css/sprite-payments.css

Lines changed: 0 additions & 47 deletions
This file was deleted.
-14.6 KB
Binary file not shown.
-6.83 KB
Binary file not shown.
-11.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)