Page MenuHomePhabricator
Files F15443581

D11720.id28206.diff
No OneTemporary
Actions

D11720.id28206.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => 'e09f7a8c',
+ 'core.pkg.css' => 'e5d56a4a',
'core.pkg.js' => '65e04767',
'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '8af45893',
@@ -109,8 +109,8 @@
'rsrc/css/core/syntax.css' => '56c1ba38',
'rsrc/css/core/z-index.css' => '40eb7003',
'rsrc/css/diviner/diviner-shared.css' => '38813222',
- 'rsrc/css/font/font-awesome.css' => '21b0ced7',
- 'rsrc/css/font/font-source-sans-pro.css' => 'f5c0ffcb',
+ 'rsrc/css/font/font-awesome.css' => 'ae9a7b4d',
+ 'rsrc/css/font/font-source-sans-pro.css' => '0d859f60',
'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3',
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
'rsrc/css/layout/phabricator-hovercard-view.css' => '893f4783',
@@ -158,8 +158,13 @@
'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '5fb6fb0e',
'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => 'a653cb11',
'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => '80526fc8',
+ 'rsrc/externals/font/fontawesome/fontawesome-webfont.woff2' => '4924d54d',
+ 'rsrc/externals/font/sourcesans/SourceSansPro-Bold.woff2' => '165f5f74',
'rsrc/externals/font/sourcesans/SourceSansPro-BoldIt.woff' => 'd09a7d54',
+ 'rsrc/externals/font/sourcesans/SourceSansPro-BoldIt.woff2' => 'd2e33102',
'rsrc/externals/font/sourcesans/SourceSansPro-It.woff' => '3f21af52',
+ 'rsrc/externals/font/sourcesans/SourceSansPro-It.woff2' => '30a7cf60',
+ 'rsrc/externals/font/sourcesans/SourceSansPro-Regular.woff2' => 'e89b04b1',
'rsrc/externals/font/sourcesans/SourceSansPro.woff' => '3614608c',
'rsrc/externals/font/sourcesans/SourceSansProBold.woff' => 'cbf46566',
'rsrc/externals/javelin/core/Event.js' => '85ea0626',
@@ -527,8 +532,8 @@
'diffusion-icons-css' => '9c5828da',
'diffusion-source-css' => '66fdf661',
'diviner-shared-css' => '38813222',
- 'font-fontawesome' => '21b0ced7',
- 'font-source-sans-pro' => 'f5c0ffcb',
+ 'font-fontawesome' => 'ae9a7b4d',
+ 'font-source-sans-pro' => '0d859f60',
'global-drag-and-drop-css' => '697324ad',
'harbormaster-css' => '49d64eb4',
'herald-css' => '826075fa',
diff --git a/src/applications/celerity/controller/CelerityResourceController.php b/src/applications/celerity/controller/CelerityResourceController.php
--- a/src/applications/celerity/controller/CelerityResourceController.php
+++ b/src/applications/celerity/controller/CelerityResourceController.php
@@ -98,7 +98,7 @@
// NOTE: This is a piece of magic required to make WOFF fonts work in
// Firefox. Possibly we should generalize this.
- if ($type == 'woff') {
+ if ($type == 'woff' || $type == 'woff2') {
// We could be more tailored here, but it's not currently trivial to
// generate a comprehensive list of valid origins (an install may have
// arbitrarily many Phame blogs, for example), and we lose nothing by
@@ -118,6 +118,7 @@
'jpg' => 'image/jpeg',
'swf' => 'application/x-shockwave-flash',
'woff' => 'font/woff',
+ 'woff2' => 'font/woff2',
'eot' => 'font/eot',
'ttf' => 'font/ttf',
);
diff --git a/src/applications/celerity/resources/CelerityResourcesOnDisk.php b/src/applications/celerity/resources/CelerityResourcesOnDisk.php
--- a/src/applications/celerity/resources/CelerityResourcesOnDisk.php
+++ b/src/applications/celerity/resources/CelerityResourcesOnDisk.php
@@ -34,6 +34,7 @@
'gif',
'swf',
'woff',
+ 'woff2',
'ttf',
'eot',
);

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 28, 5:09 AM (3 w, 13 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7387011
Default Alt Text
D11720.id28206.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility