Skip to content

Commit 2ca269c

Browse files
committedNov 3, 2015
Replace Roboto Slab with Aleo for PHUIDocumentView
Summary: These fonts are functionally very similar, but in diagnosing a problem with mobile Safari/Chrome, it turned out that our use of "bold" with the "normal" font build created a "semibold" look when on desktop and a "normal" look on mobile. The "semibold" feel is more important, so finding a lighter "bold" font was the impetus for this font switch. As it turns out **Aleo** is built by the same author as **Lato** (our other font) and is intended as it's companion. So stylistically, this is the more correct font. Test Plan: Test Phriction, Legalpad, Diviner, Desktop and Mobile {F938013} Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D14391
1 parent 60cf71e commit 2ca269c

21 files changed

+9781
-8211
lines changed
 

‎resources/celerity/map.php

+15-11
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@
108108
'rsrc/css/core/syntax.css' => '9fd11da8',
109109
'rsrc/css/core/z-index.css' => '57ddcaa2',
110110
'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa',
111+
'rsrc/css/font/font-aleo.css' => 'b61d3062',
111112
'rsrc/css/font/font-awesome.css' => 'd2fc4e8d',
112113
'rsrc/css/font/font-lato.css' => '5ab1a46a',
113-
'rsrc/css/font/font-roboto-slab.css' => 'f0aea810',
114114
'rsrc/css/font/phui-font-icon-base.css' => 'ecbbb4c2',
115115
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
116116
'rsrc/css/layout/phabricator-hovercard-view.css' => '1239cd52',
@@ -129,7 +129,7 @@
129129
'rsrc/css/phui/phui-document-pro.css' => '5f86a934',
130130
'rsrc/css/phui/phui-document.css' => '9fa715d2',
131131
'rsrc/css/phui/phui-feed-story.css' => 'b7b26d23',
132-
'rsrc/css/phui/phui-fontkit.css' => '7837a28c',
132+
'rsrc/css/phui/phui-fontkit.css' => 'c9d63950',
133133
'rsrc/css/phui/phui-form-view.css' => '621b21c5',
134134
'rsrc/css/phui/phui-form.css' => 'afdb2c6e',
135135
'rsrc/css/phui/phui-header-view.css' => '55bb32dd',
@@ -157,6 +157,14 @@
157157
'rsrc/css/sprite-menu.css' => '9dd65b92',
158158
'rsrc/css/sprite-projects.css' => 'e5ad842a',
159159
'rsrc/css/sprite-tokens.css' => '4f399012',
160+
'rsrc/externals/font/aleo/aleo-bold.eot' => 'd3d3bed7',
161+
'rsrc/externals/font/aleo/aleo-bold.ttf' => '4b08bef0',
162+
'rsrc/externals/font/aleo/aleo-bold.woff' => '93b513a1',
163+
'rsrc/externals/font/aleo/aleo-bold.woff2' => '75fbf322',
164+
'rsrc/externals/font/aleo/aleo-regular.eot' => 'a4e29e2f',
165+
'rsrc/externals/font/aleo/aleo-regular.ttf' => '751e7479',
166+
'rsrc/externals/font/aleo/aleo-regular.woff' => 'c3744be9',
167+
'rsrc/externals/font/aleo/aleo-regular.woff2' => '851aa0ee',
160168
'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '7d5a4653',
161169
'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => '531835e8',
162170
'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => '427fe363',
@@ -177,10 +185,6 @@
177185
'rsrc/externals/font/lato/lato-regular.ttf' => 'e270165b',
178186
'rsrc/externals/font/lato/lato-regular.woff' => '13d39fe2',
179187
'rsrc/externals/font/lato/lato-regular.woff2' => '57a9f742',
180-
'rsrc/externals/font/robotoslab/robotoslab-regular.eot' => '22ac1af2',
181-
'rsrc/externals/font/robotoslab/robotoslab-regular.ttf' => '72429f38',
182-
'rsrc/externals/font/robotoslab/robotoslab-regular.woff' => 'd685f38a',
183-
'rsrc/externals/font/robotoslab/robotoslab-regular.woff2' => '075c143c',
184188
'rsrc/externals/javelin/core/Event.js' => '85ea0626',
185189
'rsrc/externals/javelin/core/Stratcom.js' => '6c53634d',
186190
'rsrc/externals/javelin/core/__tests__/event-stop-and-kill.js' => '717554e4',
@@ -525,9 +529,9 @@
525529
'diffusion-readme-css' => '2106ea08',
526530
'diffusion-source-css' => '075ba788',
527531
'diviner-shared-css' => 'aa3656aa',
532+
'font-aleo' => 'b61d3062',
528533
'font-fontawesome' => 'd2fc4e8d',
529534
'font-lato' => '5ab1a46a',
530-
'font-roboto-slab' => 'f0aea810',
531535
'global-drag-and-drop-css' => '697324ad',
532536
'harbormaster-css' => 'b0758ca5',
533537
'herald-css' => '826075fa',
@@ -780,7 +784,7 @@
780784
'phui-document-view-pro-css' => '5f86a934',
781785
'phui-feed-story-css' => 'b7b26d23',
782786
'phui-font-icon-base-css' => 'ecbbb4c2',
783-
'phui-fontkit-css' => '7837a28c',
787+
'phui-fontkit-css' => 'c9d63950',
784788
'phui-form-css' => 'afdb2c6e',
785789
'phui-form-view-css' => '621b21c5',
786790
'phui-header-view-css' => '55bb32dd',
@@ -1713,6 +1717,9 @@
17131717
'javelin-dom',
17141718
'javelin-util',
17151719
),
1720+
'b61d3062' => array(
1721+
'phui-fontkit-css',
1722+
),
17161723
'b6993408' => array(
17171724
'javelin-behavior',
17181725
'javelin-stratcom',
@@ -1948,9 +1955,6 @@
19481955
'javelin-workflow',
19491956
'javelin-json',
19501957
),
1951-
'f0aea810' => array(
1952-
'phui-fontkit-css',
1953-
),
19541958
'f36e01af' => array(
19551959
'javelin-behavior',
19561960
'javelin-behavior-device',

‎src/view/page/PhabricatorStandardPageView.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ protected function willRenderPage() {
180180
require_celerity_resource('phabricator-standard-page-view');
181181
require_celerity_resource('conpherence-durable-column-view');
182182
require_celerity_resource('font-lato');
183-
require_celerity_resource('font-roboto-slab');
183+
require_celerity_resource('font-aleo');
184184

185185
Javelin::initBehavior('workflow', array());
186186

‎webroot/rsrc/css/font/font-aleo.css

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/**
2+
* @provides font-aleo
3+
* @requires phui-fontkit-css
4+
*/
5+
6+
@font-face {
7+
font-family: 'Aleo';
8+
font-weight: bold;
9+
font-style: normal;
10+
src: url(/rsrc/externals/font/aleo/aleo-bold.eot);
11+
src: url(/rsrc/externals/font/aleo/aleo-bold.eot?#iefix)
12+
format('embedded-opentype'),
13+
url(/rsrc/externals/font/aleo/aleo-bold.woff2)
14+
format('woff2'),
15+
url(/rsrc/externals/font/aleo/aleo-bold.woff)
16+
format('woff'),
17+
url(/rsrc/externals/font/aleo/aleo-bold.ttf)
18+
format('truetype'),
19+
url(/rsrc/externals/font/aleo/aleo-bold.svg#aleo-bold)
20+
format('svg');
21+
22+
}
23+
24+
@font-face {
25+
font-family: 'Aleo';
26+
font-weight: normal;
27+
font-style: normal;
28+
src: url(/rsrc/externals/font/aleo/aleo-regular.eot);
29+
src: url(/rsrc/externals/font/aleo/aleo-regular.eot?#iefix)
30+
format('embedded-opentype'),
31+
url(/rsrc/externals/font/aleo/aleo-regular.woff2)
32+
format('woff2'),
33+
url(/rsrc/externals/font/aleo/aleo-regular.woff)
34+
format('woff'),
35+
url(/rsrc/externals/font/aleo/aleo-regular.ttf)
36+
format('truetype'),
37+
url(/rsrc/externals/font/aleo/aleo-regular.svg#aleo-regular)
38+
format('svg');
39+
40+
}

‎webroot/rsrc/css/font/font-roboto-slab.css

-22
This file was deleted.

‎webroot/rsrc/css/phui/phui-fontkit.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
*/
1010

1111
.diviner-document-section .phui-header-header {
12-
font-family: 'Roboto Slab', {$fontfamily};
12+
font-family: 'Aleo', {$fontfamily};
1313
color: #000;
1414
}
1515

1616
.phui-document-view .phui-header-tall .phui-header-header {
17-
font-family: 'Roboto Slab', {$fontfamily};
17+
font-family: 'Aleo', {$fontfamily};
1818
}
1919

2020
.phui-document-view .phabricator-remarkup h1.remarkup-header,
@@ -23,7 +23,7 @@
2323
.phui-document-view .phabricator-remarkup h4.remarkup-header,
2424
.phui-document-view .phabricator-remarkup h5.remarkup-header,
2525
.phui-document-view .phabricator-remarkup h6.remarkup-header {
26-
font-family: 'Roboto Slab', {$fontfamily};
26+
font-family: 'Aleo', {$fontfamily};
2727
}
2828

2929
.phui-document-view .phabricator-remarkup h2.remarkup-header {
39.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)
Failed to load comments.