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' => 'd9223b5d', + 'core.pkg.css' => '1dd87664', 'core.pkg.js' => 'fbf1d615', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'f89b49b6', @@ -112,6 +112,7 @@ 'rsrc/css/core/z-index.css' => '63689f49', 'rsrc/css/diviner/diviner-shared.css' => '38813222', 'rsrc/css/font/font-awesome.css' => 'e2e712fe', + 'rsrc/css/font/font-oswald.css' => '608d6059', 'rsrc/css/font/font-source-sans-pro.css' => '8906c07b', 'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3', 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', @@ -129,16 +130,16 @@ 'rsrc/css/phui/phui-crumbs-view.css' => 'ce840ec2', 'rsrc/css/phui/phui-document.css' => '08f33f08', 'rsrc/css/phui/phui-feed-story.css' => '153a2ebf', - 'rsrc/css/phui/phui-fontkit.css' => 'b664ac96', + 'rsrc/css/phui/phui-fontkit.css' => '0ce97d82', 'rsrc/css/phui/phui-form-view.css' => 'a0e8f168', 'rsrc/css/phui/phui-form.css' => 'f535f938', - 'rsrc/css/phui/phui-header-view.css' => '125a540c', + 'rsrc/css/phui/phui-header-view.css' => '7faae760', 'rsrc/css/phui/phui-icon.css' => '88ba9081', 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', 'rsrc/css/phui/phui-info-view.css' => '33e54618', 'rsrc/css/phui/phui-list.css' => 'e448b6ba', - 'rsrc/css/phui/phui-object-box.css' => '6f449f57', + 'rsrc/css/phui/phui-object-box.css' => '1ba354f4', 'rsrc/css/phui/phui-object-item-list-view.css' => '29ded459', 'rsrc/css/phui/phui-pager.css' => 'bea33d23', 'rsrc/css/phui/phui-pinboard-view.css' => '2495140e', @@ -159,6 +160,12 @@ '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/oswald/Oswald-Light.eot' => 'c67ac8a7', + 'rsrc/externals/font/oswald/Oswald-Light.woff' => '97d56eef', + 'rsrc/externals/font/oswald/Oswald-Light.woff2' => '99a9c312', + 'rsrc/externals/font/oswald/Oswald-Regular.eot' => '69bef679', + 'rsrc/externals/font/oswald/Oswald-Regular.woff' => 'b9d3bc0d', + 'rsrc/externals/font/oswald/Oswald-Regular.woff2' => 'c58c9b78', 'rsrc/externals/font/sourcesans/SourceSansPro-It.woff' => '3f21af52', 'rsrc/externals/font/sourcesans/SourceSansPro-It.woff2' => '30a7cf60', 'rsrc/externals/font/sourcesans/SourceSansPro-Regular.woff2' => 'e89b04b1', @@ -514,6 +521,7 @@ 'diffusion-source-css' => '66fdf661', 'diviner-shared-css' => '38813222', 'font-fontawesome' => 'e2e712fe', + 'font-oswald' => '608d6059', 'font-source-sans-pro' => '8906c07b', 'global-drag-and-drop-css' => '697324ad', 'harbormaster-css' => '49d64eb4', @@ -763,17 +771,17 @@ 'phui-document-view-css' => '08f33f08', 'phui-feed-story-css' => '153a2ebf', 'phui-font-icon-base-css' => '3dad2ae3', - 'phui-fontkit-css' => 'b664ac96', + 'phui-fontkit-css' => '0ce97d82', 'phui-form-css' => 'f535f938', 'phui-form-view-css' => 'a0e8f168', - 'phui-header-view-css' => '125a540c', + 'phui-header-view-css' => '7faae760', 'phui-icon-view-css' => '88ba9081', 'phui-image-mask-css' => '5a8b09c8', 'phui-info-panel-css' => '27ea50a1', 'phui-info-view-css' => '33e54618', 'phui-inline-comment-view-css' => 'aa16f165', 'phui-list-view-css' => 'e448b6ba', - 'phui-object-box-css' => '6f449f57', + 'phui-object-box-css' => '1ba354f4', 'phui-object-item-list-view-css' => '29ded459', 'phui-pager-css' => 'bea33d23', 'phui-pinboard-view-css' => '2495140e', @@ -1282,6 +1290,9 @@ 'javelin-stratcom', 'javelin-dom', ), + '608d6059' => array( + 'phui-fontkit-css', + ), '6153c708' => array( 'javelin-behavior', 'javelin-stratcom', diff --git a/src/applications/celerity/CelerityResourceTransformer.php b/src/applications/celerity/CelerityResourceTransformer.php --- a/src/applications/celerity/CelerityResourceTransformer.php +++ b/src/applications/celerity/CelerityResourceTransformer.php @@ -175,6 +175,9 @@ 'basefont' => "13px/1.231 'Segoe UI', 'Segoe UI Web Regular', ". "'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif", + 'fontfamily' => "'Segoe UI', 'Segoe UI Web Regular', ". + "'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif", + // Drop Shadow 'dropshadow' => '0 1px 6px rgba(0, 0, 0, .25)', 'whitetextshadow' => '0 1px 0 rgba(255, 255, 255, 1)', diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php --- a/src/view/phui/PHUIHeaderView.php +++ b/src/view/phui/PHUIHeaderView.php @@ -141,6 +141,7 @@ protected function getTagAttributes() { require_celerity_resource('phui-header-view-css'); + require_celerity_resource('font-oswald'); $classes = array(); $classes[] = 'phui-header-shell'; diff --git a/webroot/rsrc/css/font/font-oswald.css b/webroot/rsrc/css/font/font-oswald.css new file mode 100644 --- /dev/null +++ b/webroot/rsrc/css/font/font-oswald.css @@ -0,0 +1,32 @@ +/** + * @provides font-oswald + * @requires phui-fontkit-css + */ + +@font-face { + font-family: 'Oswald'; + font-style: normal; + font-weight: 400; + src: local('Oswald'), + local('Oswald-Regular'), + url(/rsrc/externals/font/oswald/Oswald-Regular.woff2) + format('woff2'), + url(/rsrc/externals/font/oswald/Oswald-Regular.woff) + format('woff'), + url(/rsrc/externals/font/oswald/Oswald-Regular.eot) + format('embedded-opentype'); +} + +@font-face { + font-family: 'Oswald'; + font-style: normal; + font-weight: 300; + src: local('Oswald'), + local('Oswald-Light'), + url(/rsrc/externals/font/oswald/Oswald-Light.woff2) + format('woff2'), + url(/rsrc/externals/font/oswald/Oswald-Light.woff) + format('woff'), + url(/rsrc/externals/font/oswald/Oswald-Light.eot) + format('embedded-opentype'); +} diff --git a/webroot/rsrc/css/phui/phui-fontkit.css b/webroot/rsrc/css/phui/phui-fontkit.css --- a/webroot/rsrc/css/phui/phui-fontkit.css +++ b/webroot/rsrc/css/phui/phui-fontkit.css @@ -2,8 +2,14 @@ * @provides phui-fontkit-css */ +/* - Source Sans --------------------------------------------------------------- + + Used in Documents, Conpherence + +*/ + .phui-font-source-sans { - font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif; + font-family: 'Source Sans Pro', {$fontfamily}; font-size: 15px; font-weight: 400; line-height: 20px; @@ -13,7 +19,7 @@ .phui-font-source-sans.conpherence-message-pane .remarkup-assist-textarea, .conpherence-durable-column-body, .conpherence-durable-column-body .remarkup-assist-textarea { - font-family: 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif; + font-family: 'Source Sans Pro', {$fontfamily}; font-weight: 400; font-size: 14px; line-height: 18px; @@ -40,13 +46,14 @@ .phui-font-source-sans .phabricator-remarkup h4.remarkup-header, .phui-font-source-sans .phabricator-remarkup h5.remarkup-header, .phui-font-source-sans .phabricator-remarkup h6.remarkup-header { + font-family: 'Oswald', {$fontfamily}; color: {$darkbluetext}; - font-weight: 600; + font-weight: 400; } .phui-font-source-sans .phabricator-remarkup h2.remarkup-header { padding: 24px 24px 8px 0; - border-bottom: 1px solid {$thinblueborder}; + border-bottom: 1px solid {$lightblueborder}; font-size: 22px; font-weight: 400; color: {$darkbluetext}; @@ -105,3 +112,22 @@ top: 4px; left: 6px; } + +/* - Oswald -------------------------------------------------------------------- + + Used as Primary Headers in Object Boxes, Headers in Documents + +*/ + +.phui-object-box :first-child .phui-header-header, +.phui-document-view .phui-header-tall .phui-header-header, +.aphront-dialog-head .phui-header-header { + font-family: 'Oswald', {$fontfamily}; + font-weight: 400; +} + +.phui-font-source-sans .phui-header-header { + font-family: 'Oswald', {$fontfamily}; + color: {$darkbluetext}; + font-weight: 400; +} diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css --- a/webroot/rsrc/css/phui/phui-header-view.css +++ b/webroot/rsrc/css/phui/phui-header-view.css @@ -69,10 +69,10 @@ } .phui-header-header { - color: #000; - font-size: 15px; + font-size: 18px; font-weight: 500; line-height: 24px; + color: #000; } .device-phone .phui-header-header { @@ -81,8 +81,7 @@ .phui-object-box .phui-header-tall .phui-header-header, .phui-document-view .phui-header-tall .phui-header-header { - font-size: 18px; - font-weight: 500; + font-size: 20px; } .phui-header-view .phui-header-header a { diff --git a/webroot/rsrc/css/phui/phui-object-box.css b/webroot/rsrc/css/phui/phui-object-box.css --- a/webroot/rsrc/css/phui/phui-object-box.css +++ b/webroot/rsrc/css/phui/phui-object-box.css @@ -110,6 +110,10 @@ border-top: 1px solid {$thinblueborder}; } +.phui-object-box .phui-object-box .phui-header-shell .phui-header-header { + font-family: {$fontfamily}; +} + .phui-object-box .phui-box-border { border-width: 0; padding: 0; diff --git a/webroot/rsrc/externals/font/oswald/LICENSE.txt b/webroot/rsrc/externals/font/oswald/LICENSE.txt new file mode 100644 --- /dev/null +++ b/webroot/rsrc/externals/font/oswald/LICENSE.txt @@ -0,0 +1,92 @@ +Copyright (c) 2011-2012, Vernon Adams (vern@newtypography.co.uk), with Reserved Font Names 'Oswald' +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/webroot/rsrc/externals/font/oswald/Oswald-Light.eot b/webroot/rsrc/externals/font/oswald/Oswald-Light.eot new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@