Skip to content

Commit a66e6c2

Browse files
chadlittlechadlittle
committed
Add Login icons to PHUIIconView.
Summary: Prepping to use. Test Plan: UIExamples Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D6191
1 parent 554a15c commit a66e6c2

File tree

7 files changed

+146
-109
lines changed

7 files changed

+146
-109
lines changed

‎resources/sprite/manifest/login.json

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
11
{
22
"version" : 1,
33
"sprites" : {
4-
"login_Amazon" : {
5-
"name" : "login_Amazon",
6-
"rule" : ".login_Amazon",
4+
"login-Amazon" : {
5+
"name" : "login-Amazon",
6+
"rule" : ".login-Amazon",
77
"hash" : "5961e41c525ef46c88558616fcf23272"
88
},
9-
"login_Asana" : {
10-
"name" : "login_Asana",
11-
"rule" : ".login_Asana",
9+
"login-Asana" : {
10+
"name" : "login-Asana",
11+
"rule" : ".login-Asana",
1212
"hash" : "30df492eab339fa64c9ae9b21bb46a18"
1313
},
14-
"login_Disqus" : {
15-
"name" : "login_Disqus",
16-
"rule" : ".login_Disqus",
14+
"login-Disqus" : {
15+
"name" : "login-Disqus",
16+
"rule" : ".login-Disqus",
1717
"hash" : "5f46ac50a5d9d13245971c298f49e13b"
1818
},
19-
"login_Dropbox" : {
20-
"name" : "login_Dropbox",
21-
"rule" : ".login_Dropbox",
19+
"login-Dropbox" : {
20+
"name" : "login-Dropbox",
21+
"rule" : ".login-Dropbox",
2222
"hash" : "572ab36301762414365b68c0bc185ac5"
2323
},
24-
"login_Facebook" : {
25-
"name" : "login_Facebook",
26-
"rule" : ".login_Facebook",
24+
"login-Facebook" : {
25+
"name" : "login-Facebook",
26+
"rule" : ".login-Facebook",
2727
"hash" : "2b1511f5b4d12076dd9086d1bb187b28"
2828
},
29-
"login_Generic" : {
30-
"name" : "login_Generic",
31-
"rule" : ".login_Generic",
29+
"login-Generic" : {
30+
"name" : "login-Generic",
31+
"rule" : ".login-Generic",
3232
"hash" : "60d75c38668ffd6eea91a40e66186601"
3333
},
34-
"login_Github" : {
35-
"name" : "login_Github",
36-
"rule" : ".login_Github",
34+
"login-Github" : {
35+
"name" : "login-Github",
36+
"rule" : ".login-Github",
3737
"hash" : "633696beb8c1eaac642ce4955be917d8"
3838
},
39-
"login_Google" : {
40-
"name" : "login_Google",
41-
"rule" : ".login_Google",
39+
"login-Google" : {
40+
"name" : "login-Google",
41+
"rule" : ".login-Google",
4242
"hash" : "b7d3962a31df1e6c13e0a3c97c08f11d"
4343
},
44-
"login_HTTP" : {
45-
"name" : "login_HTTP",
46-
"rule" : ".login_HTTP",
44+
"login-HTTP" : {
45+
"name" : "login-HTTP",
46+
"rule" : ".login-HTTP",
4747
"hash" : "6fcf0f666c0f6f1e1cd8f397b41ed176"
4848
},
49-
"login_LDAP" : {
50-
"name" : "login_LDAP",
51-
"rule" : ".login_LDAP",
49+
"login-LDAP" : {
50+
"name" : "login-LDAP",
51+
"rule" : ".login-LDAP",
5252
"hash" : "5b4e01ddf35cd40c8f061c90abc89b6c"
5353
},
54-
"login_Linkedin" : {
55-
"name" : "login_Linkedin",
56-
"rule" : ".login_Linkedin",
54+
"login-Linkedin" : {
55+
"name" : "login-Linkedin",
56+
"rule" : ".login-Linkedin",
5757
"hash" : "0dd89825046fa4fd0fe402aa2cd55fd1"
5858
},
59-
"login_Openid" : {
60-
"name" : "login_Openid",
61-
"rule" : ".login_Openid",
59+
"login-Openid" : {
60+
"name" : "login-Openid",
61+
"rule" : ".login-Openid",
6262
"hash" : "9267ffbb8d4e6dee409c4d8fa2d50c0a"
6363
},
64-
"login_Phabricator" : {
65-
"name" : "login_Phabricator",
66-
"rule" : ".login_Phabricator",
64+
"login-Phabricator" : {
65+
"name" : "login-Phabricator",
66+
"rule" : ".login-Phabricator",
6767
"hash" : "fad258eb347a1ccf5800b0ee2d8e6e49"
6868
},
69-
"login_Twitter" : {
70-
"name" : "login_Twitter",
71-
"rule" : ".login_Twitter",
69+
"login-Twitter" : {
70+
"name" : "login-Twitter",
71+
"rule" : ".login-Twitter",
7272
"hash" : "0b64983507a720b365474b778a966bab"
7373
},
74-
"login_Yahoo" : {
75-
"name" : "login_Yahoo",
76-
"rule" : ".login_Yahoo",
74+
"login-Yahoo" : {
75+
"name" : "login-Yahoo",
76+
"rule" : ".login-Yahoo",
7777
"hash" : "1cc6fceee294045fe6d1c1d3aa31d2c1"
7878
}
7979
},

‎src/__celerity_resource_map__.php

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3723,7 +3723,7 @@
37233723
),
37243724
'phui-icon-view-css' =>
37253725
array(
3726-
'uri' => '/res/1b1a37b5/rsrc/css/phui/phui-icon.css',
3726+
'uri' => '/res/7fd37b96/rsrc/css/phui/phui-icon.css',
37273727
'type' => 'css',
37283728
'requires' =>
37293729
array(
@@ -3984,7 +3984,7 @@
39843984
),
39853985
'sprite-login-css' =>
39863986
array(
3987-
'uri' => '/res/7294661a/rsrc/css/sprite-login.css',
3987+
'uri' => '/res/8bec1ba2/rsrc/css/sprite-login.css',
39883988
'type' => 'css',
39893989
'requires' =>
39903990
array(
@@ -4048,7 +4048,7 @@
40484048
), array(
40494049
'packages' =>
40504050
array(
4051-
'e2eeaf23' =>
4051+
'76d08512' =>
40524052
array(
40534053
'name' => 'core.pkg.css',
40544054
'symbols' =>
@@ -4096,7 +4096,7 @@
40964096
40 => 'phabricator-property-list-view-css',
40974097
41 => 'phabricator-tag-view-css',
40984098
),
4099-
'uri' => '/res/pkg/e2eeaf23/core.pkg.css',
4099+
'uri' => '/res/pkg/76d08512/core.pkg.css',
41004100
'type' => 'css',
41014101
),
41024102
'f2ad0683' =>
@@ -4290,16 +4290,16 @@
42904290
'reverse' =>
42914291
array(
42924292
'aphront-attached-file-view-css' => 'a7ca34a9',
4293-
'aphront-dialog-view-css' => 'e2eeaf23',
4294-
'aphront-error-view-css' => 'e2eeaf23',
4295-
'aphront-form-view-css' => 'e2eeaf23',
4296-
'aphront-list-filter-view-css' => 'e2eeaf23',
4297-
'aphront-pager-view-css' => 'e2eeaf23',
4298-
'aphront-panel-view-css' => 'e2eeaf23',
4299-
'aphront-table-view-css' => 'e2eeaf23',
4300-
'aphront-tokenizer-control-css' => 'e2eeaf23',
4301-
'aphront-tooltip-css' => 'e2eeaf23',
4302-
'aphront-typeahead-control-css' => 'e2eeaf23',
4293+
'aphront-dialog-view-css' => '76d08512',
4294+
'aphront-error-view-css' => '76d08512',
4295+
'aphront-form-view-css' => '76d08512',
4296+
'aphront-list-filter-view-css' => '76d08512',
4297+
'aphront-pager-view-css' => '76d08512',
4298+
'aphront-panel-view-css' => '76d08512',
4299+
'aphront-table-view-css' => '76d08512',
4300+
'aphront-tokenizer-control-css' => '76d08512',
4301+
'aphront-tooltip-css' => '76d08512',
4302+
'aphront-typeahead-control-css' => '76d08512',
43034303
'differential-changeset-view-css' => 'dd27a69b',
43044304
'differential-core-view-css' => 'dd27a69b',
43054305
'differential-inline-comment-editor' => '9488bb69',
@@ -4313,7 +4313,7 @@
43134313
'differential-table-of-contents-css' => 'dd27a69b',
43144314
'diffusion-commit-view-css' => 'c8ce2d88',
43154315
'diffusion-icons-css' => 'c8ce2d88',
4316-
'global-drag-and-drop-css' => 'e2eeaf23',
4316+
'global-drag-and-drop-css' => '76d08512',
43174317
'inline-comment-summary-css' => 'dd27a69b',
43184318
'javelin-aphlict' => 'f2ad0683',
43194319
'javelin-behavior' => 'a9f14d76',
@@ -4387,55 +4387,55 @@
43874387
'javelin-util' => 'a9f14d76',
43884388
'javelin-vector' => 'a9f14d76',
43894389
'javelin-workflow' => 'a9f14d76',
4390-
'lightbox-attachment-css' => 'e2eeaf23',
4390+
'lightbox-attachment-css' => '76d08512',
43914391
'maniphest-task-summary-css' => 'a7ca34a9',
43924392
'maniphest-transaction-detail-css' => 'a7ca34a9',
4393-
'phabricator-action-list-view-css' => 'e2eeaf23',
4394-
'phabricator-application-launch-view-css' => 'e2eeaf23',
4393+
'phabricator-action-list-view-css' => '76d08512',
4394+
'phabricator-application-launch-view-css' => '76d08512',
43954395
'phabricator-busy' => 'f2ad0683',
43964396
'phabricator-content-source-view-css' => 'dd27a69b',
4397-
'phabricator-core-buttons-css' => 'e2eeaf23',
4398-
'phabricator-core-css' => 'e2eeaf23',
4399-
'phabricator-crumbs-view-css' => 'e2eeaf23',
4397+
'phabricator-core-buttons-css' => '76d08512',
4398+
'phabricator-core-css' => '76d08512',
4399+
'phabricator-crumbs-view-css' => '76d08512',
44004400
'phabricator-drag-and-drop-file-upload' => '9488bb69',
44014401
'phabricator-dropdown-menu' => 'f2ad0683',
44024402
'phabricator-file-upload' => 'f2ad0683',
4403-
'phabricator-filetree-view-css' => 'e2eeaf23',
4404-
'phabricator-flag-css' => 'e2eeaf23',
4405-
'phabricator-form-view-css' => 'e2eeaf23',
4406-
'phabricator-header-view-css' => 'e2eeaf23',
4403+
'phabricator-filetree-view-css' => '76d08512',
4404+
'phabricator-flag-css' => '76d08512',
4405+
'phabricator-form-view-css' => '76d08512',
4406+
'phabricator-header-view-css' => '76d08512',
44074407
'phabricator-hovercard' => 'f2ad0683',
4408-
'phabricator-jump-nav' => 'e2eeaf23',
4408+
'phabricator-jump-nav' => '76d08512',
44094409
'phabricator-keyboard-shortcut' => 'f2ad0683',
44104410
'phabricator-keyboard-shortcut-manager' => 'f2ad0683',
4411-
'phabricator-main-menu-view' => 'e2eeaf23',
4411+
'phabricator-main-menu-view' => '76d08512',
44124412
'phabricator-menu-item' => 'f2ad0683',
4413-
'phabricator-nav-view-css' => 'e2eeaf23',
4413+
'phabricator-nav-view-css' => '76d08512',
44144414
'phabricator-notification' => 'f2ad0683',
4415-
'phabricator-notification-css' => 'e2eeaf23',
4416-
'phabricator-notification-menu-css' => 'e2eeaf23',
4417-
'phabricator-object-item-list-view-css' => 'e2eeaf23',
4415+
'phabricator-notification-css' => '76d08512',
4416+
'phabricator-notification-menu-css' => '76d08512',
4417+
'phabricator-object-item-list-view-css' => '76d08512',
44184418
'phabricator-object-selector-css' => 'dd27a69b',
44194419
'phabricator-phtize' => 'f2ad0683',
44204420
'phabricator-prefab' => 'f2ad0683',
44214421
'phabricator-project-tag-css' => 'a7ca34a9',
4422-
'phabricator-property-list-view-css' => 'e2eeaf23',
4423-
'phabricator-remarkup-css' => 'e2eeaf23',
4422+
'phabricator-property-list-view-css' => '76d08512',
4423+
'phabricator-remarkup-css' => '76d08512',
44244424
'phabricator-shaped-request' => '9488bb69',
4425-
'phabricator-side-menu-view-css' => 'e2eeaf23',
4426-
'phabricator-standard-page-view' => 'e2eeaf23',
4427-
'phabricator-tag-view-css' => 'e2eeaf23',
4425+
'phabricator-side-menu-view-css' => '76d08512',
4426+
'phabricator-standard-page-view' => '76d08512',
4427+
'phabricator-tag-view-css' => '76d08512',
44284428
'phabricator-textareautils' => 'f2ad0683',
44294429
'phabricator-tooltip' => 'f2ad0683',
4430-
'phabricator-transaction-view-css' => 'e2eeaf23',
4431-
'phabricator-zindex-css' => 'e2eeaf23',
4432-
'phui-form-css' => 'e2eeaf23',
4433-
'phui-icon-view-css' => 'e2eeaf23',
4434-
'spacing-css' => 'e2eeaf23',
4435-
'sprite-apps-large-css' => 'e2eeaf23',
4436-
'sprite-gradient-css' => 'e2eeaf23',
4437-
'sprite-icons-css' => 'e2eeaf23',
4438-
'sprite-menu-css' => 'e2eeaf23',
4439-
'syntax-highlighting-css' => 'e2eeaf23',
4430+
'phabricator-transaction-view-css' => '76d08512',
4431+
'phabricator-zindex-css' => '76d08512',
4432+
'phui-form-css' => '76d08512',
4433+
'phui-icon-view-css' => '76d08512',
4434+
'spacing-css' => '76d08512',
4435+
'sprite-apps-large-css' => '76d08512',
4436+
'sprite-gradient-css' => '76d08512',
4437+
'sprite-icons-css' => '76d08512',
4438+
'sprite-menu-css' => '76d08512',
4439+
'syntax-highlighting-css' => '76d08512',
44404440
),
44414441
));

‎src/applications/uiexample/examples/PHUIIconExample.php

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,20 @@ public function renderExample() {
100100
->setSpriteIcon($token);
101101
}
102102

103+
$logins = array(
104+
'Asana',
105+
'Dropbox',
106+
'Google',
107+
'Github');
108+
$loginview = array();
109+
foreach ($logins as $login) {
110+
$loginview[] =
111+
id(new PHUIIconView())
112+
->setSpriteSheet(PHUIIconView::SPRITE_LOGIN)
113+
->setSpriteIcon($login)
114+
->addClass(PHUI::MARGIN_SMALL_RIGHT);
115+
}
116+
103117
$layout1 =
104118
array(
105119
id(new PHUIBoxView())
@@ -140,6 +154,14 @@ public function renderExample() {
140154
->addPadding(PHUI::PADDING_MEDIUM)
141155
->setShadow(true));
142156

157+
$layout5 =
158+
array(
159+
id(new PHUIBoxView())
160+
->appendChild($loginview)
161+
->addMargin(PHUI::MARGIN_MEDIUM)
162+
->addPadding(PHUI::PADDING_MEDIUM)
163+
->setShadow(true));
164+
143165
$head1 = id(new PhabricatorHeaderView())
144166
->setHeader(pht('Action Icons!'));
145167

@@ -152,6 +174,9 @@ public function renderExample() {
152174
$head4 = id(new PhabricatorHeaderView())
153175
->setHeader(pht('Payments'));
154176

177+
$head5 = id(new PhabricatorHeaderView())
178+
->setHeader(pht('Authentication'));
179+
155180
$wrap1 = id(new PHUIBoxView())
156181
->appendChild($layout1)
157182
->addMargin(PHUI::MARGIN_LARGE);
@@ -168,6 +193,10 @@ public function renderExample() {
168193
->appendChild($layout4)
169194
->addMargin(PHUI::MARGIN_LARGE);
170195

196+
$wrap5 = id(new PHUIBoxView())
197+
->appendChild($layout5)
198+
->addMargin(PHUI::MARGIN_LARGE);
199+
171200
return phutil_tag(
172201
'div',
173202
array(
@@ -181,7 +210,9 @@ public function renderExample() {
181210
$head3,
182211
$wrap3,
183212
$head4,
184-
$wrap4
213+
$wrap4,
214+
$head5,
215+
$wrap5
185216
));
186217
}
187218
}

‎src/infrastructure/celerity/CeleritySpriteGenerator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,8 @@ public function buildLoginSheet() {
450450
$prefix = 'login_';
451451
foreach ($icons as $icon) {
452452
$sprite = id(clone $template)
453-
->setName($prefix.$icon)
454-
->setTargetCSS('.'.$prefix.$icon);
453+
->setName('login-'.$icon)
454+
->setTargetCSS('.login-'.$icon);
455455

456456
foreach ($scales as $scale_key => $scale) {
457457
$path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png');

‎src/view/phui/PHUIIconView.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ final class PHUIIconView extends AphrontTagView {
88
const SPRITE_TOKENS = 'tokens';
99
const SPRITE_PAYMENTS = 'payments';
1010
const SPRITE_ICONS = 'icons';
11+
const SPRITE_LOGIN = 'login';
1112

1213
const HEAD_SMALL = 'phuihead-small';
1314
const HEAD_MEDIUM = 'phuihead-medium';

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
width: 60px;
3333
}
3434

35+
.phui-icon-view.sprite-login {
36+
height: 34px;
37+
width: 34px;
38+
}
39+
3540
.phui-icon-view.phuihead-medium {
3641
height: 50px;
3742
width: 50px;

0 commit comments

Comments
 (0)