Skip to content

Commit dbebfea

Browse files
committed
FontAwesome RemarkupBar
Summary: Replaces the icons with fonts from FontAwesome. Up in the air about the meme icon. Thoughts? Also removed the second fullscreen/normal state. Seems obvious what it does, but assume someone complained previously? Test Plan: Tested all the icon states and made sure they still worked. Test fullscreen and help. {F163485} Reviewers: epriestley Reviewed By: epriestley Subscribers: epriestley, Korvin Differential Revision: https://secure.phabricator.com/D9385
1 parent f9a920f commit dbebfea

File tree

11 files changed

+90
-323
lines changed

11 files changed

+90
-323
lines changed

resources/celerity/map.php

Lines changed: 48 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
return array(
88
'names' =>
99
array(
10-
'core.pkg.css' => 'baca3efb',
11-
'core.pkg.js' => '29e9786d',
10+
'core.pkg.css' => 'd9c53a92',
11+
'core.pkg.js' => 'b6689fe1',
1212
'darkconsole.pkg.js' => 'ca8671ce',
1313
'differential.pkg.css' => '4a93db37',
1414
'differential.pkg.js' => 'eca39a2c',
@@ -105,7 +105,7 @@
105105
'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
106106
'rsrc/css/application/uiexample/example.css' => '528b19de',
107107
'rsrc/css/core/core.css' => '40151074',
108-
'rsrc/css/core/remarkup.css' => '80c3a48c',
108+
'rsrc/css/core/remarkup.css' => 'b510c359',
109109
'rsrc/css/core/syntax.css' => '3c18c1cb',
110110
'rsrc/css/core/z-index.css' => 'efb673ac',
111111
'rsrc/css/diviner/diviner-shared.css' => '38813222',
@@ -157,7 +157,6 @@
157157
'rsrc/css/sprite-minicons.css' => 'df4f76fe',
158158
'rsrc/css/sprite-payments.css' => 'cc085d44',
159159
'rsrc/css/sprite-projects.css' => '7578fa56',
160-
'rsrc/css/sprite-remarkup.css' => '5c396a57',
161160
'rsrc/css/sprite-tokens.css' => '1706b943',
162161
'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '1cab0752',
163162
'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => '2ff84fd2',
@@ -324,8 +323,6 @@
324323
'rsrc/image/sprite-payments.png' => 'd8576309',
325324
'rsrc/image/sprite-projects-X2.png' => '218fdc8b',
326325
'rsrc/image/sprite-projects.png' => '631ff9a7',
327-
'rsrc/image/sprite-remarkup-X2.png' => '7ee1dc28',
328-
'rsrc/image/sprite-remarkup.png' => 'b4421f07',
329326
'rsrc/image/sprite-tokens-X2.png' => 'b4776580',
330327
'rsrc/image/sprite-tokens.png' => '25b75533',
331328
'rsrc/image/texture/card-gradient.png' => '815f26e8',
@@ -462,7 +459,7 @@
462459
'rsrc/js/core/behavior-object-selector.js' => 'e6f67523',
463460
'rsrc/js/core/behavior-oncopy.js' => 'c3e218fe',
464461
'rsrc/js/core/behavior-phabricator-nav.js' => 'b5842a5e',
465-
'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'ddee74db',
462+
'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'ba22863c',
466463
'rsrc/js/core/behavior-refresh-csrf.js' => '7814b593',
467464
'rsrc/js/core/behavior-remarkup-preview.js' => 'f7379f45',
468465
'rsrc/js/core/behavior-reorder-applications.js' => 'a8e3795d',
@@ -605,7 +602,7 @@
605602
'javelin-behavior-phabricator-notification-example' => 'c51a6616',
606603
'javelin-behavior-phabricator-object-selector' => 'e6f67523',
607604
'javelin-behavior-phabricator-oncopy' => 'c3e218fe',
608-
'javelin-behavior-phabricator-remarkup-assist' => 'ddee74db',
605+
'javelin-behavior-phabricator-remarkup-assist' => 'ba22863c',
609606
'javelin-behavior-phabricator-reveal-content' => '8f24abfc',
610607
'javelin-behavior-phabricator-search-typeahead' => '86549ee3',
611608
'javelin-behavior-phabricator-show-all-transactions' => '7c273581',
@@ -718,7 +715,7 @@
718715
'phabricator-prefab' => '41ed7994',
719716
'phabricator-profile-css' => '33e6f703',
720717
'phabricator-project-tag-css' => '095c9404',
721-
'phabricator-remarkup-css' => '80c3a48c',
718+
'phabricator-remarkup-css' => 'b510c359',
722719
'phabricator-search-results-css' => 'f240504c',
723720
'phabricator-shaped-request' => '7cbe244b',
724721
'phabricator-side-menu-view-css' => 'a2ccd7bd',
@@ -806,7 +803,6 @@
806803
'sprite-minicons-css' => 'df4f76fe',
807804
'sprite-payments-css' => 'cc085d44',
808805
'sprite-projects-css' => '7578fa56',
809-
'sprite-remarkup-css' => '5c396a57',
810806
'sprite-tokens-css' => '1706b943',
811807
'subscribers-list-css' => '5bb30c78',
812808
'syntax-highlighting-css' => '3c18c1cb',
@@ -1692,6 +1688,16 @@
16921688
0 => 'javelin-install',
16931689
1 => 'javelin-dom',
16941690
),
1691+
'ba22863c' =>
1692+
array(
1693+
0 => 'javelin-behavior',
1694+
1 => 'javelin-stratcom',
1695+
2 => 'javelin-dom',
1696+
3 => 'phabricator-phtize',
1697+
4 => 'phabricator-textareautils',
1698+
5 => 'javelin-workflow',
1699+
6 => 'javelin-vector',
1700+
),
16951701
'bc75da74' =>
16961702
array(
16971703
0 => 'javelin-behavior',
@@ -1905,16 +1911,6 @@
19051911
1 => 'javelin-dom',
19061912
2 => 'phabricator-prefab',
19071913
),
1908-
'ddee74db' =>
1909-
array(
1910-
0 => 'javelin-behavior',
1911-
1 => 'javelin-stratcom',
1912-
2 => 'javelin-dom',
1913-
3 => 'phabricator-phtize',
1914-
4 => 'phabricator-textareautils',
1915-
5 => 'javelin-workflow',
1916-
6 => 'javelin-vector',
1917-
),
19181914
'e1ff79b1' =>
19191915
array(
19201916
0 => 'javelin-behavior',
@@ -2132,39 +2128,38 @@
21322128
15 => 'aphront-tooltip-css',
21332129
16 => 'phabricator-flag-css',
21342130
17 => 'aphront-error-view-css',
2135-
18 => 'sprite-remarkup-css',
2136-
19 => 'sprite-gradient-css',
2137-
20 => 'sprite-menu-css',
2138-
21 => 'sprite-apps-css',
2139-
22 => 'sprite-apps-large-css',
2140-
23 => 'phabricator-main-menu-view',
2141-
24 => 'phabricator-notification-css',
2142-
25 => 'phabricator-notification-menu-css',
2143-
26 => 'lightbox-attachment-css',
2144-
27 => 'phui-header-view-css',
2145-
28 => 'phabricator-filetree-view-css',
2146-
29 => 'phabricator-nav-view-css',
2147-
30 => 'phabricator-side-menu-view-css',
2148-
31 => 'phabricator-crumbs-view-css',
2149-
32 => 'phui-object-item-list-view-css',
2150-
33 => 'global-drag-and-drop-css',
2151-
34 => 'phui-spacing-css',
2152-
35 => 'phui-form-css',
2153-
36 => 'phui-icon-view-css',
2154-
37 => 'phabricator-application-launch-view-css',
2155-
38 => 'phabricator-action-list-view-css',
2156-
39 => 'phui-property-list-view-css',
2157-
40 => 'phui-tag-view-css',
2158-
41 => 'phui-list-view-css',
2159-
42 => 'font-fontawesome',
2160-
43 => 'phui-font-icon-base-css',
2161-
44 => 'sprite-main-header-css',
2162-
45 => 'phui-box-css',
2163-
46 => 'phui-object-box-css',
2164-
47 => 'phui-timeline-view-css',
2165-
48 => 'sprite-tokens-css',
2166-
49 => 'tokens-css',
2167-
50 => 'phui-status-list-view-css',
2131+
18 => 'sprite-gradient-css',
2132+
19 => 'sprite-menu-css',
2133+
20 => 'sprite-apps-css',
2134+
21 => 'sprite-apps-large-css',
2135+
22 => 'phabricator-main-menu-view',
2136+
23 => 'phabricator-notification-css',
2137+
24 => 'phabricator-notification-menu-css',
2138+
25 => 'lightbox-attachment-css',
2139+
26 => 'phui-header-view-css',
2140+
27 => 'phabricator-filetree-view-css',
2141+
28 => 'phabricator-nav-view-css',
2142+
29 => 'phabricator-side-menu-view-css',
2143+
30 => 'phabricator-crumbs-view-css',
2144+
31 => 'phui-object-item-list-view-css',
2145+
32 => 'global-drag-and-drop-css',
2146+
33 => 'phui-spacing-css',
2147+
34 => 'phui-form-css',
2148+
35 => 'phui-icon-view-css',
2149+
36 => 'phabricator-application-launch-view-css',
2150+
37 => 'phabricator-action-list-view-css',
2151+
38 => 'phui-property-list-view-css',
2152+
39 => 'phui-tag-view-css',
2153+
40 => 'phui-list-view-css',
2154+
41 => 'font-fontawesome',
2155+
42 => 'phui-font-icon-base-css',
2156+
43 => 'sprite-main-header-css',
2157+
44 => 'phui-box-css',
2158+
45 => 'phui-object-box-css',
2159+
46 => 'phui-timeline-view-css',
2160+
47 => 'sprite-tokens-css',
2161+
48 => 'tokens-css',
2162+
49 => 'phui-status-list-view-css',
21682163
),
21692164
'core.pkg.js' =>
21702165
array(

resources/celerity/packages.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
'phabricator-flag-css',
9292
'aphront-error-view-css',
9393

94-
'sprite-remarkup-css',
9594
'sprite-gradient-css',
9695
'sprite-menu-css',
9796
'sprite-apps-css',

resources/sprite/manifest/remarkup.json

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

scripts/celerity/generate_sprites.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
$generator = new CeleritySpriteGenerator();
2828

2929
$sheets = array(
30-
'remarkup' => $generator->buildRemarkupSheet(),
3130
'menu' => $generator->buildMenuSheet(),
3231
'apps' => $generator->buildAppsSheet(),
3332
'minicons' => $generator->buildMiniconsSheet(),

src/infrastructure/celerity/CeleritySpriteGenerator.php

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,6 @@
22

33
final class CeleritySpriteGenerator {
44

5-
public function buildRemarkupSheet() {
6-
7-
$scales = array(
8-
'1x' => 1,
9-
'2x' => 2,
10-
);
11-
$sprites = array();
12-
13-
$template = id(new PhutilSprite())
14-
->setSourceSize(14, 14);
15-
16-
$remarkup_icons = $this->getDirectoryList('remarkup_1x');
17-
foreach ($remarkup_icons as $icon) {
18-
$prefix = 'remarkup_';
19-
20-
// Strip 'text_' from these file names.
21-
$class_name = substr($icon, 5);
22-
23-
if ($class_name == 'fullscreen_off') {
24-
$tcss = '.remarkup-control-fullscreen-mode .remarkup-assist-fullscreen';
25-
} else {
26-
$tcss = '.remarkup-assist-'.$class_name;
27-
}
28-
29-
$sprite = id(clone $template)
30-
->setName('remarkup-assist-'.$icon)
31-
->setTargetCSS($tcss);
32-
33-
foreach ($scales as $scale_key => $scale) {
34-
$path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png');
35-
$sprite->setSourceFile($path, $scale);
36-
}
37-
$sprites[] = $sprite;
38-
}
39-
40-
$sheet = $this->buildSheet('remarkup', true);
41-
$sheet->setScales($scales);
42-
foreach ($sprites as $sprite) {
43-
$sheet->addSprite($sprite);
44-
}
45-
46-
return $sheet;
47-
}
48-
495
public function buildMiniconsSheet() {
506
$icons = $this->getDirectoryList('minicons_white_1x');
517

0 commit comments

Comments
 (0)