@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
[Redesign] Move headers to Oswald font
Summary: Ref T8099, I want to live with this for a few weeks. I've grow to like that it gives more distinction to ObjectBox Headers and fits very nicely as headers in DocumentView. Even if we don't use them for all headers, Documents are much nicer to me at least with a more visually impactful font (Source Sans doesn't make a great header).
Test Plan:
Review dashboards, objects, Diviner, Phriction, Legalpad, and misc other pages.
{F466410}
Reviewers: btrahan, epriestley
Reviewed By: epriestley
Subscribers: Korvin, epriestley
Maniphest Tasks: T8099
Differential Revision: https://secure.phabricator.com/D13127
+183
-15
+18
-7
resources/celerity/map.php
+18
-7
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => 'd9223b5d',
10
+
'core.pkg.css' => '1dd87664',
11
11
'core.pkg.js' => 'fbf1d615',
12
12
'darkconsole.pkg.js' => 'e7393ebb',
13
13
'differential.pkg.css' => 'f89b49b6',
···
112
112
'rsrc/css/core/z-index.css' => '63689f49',
113
113
'rsrc/css/diviner/diviner-shared.css' => '38813222',
114
114
'rsrc/css/font/font-awesome.css' => 'e2e712fe',
115
+
'rsrc/css/font/font-oswald.css' => '608d6059',
115
116
'rsrc/css/font/font-source-sans-pro.css' => '8906c07b',
116
117
'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3',
117
118
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
···
129
130
'rsrc/css/phui/phui-crumbs-view.css' => 'ce840ec2',
130
131
'rsrc/css/phui/phui-document.css' => '08f33f08',
131
132
'rsrc/css/phui/phui-feed-story.css' => '153a2ebf',
132
-
'rsrc/css/phui/phui-fontkit.css' => 'b664ac96',
133
+
'rsrc/css/phui/phui-fontkit.css' => '0ce97d82',
133
134
'rsrc/css/phui/phui-form-view.css' => 'a0e8f168',
134
135
'rsrc/css/phui/phui-form.css' => 'f535f938',
135
-
'rsrc/css/phui/phui-header-view.css' => '125a540c',
136
+
'rsrc/css/phui/phui-header-view.css' => '7faae760',
136
137
'rsrc/css/phui/phui-icon.css' => '88ba9081',
137
138
'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
138
139
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
139
140
'rsrc/css/phui/phui-info-view.css' => '33e54618',
140
141
'rsrc/css/phui/phui-list.css' => 'e448b6ba',
141
-
'rsrc/css/phui/phui-object-box.css' => '6f449f57',
142
+
'rsrc/css/phui/phui-object-box.css' => '1ba354f4',
142
143
'rsrc/css/phui/phui-object-item-list-view.css' => '29ded459',
143
144
'rsrc/css/phui/phui-pager.css' => 'bea33d23',
144
145
'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
···
159
160
'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => 'a653cb11',
160
161
'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => '80526fc8',
161
162
'rsrc/externals/font/fontawesome/fontawesome-webfont.woff2' => '4924d54d',
163
+
'rsrc/externals/font/oswald/Oswald-Light.eot' => 'c67ac8a7',
164
+
'rsrc/externals/font/oswald/Oswald-Light.woff' => '97d56eef',
165
+
'rsrc/externals/font/oswald/Oswald-Light.woff2' => '99a9c312',
166
+
'rsrc/externals/font/oswald/Oswald-Regular.eot' => '69bef679',
167
+
'rsrc/externals/font/oswald/Oswald-Regular.woff' => 'b9d3bc0d',
168
+
'rsrc/externals/font/oswald/Oswald-Regular.woff2' => 'c58c9b78',
162
169
'rsrc/externals/font/sourcesans/SourceSansPro-It.woff' => '3f21af52',
163
170
'rsrc/externals/font/sourcesans/SourceSansPro-It.woff2' => '30a7cf60',
164
171
'rsrc/externals/font/sourcesans/SourceSansPro-Regular.woff2' => 'e89b04b1',
···
514
521
'diffusion-source-css' => '66fdf661',
515
522
'diviner-shared-css' => '38813222',
516
523
'font-fontawesome' => 'e2e712fe',
524
+
'font-oswald' => '608d6059',
517
525
'font-source-sans-pro' => '8906c07b',
518
526
'global-drag-and-drop-css' => '697324ad',
519
527
'harbormaster-css' => '49d64eb4',
···
763
771
'phui-document-view-css' => '08f33f08',
764
772
'phui-feed-story-css' => '153a2ebf',
765
773
'phui-font-icon-base-css' => '3dad2ae3',
766
-
'phui-fontkit-css' => 'b664ac96',
774
+
'phui-fontkit-css' => '0ce97d82',
767
775
'phui-form-css' => 'f535f938',
768
776
'phui-form-view-css' => 'a0e8f168',
769
-
'phui-header-view-css' => '125a540c',
777
+
'phui-header-view-css' => '7faae760',
770
778
'phui-icon-view-css' => '88ba9081',
771
779
'phui-image-mask-css' => '5a8b09c8',
772
780
'phui-info-panel-css' => '27ea50a1',
773
781
'phui-info-view-css' => '33e54618',
774
782
'phui-inline-comment-view-css' => 'aa16f165',
775
783
'phui-list-view-css' => 'e448b6ba',
776
-
'phui-object-box-css' => '6f449f57',
784
+
'phui-object-box-css' => '1ba354f4',
777
785
'phui-object-item-list-view-css' => '29ded459',
778
786
'phui-pager-css' => 'bea33d23',
779
787
'phui-pinboard-view-css' => '2495140e',
···
1281
1289
'javelin-behavior',
1282
1290
'javelin-stratcom',
1283
1291
'javelin-dom',
1292
+
),
1293
+
'608d6059' => array(
1294
+
'phui-fontkit-css',
1284
1295
),
1285
1296
'6153c708' => array(
1286
1297
'javelin-behavior',
+3
src/applications/celerity/CelerityResourceTransformer.php
+3
src/applications/celerity/CelerityResourceTransformer.php
···
175
175
'basefont' => "13px/1.231 'Segoe UI', 'Segoe UI Web Regular', ".
176
176
"'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif",
177
177
178
+
'fontfamily' => "'Segoe UI', 'Segoe UI Web Regular', ".
179
+
"'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif",
180
+
178
181
// Drop Shadow
179
182
'dropshadow' => '0 1px 6px rgba(0, 0, 0, .25)',
180
183
'whitetextshadow' => '0 1px 0 rgba(255, 255, 255, 1)',
+1
src/view/phui/PHUIHeaderView.php
+1
src/view/phui/PHUIHeaderView.php
+32
webroot/rsrc/css/font/font-oswald.css
+32
webroot/rsrc/css/font/font-oswald.css
···
1
+
/**
2
+
* @provides font-oswald
3
+
* @requires phui-fontkit-css
4
+
*/
5
+
6
+
@font-face {
7
+
font-family: 'Oswald';
8
+
font-style: normal;
9
+
font-weight: 400;
10
+
src: local('Oswald'),
11
+
local('Oswald-Regular'),
12
+
url(/rsrc/externals/font/oswald/Oswald-Regular.woff2)
13
+
format('woff2'),
14
+
url(/rsrc/externals/font/oswald/Oswald-Regular.woff)
15
+
format('woff'),
16
+
url(/rsrc/externals/font/oswald/Oswald-Regular.eot)
17
+
format('embedded-opentype');
18
+
}
19
+
20
+
@font-face {
21
+
font-family: 'Oswald';
22
+
font-style: normal;
23
+
font-weight: 300;
24
+
src: local('Oswald'),
25
+
local('Oswald-Light'),
26
+
url(/rsrc/externals/font/oswald/Oswald-Light.woff2)
27
+
format('woff2'),
28
+
url(/rsrc/externals/font/oswald/Oswald-Light.woff)
29
+
format('woff'),
30
+
url(/rsrc/externals/font/oswald/Oswald-Light.eot)
31
+
format('embedded-opentype');
32
+
}
+30
-4
webroot/rsrc/css/phui/phui-fontkit.css
+30
-4
webroot/rsrc/css/phui/phui-fontkit.css
···
2
2
* @provides phui-fontkit-css
3
3
*/
4
4
5
+
/* - Source Sans ---------------------------------------------------------------
6
+
7
+
Used in Documents, Conpherence
8
+
9
+
*/
10
+
5
11
.phui-font-source-sans {
6
-
font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif;
12
+
font-family: 'Source Sans Pro', {$fontfamily};
7
13
font-size: 15px;
8
14
font-weight: 400;
9
15
line-height: 20px;
···
13
19
.phui-font-source-sans.conpherence-message-pane .remarkup-assist-textarea,
14
20
.conpherence-durable-column-body,
15
21
.conpherence-durable-column-body .remarkup-assist-textarea {
16
-
font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif;
22
+
font-family: 'Source Sans Pro', {$fontfamily};
17
23
font-weight: 400;
18
24
font-size: 14px;
19
25
line-height: 18px;
···
40
46
.phui-font-source-sans .phabricator-remarkup h4.remarkup-header,
41
47
.phui-font-source-sans .phabricator-remarkup h5.remarkup-header,
42
48
.phui-font-source-sans .phabricator-remarkup h6.remarkup-header {
49
+
font-family: 'Oswald', {$fontfamily};
43
50
color: {$darkbluetext};
44
-
font-weight: 600;
51
+
font-weight: 400;
45
52
}
46
53
47
54
.phui-font-source-sans .phabricator-remarkup h2.remarkup-header {
48
55
padding: 24px 24px 8px 0;
49
-
border-bottom: 1px solid {$thinblueborder};
56
+
border-bottom: 1px solid {$lightblueborder};
50
57
font-size: 22px;
51
58
font-weight: 400;
52
59
color: {$darkbluetext};
···
105
112
top: 4px;
106
113
left: 6px;
107
114
}
115
+
116
+
/* - Oswald --------------------------------------------------------------------
117
+
118
+
Used as Primary Headers in Object Boxes, Headers in Documents
119
+
120
+
*/
121
+
122
+
.phui-object-box :first-child .phui-header-header,
123
+
.phui-document-view .phui-header-tall .phui-header-header,
124
+
.aphront-dialog-head .phui-header-header {
125
+
font-family: 'Oswald', {$fontfamily};
126
+
font-weight: 400;
127
+
}
128
+
129
+
.phui-font-source-sans .phui-header-header {
130
+
font-family: 'Oswald', {$fontfamily};
131
+
color: {$darkbluetext};
132
+
font-weight: 400;
133
+
}
+3
-4
webroot/rsrc/css/phui/phui-header-view.css
+3
-4
webroot/rsrc/css/phui/phui-header-view.css
···
69
69
}
70
70
71
71
.phui-header-header {
72
-
color: #000;
73
-
font-size: 15px;
72
+
font-size: 18px;
74
73
font-weight: 500;
75
74
line-height: 24px;
75
+
color: #000;
76
76
}
77
77
78
78
.device-phone .phui-header-header {
···
81
81
82
82
.phui-object-box .phui-header-tall .phui-header-header,
83
83
.phui-document-view .phui-header-tall .phui-header-header {
84
-
font-size: 18px;
85
-
font-weight: 500;
84
+
font-size: 20px;
86
85
}
87
86
88
87
.phui-header-view .phui-header-header a {
+4
webroot/rsrc/css/phui/phui-object-box.css
+4
webroot/rsrc/css/phui/phui-object-box.css
+92
webroot/rsrc/externals/font/oswald/LICENSE.txt
+92
webroot/rsrc/externals/font/oswald/LICENSE.txt
···
1
+
Copyright (c) 2011-2012, Vernon Adams (vern@newtypography.co.uk), with Reserved Font Names 'Oswald'
2
+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
3
+
This license is copied below, and is also available with a FAQ at:
4
+
http://scripts.sil.org/OFL
5
+
6
+
7
+
-----------------------------------------------------------
8
+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
9
+
-----------------------------------------------------------
10
+
11
+
PREAMBLE
12
+
The goals of the Open Font License (OFL) are to stimulate worldwide
13
+
development of collaborative font projects, to support the font creation
14
+
efforts of academic and linguistic communities, and to provide a free and
15
+
open framework in which fonts may be shared and improved in partnership
16
+
with others.
17
+
18
+
The OFL allows the licensed fonts to be used, studied, modified and
19
+
redistributed freely as long as they are not sold by themselves. The
20
+
fonts, including any derivative works, can be bundled, embedded,
21
+
redistributed and/or sold with any software provided that any reserved
22
+
names are not used by derivative works. The fonts and derivatives,
23
+
however, cannot be released under any other type of license. The
24
+
requirement for fonts to remain under this license does not apply
25
+
to any document created using the fonts or their derivatives.
26
+
27
+
DEFINITIONS
28
+
"Font Software" refers to the set of files released by the Copyright
29
+
Holder(s) under this license and clearly marked as such. This may
30
+
include source files, build scripts and documentation.
31
+
32
+
"Reserved Font Name" refers to any names specified as such after the
33
+
copyright statement(s).
34
+
35
+
"Original Version" refers to the collection of Font Software components as
36
+
distributed by the Copyright Holder(s).
37
+
38
+
"Modified Version" refers to any derivative made by adding to, deleting,
39
+
or substituting -- in part or in whole -- any of the components of the
40
+
Original Version, by changing formats or by porting the Font Software to a
41
+
new environment.
42
+
43
+
"Author" refers to any designer, engineer, programmer, technical
44
+
writer or other person who contributed to the Font Software.
45
+
46
+
PERMISSION & CONDITIONS
47
+
Permission is hereby granted, free of charge, to any person obtaining
48
+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
49
+
redistribute, and sell modified and unmodified copies of the Font
50
+
Software, subject to the following conditions:
51
+
52
+
1) Neither the Font Software nor any of its individual components,
53
+
in Original or Modified Versions, may be sold by itself.
54
+
55
+
2) Original or Modified Versions of the Font Software may be bundled,
56
+
redistributed and/or sold with any software, provided that each copy
57
+
contains the above copyright notice and this license. These can be
58
+
included either as stand-alone text files, human-readable headers or
59
+
in the appropriate machine-readable metadata fields within text or
60
+
binary files as long as those fields can be easily viewed by the user.
61
+
62
+
3) No Modified Version of the Font Software may use the Reserved Font
63
+
Name(s) unless explicit written permission is granted by the corresponding
64
+
Copyright Holder. This restriction only applies to the primary font name as
65
+
presented to the users.
66
+
67
+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
68
+
Software shall not be used to promote, endorse or advertise any
69
+
Modified Version, except to acknowledge the contribution(s) of the
70
+
Copyright Holder(s) and the Author(s) or with their explicit written
71
+
permission.
72
+
73
+
5) The Font Software, modified or unmodified, in part or in whole,
74
+
must be distributed entirely under this license, and must not be
75
+
distributed under any other license. The requirement for fonts to
76
+
remain under this license does not apply to any document created
77
+
using the Font Software.
78
+
79
+
TERMINATION
80
+
This license becomes null and void if any of the above conditions are
81
+
not met.
82
+
83
+
DISCLAIMER
84
+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
85
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
86
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
87
+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
88
+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
89
+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
90
+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
91
+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
92
+
OTHER DEALINGS IN THE FONT SOFTWARE.
webroot/rsrc/externals/font/oswald/Oswald-Light.eot
webroot/rsrc/externals/font/oswald/Oswald-Light.eot
This is a binary file and will not be displayed.
webroot/rsrc/externals/font/oswald/Oswald-Light.woff
webroot/rsrc/externals/font/oswald/Oswald-Light.woff
This is a binary file and will not be displayed.
webroot/rsrc/externals/font/oswald/Oswald-Light.woff2
webroot/rsrc/externals/font/oswald/Oswald-Light.woff2
This is a binary file and will not be displayed.
webroot/rsrc/externals/font/oswald/Oswald-Regular.eot
webroot/rsrc/externals/font/oswald/Oswald-Regular.eot
This is a binary file and will not be displayed.
webroot/rsrc/externals/font/oswald/Oswald-Regular.woff
webroot/rsrc/externals/font/oswald/Oswald-Regular.woff
This is a binary file and will not be displayed.
webroot/rsrc/externals/font/oswald/Oswald-Regular.woff2
webroot/rsrc/externals/font/oswald/Oswald-Regular.woff2
This is a binary file and will not be displayed.