Skip to content

Commit ac05fe9

Browse files
committed
Replace action sprite with FontAwesome
Summary: Replaces the action icons in action headers with FontAwesome Test Plan: - grep SPRITE_ACTIONS - grep sprite-actions - Replace on UIExamples - Replace on Workboards - Replace on Dashboards - Replace on FeedStories {F157840} {F157841} Reviewers: btrahan, epriestley Reviewed By: epriestley Subscribers: epriestley, Korvin Differential Revision: https://secure.phabricator.com/D9230
1 parent 53940e2 commit ac05fe9

File tree

20 files changed

+86
-534
lines changed

20 files changed

+86
-534
lines changed

resources/celerity/map.php

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
return array(
88
'names' =>
99
array(
10-
'core.pkg.css' => '865102d6',
10+
'core.pkg.css' => '3445a3a7',
1111
'core.pkg.js' => 'ab0d6d3d',
1212
'darkconsole.pkg.js' => 'ca8671ce',
1313
'differential.pkg.css' => '382ca868',
@@ -113,8 +113,8 @@
113113
'rsrc/css/diviner/diviner-shared.css' => '38813222',
114114
'rsrc/css/font/font-awesome.css' => '73d075c3',
115115
'rsrc/css/font/font-source-sans-pro.css' => '91d53463',
116-
'rsrc/css/font/phui-font-icon-base.css' => '74cfb6a9',
117-
'rsrc/css/layout/phabricator-action-header-view.css' => '0c333cad',
116+
'rsrc/css/font/phui-font-icon-base.css' => '3b2f9260',
117+
'rsrc/css/layout/phabricator-action-header-view.css' => '40134802',
118118
'rsrc/css/layout/phabricator-action-list-view.css' => 'dcd9875f',
119119
'rsrc/css/layout/phabricator-crumbs-view.css' => '6a23399c',
120120
'rsrc/css/layout/phabricator-filetree-view.css' => 'a8c86ace',
@@ -128,12 +128,12 @@
128128
'rsrc/css/phui/phui-box.css' => '7b3a2eed',
129129
'rsrc/css/phui/phui-button.css' => '3dbdbf0d',
130130
'rsrc/css/phui/phui-document.css' => '3b078dc0',
131-
'rsrc/css/phui/phui-feed-story.css' => '3a59c2cf',
131+
'rsrc/css/phui/phui-feed-story.css' => '37216a85',
132132
'rsrc/css/phui/phui-fontkit.css' => 'de84aa4a',
133133
'rsrc/css/phui/phui-form-view.css' => '867463b4',
134134
'rsrc/css/phui/phui-form.css' => 'b78ec020',
135135
'rsrc/css/phui/phui-header-view.css' => '689dbc38',
136-
'rsrc/css/phui/phui-icon.css' => 'ef701b9b',
136+
'rsrc/css/phui/phui-icon.css' => 'cdcf2aca',
137137
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
138138
'rsrc/css/phui/phui-list.css' => 'ce29d035',
139139
'rsrc/css/phui/phui-object-box.css' => 'ce92d8ec',
@@ -148,7 +148,6 @@
148148
'rsrc/css/phui/phui-timeline-view.css' => '15ff2a9f',
149149
'rsrc/css/phui/phui-workboard-view.css' => '2bf82d00',
150150
'rsrc/css/phui/phui-workpanel-view.css' => 'fddd97bf',
151-
'rsrc/css/sprite-actions.css' => '969ad0e5',
152151
'rsrc/css/sprite-apps-large.css' => '76d8716b',
153152
'rsrc/css/sprite-apps-xlarge.css' => 'db66c878',
154153
'rsrc/css/sprite-apps.css' => '600df7dd',
@@ -308,8 +307,6 @@
308307
'rsrc/image/phrequent_inactive.png' => 'bfc15a69',
309308
'rsrc/image/search-white.png' => '64cc0d45',
310309
'rsrc/image/search.png' => '82625a7e',
311-
'rsrc/image/sprite-actions-X2.png' => '7dfd5652',
312-
'rsrc/image/sprite-actions.png' => '2ddd18c3',
313310
'rsrc/image/sprite-apps-X2.png' => '55b68035',
314311
'rsrc/image/sprite-apps-large-X2.png' => 'becb43e7',
315312
'rsrc/image/sprite-apps-large.png' => '6c673dd5',
@@ -691,7 +688,7 @@
691688
'paste-css' => 'aa1767d1',
692689
'path-typeahead' => 'f7fc67ec',
693690
'people-profile-css' => 'ba7b2762',
694-
'phabricator-action-header-view-css' => '0c333cad',
691+
'phabricator-action-header-view-css' => '40134802',
695692
'phabricator-action-list-view-css' => 'dcd9875f',
696693
'phabricator-application-launch-view-css' => 'd290ba21',
697694
'phabricator-busy' => '6453c869',
@@ -761,13 +758,13 @@
761758
'phui-calendar-list-css' => 'c1d0ca59',
762759
'phui-calendar-month-css' => 'a92e47d2',
763760
'phui-document-view-css' => '3b078dc0',
764-
'phui-feed-story-css' => '3a59c2cf',
765-
'phui-font-icon-base-css' => '74cfb6a9',
761+
'phui-feed-story-css' => '37216a85',
762+
'phui-font-icon-base-css' => '3b2f9260',
766763
'phui-fontkit-css' => 'de84aa4a',
767764
'phui-form-css' => 'b78ec020',
768765
'phui-form-view-css' => '867463b4',
769766
'phui-header-view-css' => '689dbc38',
770-
'phui-icon-view-css' => 'ef701b9b',
767+
'phui-icon-view-css' => 'cdcf2aca',
771768
'phui-info-panel-css' => '27ea50a1',
772769
'phui-list-view-css' => 'ce29d035',
773770
'phui-object-box-css' => 'ce92d8ec',
@@ -800,7 +797,6 @@
800797
'releeph-request-differential-create-dialog' => '8d8b92cd',
801798
'releeph-request-typeahead-css' => '667a48ae',
802799
'setup-issue-css' => '69e640e7',
803-
'sprite-actions-css' => '969ad0e5',
804800
'sprite-apps-css' => '600df7dd',
805801
'sprite-apps-large-css' => '76d8716b',
806802
'sprite-apps-xlarge-css' => 'db66c878',

resources/sprite/manifest/actions.json

Lines changed: 0 additions & 206 deletions
This file was deleted.

scripts/celerity/generate_sprites.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
'remarkup' => $generator->buildRemarkupSheet(),
3131
'menu' => $generator->buildMenuSheet(),
3232
'apps' => $generator->buildAppsSheet(),
33-
'actions' => $generator->buildActionsSheet(),
3433
'minicons' => $generator->buildMiniconsSheet(),
3534
'conpherence' => $generator->buildConpherenceSheet(),
3635
'apps-large' => $generator->buildAppsLargeSheet(),

src/applications/conpherence/controller/ConpherenceWidgetController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ private function renderWidgetPaneContent() {
6666

6767
$widgets = array();
6868
$new_icon = id(new PHUIIconView())
69-
->setSpriteSheet(PHUIIconView::SPRITE_ACTIONS)
70-
->setSpriteIcon('new-grey')
69+
->setIconFont('fa-plus')
7170
->setHref($this->getWidgetURI())
7271
->setMetadata(array('widget' => null))
7372
->addSigil('conpherence-widget-adder');

src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,7 @@ private function addPanelHeaderActions(
229229
$edit_uri->setQueryParam('dashboardID', $dashboard_id);
230230
}
231231
$action_edit = id(new PHUIIconView())
232-
->setSpriteSheet(PHUIIconView::SPRITE_ACTIONS)
233-
->setSpriteIcon('settings-grey')
232+
->setIconFont('fa-pencil')
234233
->setHref((string) $edit_uri);
235234
$header->addAction($action_edit);
236235

@@ -239,8 +238,7 @@ private function addPanelHeaderActions(
239238
'/dashboard/removepanel/'.$dashboard_id.'/'))
240239
->setQueryParam('panelPHID', $panel->getPHID());
241240
$action_remove = id(new PHUIIconView())
242-
->setSpriteSheet(PHUIIconView::SPRITE_ACTIONS)
243-
->setSpriteIcon('close-grey')
241+
->setIconFont('fa-trash-o')
244242
->setHref((string) $uri)
245243
->setWorkflow(true);
246244
$header->addAction($action_remove);

src/applications/project/controller/PhabricatorProjectBoardViewController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,7 @@ public function processRequest() {
165165
$panel->setEditURI('column/'.$column->getID().'/');
166166
}
167167
$panel->setHeaderAction(id(new PHUIIconView())
168-
->setSpriteSheet(PHUIIconView::SPRITE_ACTIONS)
169-
->setSpriteIcon('new-grey')
168+
->setIconFont('fa-plus')
170169
->setHref('/maniphest/task/create/')
171170
->addSigil('column-add-task')
172171
->setMetadata(

src/applications/uiexample/examples/PHUIFeedStoryExample.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ public function renderExample() {
6666
$text = hsprintf('<strong><a>harding (Tom Harding)</a></strong> awarded '.
6767
'<a>M10: Workboards</a> a token.');
6868
$action1 = id(new PHUIIconView())
69-
->setSpriteSheet(PHUIIconView::SPRITE_ACTIONS)
70-
->setSpriteIcon('token-grey')
69+
->setIconFont('fa-trophy bluegrey')
7170
->setHref('#');
7271
$token =
7372
id(new PHUIIconView())
@@ -87,12 +86,10 @@ public function renderExample() {
8786
$text = hsprintf('<strong><a>wgharding (Warren Harding)</a></strong> '.
8887
'asked a new question.');
8988
$action1 = id(new PHUIIconView())
90-
->setSpriteSheet(PHUIIconView::SPRITE_ACTIONS)
91-
->setSpriteIcon('up-grey')
89+
->setIconFont('fa-chevron-up bluegrey')
9290
->setHref('#');
9391
$action2 = id(new PHUIIconView())
94-
->setSpriteSheet(PHUIIconView::SPRITE_ACTIONS)
95-
->setSpriteIcon('down-grey')
92+
->setIconFont('fa-chevron-down bluegrey')
9693
->setHref('#');
9794
$story4 = id(new PHUIFeedStoryView())
9895
->setTitle($text)

0 commit comments

Comments
 (0)