@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
Replace ActionHeader minicons with Font icons
Summary:
Ref T5885. See D10276.
Currently, ActionHeaders can only have minicons, and we don't use them anywhere and they probably don't make much sense in the product anymore.
Instead, allow them to have font icons. Remove minicons, which have no callsites and probably won't in the future.
Test Plan:
{F190925}
- Grepped for `minicons`.
- Grepped for `setHeaderIcon()`.
Reviewers: btrahan, chad
Reviewed By: chad
Subscribers: epriestley
Maniphest Tasks: T5885
Differential Revision: https://secure.phabricator.com/D10277
+31
-190
+3
-7
resources/celerity/map.php
+3
-7
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => '383d0947',
10
+
'core.pkg.css' => '1733ae8f',
11
11
'core.pkg.js' => '7c8455ef',
12
12
'darkconsole.pkg.js' => 'df001cab',
13
13
'differential.pkg.css' => '4a93db37',
···
130
130
'rsrc/css/phui/phui-form-view.css' => 'ebac1b1d',
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' => 'd8526aa1',
133
+
'rsrc/css/phui/phui-icon.css' => 'b4963a4f',
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',
···
154
154
'rsrc/css/sprite-login.css' => '878ee4d8',
155
155
'rsrc/css/sprite-main-header.css' => '92720ee2',
156
156
'rsrc/css/sprite-menu.css' => '28281e16',
157
-
'rsrc/css/sprite-minicons.css' => 'df4f76fe',
158
157
'rsrc/css/sprite-payments.css' => 'cc085d44',
159
158
'rsrc/css/sprite-projects.css' => '7578fa56',
160
159
'rsrc/css/sprite-tokens.css' => '1706b943',
···
333
332
'rsrc/image/sprite-main-header.png' => '83521873',
334
333
'rsrc/image/sprite-menu-X2.png' => '39d78f97',
335
334
'rsrc/image/sprite-menu.png' => '259dab45',
336
-
'rsrc/image/sprite-minicons-X2.png' => '55377e4e',
337
-
'rsrc/image/sprite-minicons.png' => '272644ea',
338
335
'rsrc/image/sprite-payments.png' => 'd8576309',
339
336
'rsrc/image/sprite-projects-X2.png' => '218fdc8b',
340
337
'rsrc/image/sprite-projects.png' => '631ff9a7',
···
780
777
'phui-form-css' => 'b78ec020',
781
778
'phui-form-view-css' => 'ebac1b1d',
782
779
'phui-header-view-css' => '39594ac0',
783
-
'phui-icon-view-css' => 'd8526aa1',
780
+
'phui-icon-view-css' => 'b4963a4f',
784
781
'phui-image-mask-css' => '5a8b09c8',
785
782
'phui-info-panel-css' => '27ea50a1',
786
783
'phui-list-view-css' => '43ed2d93',
···
823
820
'sprite-login-css' => '878ee4d8',
824
821
'sprite-main-header-css' => '92720ee2',
825
822
'sprite-menu-css' => '28281e16',
826
-
'sprite-minicons-css' => 'df4f76fe',
827
823
'sprite-payments-css' => 'cc085d44',
828
824
'sprite-projects-css' => '7578fa56',
829
825
'sprite-tokens-css' => '1706b943',
-51
resources/sprite/manifest/minicons.json
-51
resources/sprite/manifest/minicons.json
···
1
-
{
2
-
"version" : 1,
3
-
"sprites" : {
4
-
"minicons-company-dark" : {
5
-
"name" : "minicons-company-dark",
6
-
"rule" : ".minicons-company-dark",
7
-
"hash" : "fbe746dfff63470103b6a28f52005795"
8
-
},
9
-
"minicons-company-white" : {
10
-
"name" : "minicons-company-white",
11
-
"rule" : ".minicons-company-white",
12
-
"hash" : "6dcede529bc27cc3491d8de750d3fd52"
13
-
},
14
-
"minicons-move-dark" : {
15
-
"name" : "minicons-move-dark",
16
-
"rule" : ".minicons-move-dark",
17
-
"hash" : "72ec71b4385b181a5c31bbc4ca5f33c6"
18
-
},
19
-
"minicons-move-white" : {
20
-
"name" : "minicons-move-white",
21
-
"rule" : ".minicons-move-white",
22
-
"hash" : "6fcd2e10e216ef67c5b89d32ecff951f"
23
-
},
24
-
"minicons-public-dark" : {
25
-
"name" : "minicons-public-dark",
26
-
"rule" : ".minicons-public-dark",
27
-
"hash" : "046d7814e36f9961400c82a9f13c7e00"
28
-
},
29
-
"minicons-public-white" : {
30
-
"name" : "minicons-public-white",
31
-
"rule" : ".minicons-public-white",
32
-
"hash" : "da5c297550069789eae47b9137387c5d"
33
-
},
34
-
"minicons-restricted-dark" : {
35
-
"name" : "minicons-restricted-dark",
36
-
"rule" : ".minicons-restricted-dark",
37
-
"hash" : "c04acaccae9ff70686d93f3c24557144"
38
-
},
39
-
"minicons-restricted-white" : {
40
-
"name" : "minicons-restricted-white",
41
-
"rule" : ".minicons-restricted-white",
42
-
"hash" : "c9bac60de30a2c5bb937d4da83d87c16"
43
-
}
44
-
},
45
-
"scales" : [
46
-
1,
47
-
2
48
-
],
49
-
"header" : "\/**\n * @provides sprite-minicons-css\n * @generated\n *\/\n\n.sprite-minicons {\n background-image: url(\/rsrc\/image\/sprite-minicons.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-minicons {\n background-image: url(\/rsrc\/image\/sprite-minicons-X2.png);\n background-size: {X}px {Y}px;\n }\n}\n",
50
-
"type" : "standard"
51
-
}
resources/sprite/minicons_dark_1x/company.png
resources/sprite/minicons_dark_1x/company.png
This is a binary file and will not be displayed.
resources/sprite/minicons_dark_1x/move.png
resources/sprite/minicons_dark_1x/move.png
This is a binary file and will not be displayed.
resources/sprite/minicons_dark_1x/public.png
resources/sprite/minicons_dark_1x/public.png
This is a binary file and will not be displayed.
resources/sprite/minicons_dark_1x/restricted.png
resources/sprite/minicons_dark_1x/restricted.png
This is a binary file and will not be displayed.
resources/sprite/minicons_dark_2x/company.png
resources/sprite/minicons_dark_2x/company.png
This is a binary file and will not be displayed.
resources/sprite/minicons_dark_2x/move.png
resources/sprite/minicons_dark_2x/move.png
This is a binary file and will not be displayed.
resources/sprite/minicons_dark_2x/public.png
resources/sprite/minicons_dark_2x/public.png
This is a binary file and will not be displayed.
resources/sprite/minicons_dark_2x/restricted.png
resources/sprite/minicons_dark_2x/restricted.png
This is a binary file and will not be displayed.
resources/sprite/minicons_white_1x/company.png
resources/sprite/minicons_white_1x/company.png
This is a binary file and will not be displayed.
resources/sprite/minicons_white_1x/move.png
resources/sprite/minicons_white_1x/move.png
This is a binary file and will not be displayed.
resources/sprite/minicons_white_1x/public.png
resources/sprite/minicons_white_1x/public.png
This is a binary file and will not be displayed.
resources/sprite/minicons_white_1x/restricted.png
resources/sprite/minicons_white_1x/restricted.png
This is a binary file and will not be displayed.
resources/sprite/minicons_white_2x/company.png
resources/sprite/minicons_white_2x/company.png
This is a binary file and will not be displayed.
resources/sprite/minicons_white_2x/move.png
resources/sprite/minicons_white_2x/move.png
This is a binary file and will not be displayed.
resources/sprite/minicons_white_2x/public.png
resources/sprite/minicons_white_2x/public.png
This is a binary file and will not be displayed.
resources/sprite/minicons_white_2x/restricted.png
resources/sprite/minicons_white_2x/restricted.png
This is a binary file and will not be displayed.
-1
scripts/celerity/generate_sprites.php
-1
scripts/celerity/generate_sprites.php
···
29
29
$sheets = array(
30
30
'menu' => $generator->buildMenuSheet(),
31
31
'apps' => $generator->buildAppsSheet(),
32
-
'minicons' => $generator->buildMiniconsSheet(),
33
32
'conpherence' => $generator->buildConpherenceSheet(),
34
33
'apps-large' => $generator->buildAppsLargeSheet(),
35
34
'payments' => $generator->buildPaymentsSheet(),
+25
-13
src/applications/uiexample/examples/PHUIActionHeaderExample.php
+25
-13
src/applications/uiexample/examples/PHUIActionHeaderExample.php
···
55
55
56
56
/* Policy Icons */
57
57
$title2 = id(new PHUIHeaderView())
58
-
->setHeader(pht('With Policy Icons'));
58
+
->setHeader(pht('With Icons'));
59
59
60
60
$header1 = id(new PHUIActionHeaderView())
61
-
->setHeaderTitle('Company')
62
-
->setHeaderIcon('company-dark');
61
+
->setHeaderTitle('Quack')
62
+
->setHeaderIcon(
63
+
id(new PHUIIconView())
64
+
->setIconFont('fa-coffee'));
63
65
64
66
$header2 = id(new PHUIActionHeaderView())
65
-
->setHeaderTitle('Public')
67
+
->setHeaderTitle('Moo')
66
68
->setHeaderColor(PHUIActionHeaderView::HEADER_GREY)
67
-
->setHeaderIcon('public-dark');
69
+
->setHeaderIcon(
70
+
id(new PHUIIconView())
71
+
->setIconFont('fa-magic'));
68
72
69
73
$header3 = id(new PHUIActionHeaderView())
70
-
->setHeaderTitle('Restricted')
74
+
->setHeaderTitle('Woof')
71
75
->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTBLUE)
72
-
->setHeaderIcon('restricted-white');
76
+
->setHeaderIcon(
77
+
id(new PHUIIconView())
78
+
->setIconFont('fa-fighter-jet'));
73
79
74
80
$header4 = id(new PHUIActionHeaderView())
75
-
->setHeaderTitle('Company')
81
+
->setHeaderTitle('Buzz')
76
82
->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTGREEN)
77
-
->setHeaderIcon('company-white');
83
+
->setHeaderIcon(
84
+
id(new PHUIIconView())
85
+
->setIconFont('fa-child'));
78
86
79
87
$header5 = id(new PHUIActionHeaderView())
80
-
->setHeaderTitle('Public')
88
+
->setHeaderTitle('Fizz')
81
89
->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTRED)
82
-
->setHeaderIcon('public-white');
90
+
->setHeaderIcon(
91
+
id(new PHUIIconView())
92
+
->setIconFont('fa-car'));
83
93
84
94
$header6 = id(new PHUIActionHeaderView())
85
-
->setHeaderTitle('Restricted')
95
+
->setHeaderTitle('Blarp')
86
96
->setHeaderColor(PHUIActionHeaderView::HEADER_LIGHTVIOLET)
87
-
->setHeaderIcon('restriced-white');
97
+
->setHeaderIcon(
98
+
id(new PHUIIconView())
99
+
->setIconFont('fa-truck'));
88
100
89
101
$layout2 = id(new AphrontMultiColumnView())
90
102
->addColumn($header1)
-52
src/infrastructure/celerity/CeleritySpriteGenerator.php
-52
src/infrastructure/celerity/CeleritySpriteGenerator.php
···
2
2
3
3
final class CeleritySpriteGenerator {
4
4
5
-
public function buildMiniconsSheet() {
6
-
$icons = $this->getDirectoryList('minicons_white_1x');
7
-
8
-
$colors = array(
9
-
'white',
10
-
'dark',
11
-
);
12
-
13
-
$scales = array(
14
-
'1x' => 1,
15
-
'2x' => 2,
16
-
);
17
-
18
-
$template = id(new PhutilSprite())
19
-
->setSourceSize(16, 16);
20
-
21
-
$sprites = array();
22
-
foreach ($colors as $color) {
23
-
foreach ($icons as $icon) {
24
-
$prefix = 'minicons_';
25
-
if (strlen($color)) {
26
-
$prefix .= $color.'_';
27
-
}
28
-
29
-
$suffix = '';
30
-
if (strlen($color)) {
31
-
$suffix = '-'.$color;
32
-
}
33
-
34
-
$sprite = id(clone $template)
35
-
->setName('minicons-'.$icon.$suffix);
36
-
37
-
$sprite->setTargetCSS('.minicons-'.$icon.$suffix);
38
-
39
-
foreach ($scales as $scale_key => $scale) {
40
-
$path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png');
41
-
$sprite->setSourceFile($path, $scale);
42
-
}
43
-
$sprites[] = $sprite;
44
-
}
45
-
}
46
-
47
-
$sheet = $this->buildSheet('minicons', true);
48
-
$sheet->setScales($scales);
49
-
foreach ($sprites as $sprite) {
50
-
$sheet->addSprite($sprite);
51
-
}
52
-
53
-
return $sheet;
54
-
}
55
-
56
-
57
5
public function buildMenuSheet() {
58
6
$sprites = array();
59
7
+3
-9
src/view/phui/PHUIActionHeaderView.php
+3
-9
src/view/phui/PHUIActionHeaderView.php
···
49
49
return $this;
50
50
}
51
51
52
-
public function setHeaderIcon($minicon) {
53
-
$this->headerIcon = $minicon;
52
+
public function setHeaderIcon(PHUIIconView $icon) {
53
+
$this->headerIcon = $icon;
54
54
return $this;
55
55
}
56
56
···
116
116
117
117
$header_icon = null;
118
118
if ($this->headerIcon) {
119
-
require_celerity_resource('sprite-minicons-css');
120
-
$header_icon = phutil_tag(
121
-
'span',
122
-
array(
123
-
'class' => 'sprite-minicons minicons-'.$this->headerIcon
124
-
),
125
-
'');
119
+
$header_icon = $this->headerIcon;
126
120
}
127
121
128
122
$header_title = $this->headerTitle;
-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
-51
webroot/rsrc/css/sprite-minicons.css
-51
webroot/rsrc/css/sprite-minicons.css
···
1
-
/**
2
-
* @provides sprite-minicons-css
3
-
* @generated
4
-
*/
5
-
6
-
.sprite-minicons {
7
-
background-image: url(/rsrc/image/sprite-minicons.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-minicons {
15
-
background-image: url(/rsrc/image/sprite-minicons-X2.png);
16
-
background-size: 51px 51px;
17
-
}
18
-
}
19
-
20
-
21
-
.minicons-company-white {
22
-
background-position: 0px 0px;
23
-
}
24
-
25
-
.minicons-move-white {
26
-
background-position: -17px 0px;
27
-
}
28
-
29
-
.minicons-public-white {
30
-
background-position: -34px 0px;
31
-
}
32
-
33
-
.minicons-restricted-white {
34
-
background-position: 0px -17px;
35
-
}
36
-
37
-
.minicons-company-dark {
38
-
background-position: -17px -17px;
39
-
}
40
-
41
-
.minicons-move-dark {
42
-
background-position: -34px -17px;
43
-
}
44
-
45
-
.minicons-public-dark {
46
-
background-position: 0px -34px;
47
-
}
48
-
49
-
.minicons-restricted-dark {
50
-
background-position: -17px -34px;
51
-
}
webroot/rsrc/image/sprite-minicons-X2.png
webroot/rsrc/image/sprite-minicons-X2.png
This is a binary file and will not be displayed.
webroot/rsrc/image/sprite-minicons.png
webroot/rsrc/image/sprite-minicons.png
This is a binary file and will not be displayed.