diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 092d0c3188..2046d254c6 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -108,9 +108,9 @@ return array(
'rsrc/css/core/syntax.css' => '9fd11da8',
'rsrc/css/core/z-index.css' => '57ddcaa2',
'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa',
+ 'rsrc/css/font/font-aleo.css' => 'b61d3062',
'rsrc/css/font/font-awesome.css' => 'd2fc4e8d',
'rsrc/css/font/font-lato.css' => '5ab1a46a',
- 'rsrc/css/font/font-roboto-slab.css' => 'f0aea810',
'rsrc/css/font/phui-font-icon-base.css' => 'ecbbb4c2',
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
'rsrc/css/layout/phabricator-hovercard-view.css' => '1239cd52',
@@ -129,7 +129,7 @@ return array(
'rsrc/css/phui/phui-document-pro.css' => '5f86a934',
'rsrc/css/phui/phui-document.css' => '9fa715d2',
'rsrc/css/phui/phui-feed-story.css' => 'b7b26d23',
- 'rsrc/css/phui/phui-fontkit.css' => '7837a28c',
+ 'rsrc/css/phui/phui-fontkit.css' => 'c9d63950',
'rsrc/css/phui/phui-form-view.css' => '621b21c5',
'rsrc/css/phui/phui-form.css' => 'afdb2c6e',
'rsrc/css/phui/phui-header-view.css' => '55bb32dd',
@@ -157,6 +157,14 @@ return array(
'rsrc/css/sprite-menu.css' => '9dd65b92',
'rsrc/css/sprite-projects.css' => 'e5ad842a',
'rsrc/css/sprite-tokens.css' => '4f399012',
+ 'rsrc/externals/font/aleo/aleo-bold.eot' => 'd3d3bed7',
+ 'rsrc/externals/font/aleo/aleo-bold.ttf' => '4b08bef0',
+ 'rsrc/externals/font/aleo/aleo-bold.woff' => '93b513a1',
+ 'rsrc/externals/font/aleo/aleo-bold.woff2' => '75fbf322',
+ 'rsrc/externals/font/aleo/aleo-regular.eot' => 'a4e29e2f',
+ 'rsrc/externals/font/aleo/aleo-regular.ttf' => '751e7479',
+ 'rsrc/externals/font/aleo/aleo-regular.woff' => 'c3744be9',
+ 'rsrc/externals/font/aleo/aleo-regular.woff2' => '851aa0ee',
'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '7d5a4653',
'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => '531835e8',
'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => '427fe363',
@@ -177,10 +185,6 @@ return array(
'rsrc/externals/font/lato/lato-regular.ttf' => 'e270165b',
'rsrc/externals/font/lato/lato-regular.woff' => '13d39fe2',
'rsrc/externals/font/lato/lato-regular.woff2' => '57a9f742',
- 'rsrc/externals/font/robotoslab/robotoslab-regular.eot' => '22ac1af2',
- 'rsrc/externals/font/robotoslab/robotoslab-regular.ttf' => '72429f38',
- 'rsrc/externals/font/robotoslab/robotoslab-regular.woff' => 'd685f38a',
- 'rsrc/externals/font/robotoslab/robotoslab-regular.woff2' => '075c143c',
'rsrc/externals/javelin/core/Event.js' => '85ea0626',
'rsrc/externals/javelin/core/Stratcom.js' => '6c53634d',
'rsrc/externals/javelin/core/__tests__/event-stop-and-kill.js' => '717554e4',
@@ -525,9 +529,9 @@ return array(
'diffusion-readme-css' => '2106ea08',
'diffusion-source-css' => '075ba788',
'diviner-shared-css' => 'aa3656aa',
+ 'font-aleo' => 'b61d3062',
'font-fontawesome' => 'd2fc4e8d',
'font-lato' => '5ab1a46a',
- 'font-roboto-slab' => 'f0aea810',
'global-drag-and-drop-css' => '697324ad',
'harbormaster-css' => 'b0758ca5',
'herald-css' => '826075fa',
@@ -780,7 +784,7 @@ return array(
'phui-document-view-pro-css' => '5f86a934',
'phui-feed-story-css' => 'b7b26d23',
'phui-font-icon-base-css' => 'ecbbb4c2',
- 'phui-fontkit-css' => '7837a28c',
+ 'phui-fontkit-css' => 'c9d63950',
'phui-form-css' => 'afdb2c6e',
'phui-form-view-css' => '621b21c5',
'phui-header-view-css' => '55bb32dd',
@@ -1713,6 +1717,9 @@ return array(
'javelin-dom',
'javelin-util',
),
+ 'b61d3062' => array(
+ 'phui-fontkit-css',
+ ),
'b6993408' => array(
'javelin-behavior',
'javelin-stratcom',
@@ -1948,9 +1955,6 @@ return array(
'javelin-workflow',
'javelin-json',
),
- 'f0aea810' => array(
- 'phui-fontkit-css',
- ),
'f36e01af' => array(
'javelin-behavior',
'javelin-behavior-device',
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index 7e9733e1d4..b13df8e8c5 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -180,7 +180,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
require_celerity_resource('phabricator-standard-page-view');
require_celerity_resource('conpherence-durable-column-view');
require_celerity_resource('font-lato');
- require_celerity_resource('font-roboto-slab');
+ require_celerity_resource('font-aleo');
Javelin::initBehavior('workflow', array());
diff --git a/webroot/rsrc/css/font/font-aleo.css b/webroot/rsrc/css/font/font-aleo.css
new file mode 100644
index 0000000000..91ef6e2dc4
--- /dev/null
+++ b/webroot/rsrc/css/font/font-aleo.css
@@ -0,0 +1,40 @@
+/**
+ * @provides font-aleo
+ * @requires phui-fontkit-css
+ */
+
+@font-face {
+ font-family: 'Aleo';
+ font-weight: bold;
+ font-style: normal;
+ src: url(/rsrc/externals/font/aleo/aleo-bold.eot);
+ src: url(/rsrc/externals/font/aleo/aleo-bold.eot?#iefix)
+ format('embedded-opentype'),
+ url(/rsrc/externals/font/aleo/aleo-bold.woff2)
+ format('woff2'),
+ url(/rsrc/externals/font/aleo/aleo-bold.woff)
+ format('woff'),
+ url(/rsrc/externals/font/aleo/aleo-bold.ttf)
+ format('truetype'),
+ url(/rsrc/externals/font/aleo/aleo-bold.svg#aleo-bold)
+ format('svg');
+
+}
+
+@font-face {
+ font-family: 'Aleo';
+ font-weight: normal;
+ font-style: normal;
+ src: url(/rsrc/externals/font/aleo/aleo-regular.eot);
+ src: url(/rsrc/externals/font/aleo/aleo-regular.eot?#iefix)
+ format('embedded-opentype'),
+ url(/rsrc/externals/font/aleo/aleo-regular.woff2)
+ format('woff2'),
+ url(/rsrc/externals/font/aleo/aleo-regular.woff)
+ format('woff'),
+ url(/rsrc/externals/font/aleo/aleo-regular.ttf)
+ format('truetype'),
+ url(/rsrc/externals/font/aleo/aleo-regular.svg#aleo-regular)
+ format('svg');
+
+}
diff --git a/webroot/rsrc/css/font/font-roboto-slab.css b/webroot/rsrc/css/font/font-roboto-slab.css
deleted file mode 100644
index fbfd5c7a35..0000000000
--- a/webroot/rsrc/css/font/font-roboto-slab.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @provides font-roboto-slab
- * @requires phui-fontkit-css
- */
-
-@font-face {
- font-family: 'Roboto Slab';
- font-weight: normal;
- font-style: normal;
- src: url(/rsrc/externals/font/robotoslab/robotoslab-regular.eot);
- src: url(/rsrc/externals/font/robotoslab/robotoslab-regular.eot?#iefix)
- format('embedded-opentype'),
- url(/rsrc/externals/font/robotoslab/robotoslab-regular.woff2)
- format('woff2'),
- url(/rsrc/externals/font/robotoslab/robotoslab-regular.woff)
- format('woff'),
- url(/rsrc/externals/font/robotoslab/robotoslab-regular.ttf)
- format('truetype'),
- url(/rsrc/externals/font/robotoslab/robotoslab-regular.svg#roboto_slabregular)
- format('svg');
-
-}
diff --git a/webroot/rsrc/css/phui/phui-fontkit.css b/webroot/rsrc/css/phui/phui-fontkit.css
index f198f0c2c8..80a12f881a 100644
--- a/webroot/rsrc/css/phui/phui-fontkit.css
+++ b/webroot/rsrc/css/phui/phui-fontkit.css
@@ -9,12 +9,12 @@
*/
.diviner-document-section .phui-header-header {
- font-family: 'Roboto Slab', {$fontfamily};
+ font-family: 'Aleo', {$fontfamily};
color: #000;
}
.phui-document-view .phui-header-tall .phui-header-header {
- font-family: 'Roboto Slab', {$fontfamily};
+ font-family: 'Aleo', {$fontfamily};
}
.phui-document-view .phabricator-remarkup h1.remarkup-header,
@@ -23,7 +23,7 @@
.phui-document-view .phabricator-remarkup h4.remarkup-header,
.phui-document-view .phabricator-remarkup h5.remarkup-header,
.phui-document-view .phabricator-remarkup h6.remarkup-header {
- font-family: 'Roboto Slab', {$fontfamily};
+ font-family: 'Aleo', {$fontfamily};
}
.phui-document-view .phabricator-remarkup h2.remarkup-header {
diff --git a/webroot/rsrc/externals/font/robotoslab/LICENSE.txt b/webroot/rsrc/externals/font/aleo/LICENSE.txt
similarity index 100%
rename from webroot/rsrc/externals/font/robotoslab/LICENSE.txt
rename to webroot/rsrc/externals/font/aleo/LICENSE.txt
diff --git a/webroot/rsrc/externals/font/aleo/aleo-bold.eot b/webroot/rsrc/externals/font/aleo/aleo-bold.eot
new file mode 100644
index 0000000000..294fef7412
Binary files /dev/null and b/webroot/rsrc/externals/font/aleo/aleo-bold.eot differ
diff --git a/webroot/rsrc/externals/font/aleo/aleo-bold.svg b/webroot/rsrc/externals/font/aleo/aleo-bold.svg
new file mode 100644
index 0000000000..e49c14686d
--- /dev/null
+++ b/webroot/rsrc/externals/font/aleo/aleo-bold.svg
@@ -0,0 +1,5078 @@
+
+
+
\ No newline at end of file
diff --git a/webroot/rsrc/externals/font/aleo/aleo-bold.ttf b/webroot/rsrc/externals/font/aleo/aleo-bold.ttf
new file mode 100644
index 0000000000..b05d3e78e2
Binary files /dev/null and b/webroot/rsrc/externals/font/aleo/aleo-bold.ttf differ
diff --git a/webroot/rsrc/externals/font/aleo/aleo-bold.woff b/webroot/rsrc/externals/font/aleo/aleo-bold.woff
new file mode 100644
index 0000000000..a2c7a9d77b
Binary files /dev/null and b/webroot/rsrc/externals/font/aleo/aleo-bold.woff differ
diff --git a/webroot/rsrc/externals/font/aleo/aleo-bold.woff2 b/webroot/rsrc/externals/font/aleo/aleo-bold.woff2
new file mode 100644
index 0000000000..9f91470113
Binary files /dev/null and b/webroot/rsrc/externals/font/aleo/aleo-bold.woff2 differ
diff --git a/webroot/rsrc/externals/font/aleo/aleo-regular.eot b/webroot/rsrc/externals/font/aleo/aleo-regular.eot
new file mode 100644
index 0000000000..d73b2fa04b
Binary files /dev/null and b/webroot/rsrc/externals/font/aleo/aleo-regular.eot differ
diff --git a/webroot/rsrc/externals/font/aleo/aleo-regular.svg b/webroot/rsrc/externals/font/aleo/aleo-regular.svg
new file mode 100644
index 0000000000..ec074310d0
--- /dev/null
+++ b/webroot/rsrc/externals/font/aleo/aleo-regular.svg
@@ -0,0 +1,4644 @@
+
+
+
\ No newline at end of file
diff --git a/webroot/rsrc/externals/font/aleo/aleo-regular.ttf b/webroot/rsrc/externals/font/aleo/aleo-regular.ttf
new file mode 100644
index 0000000000..dd20f0c10f
Binary files /dev/null and b/webroot/rsrc/externals/font/aleo/aleo-regular.ttf differ
diff --git a/webroot/rsrc/externals/font/aleo/aleo-regular.woff b/webroot/rsrc/externals/font/aleo/aleo-regular.woff
new file mode 100644
index 0000000000..f484ee8aa6
Binary files /dev/null and b/webroot/rsrc/externals/font/aleo/aleo-regular.woff differ
diff --git a/webroot/rsrc/externals/font/aleo/aleo-regular.woff2 b/webroot/rsrc/externals/font/aleo/aleo-regular.woff2
new file mode 100644
index 0000000000..31f38c898f
Binary files /dev/null and b/webroot/rsrc/externals/font/aleo/aleo-regular.woff2 differ
diff --git a/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.eot b/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.eot
deleted file mode 100644
index 33702dad1f..0000000000
Binary files a/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.eot and /dev/null differ
diff --git a/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.svg b/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.svg
deleted file mode 100644
index cd2009dbe6..0000000000
--- a/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.svg
+++ /dev/null
@@ -1,8174 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.ttf b/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.ttf
deleted file mode 100644
index 20a034a4c4..0000000000
Binary files a/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.ttf and /dev/null differ
diff --git a/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.woff b/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.woff
deleted file mode 100644
index d54a761d5f..0000000000
Binary files a/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.woff and /dev/null differ
diff --git a/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.woff2 b/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.woff2
deleted file mode 100644
index 10a5ab7102..0000000000
Binary files a/webroot/rsrc/externals/font/robotoslab/robotoslab-regular.woff2 and /dev/null differ