mirror of
https://we.phorge.it/source/phorge.git
synced 2025-02-05 03:18:25 +01:00
[Redesign] Use Slabo font for headers, Remove Oswald
Summary: Couple of reasons here. Mainly, we're looking at Serif fonts for Phacility, so having headers tie back seems worth exploring. Also Oswals was a bit heavy, and in trying to find a replacement with similiar distinction, was unable to find anything suitable. Trying out Slabo here and have been pleasantly surprised how well the Serif/Sans-Serif combination works here, typographically.
Test Plan:
Test Objects, Documents, and Dashboards.
{F500207}
{F500208}
Reviewers: btrahan, epriestley
Reviewed By: epriestley
Subscribers: epriestley, Korvin
Differential Revision: https://secure.phabricator.com/D13279
This commit is contained in:
Chad Little
parent
9170e90112
commit
b3523adff4
18 changed files with 116 additions and 183 deletions
|
|
@ -7,10 +7,10 @@
|
|||
*/
|
||||
return array(
|
||||
'names' => array(
|
||||
'core.pkg.css' => 'ce55724b',
|
||||
'core.pkg.css' => 'a50fc769',
|
||||
'core.pkg.js' => '41f5edc5',
|
||||
'darkconsole.pkg.js' => 'e7393ebb',
|
||||
'differential.pkg.css' => 'df92dc9a',
|
||||
'differential.pkg.css' => '49c9d302',
|
||||
'differential.pkg.js' => 'ebef29b1',
|
||||
'diffusion.pkg.css' => '385e85b3',
|
||||
'diffusion.pkg.js' => '0115b37c',
|
||||
|
|
@ -58,9 +58,9 @@ return array(
|
|||
'rsrc/css/application/dashboard/dashboard.css' => 'eb458607',
|
||||
'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
|
||||
'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
|
||||
'rsrc/css/application/differential/changeset-view.css' => '7d07fe43',
|
||||
'rsrc/css/application/differential/changeset-view.css' => '73712bee',
|
||||
'rsrc/css/application/differential/core.css' => '7ac3cabc',
|
||||
'rsrc/css/application/differential/phui-inline-comment.css' => '22ce520d',
|
||||
'rsrc/css/application/differential/phui-inline-comment.css' => 'e60ad106',
|
||||
'rsrc/css/application/differential/results-table.css' => '181aa9d9',
|
||||
'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
|
||||
'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
|
||||
|
|
@ -107,14 +107,14 @@ return array(
|
|||
'rsrc/css/application/slowvote/slowvote.css' => '266df6a1',
|
||||
'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
|
||||
'rsrc/css/application/uiexample/example.css' => '528b19de',
|
||||
'rsrc/css/core/core.css' => '5c94541a',
|
||||
'rsrc/css/core/remarkup.css' => 'cbcf6768',
|
||||
'rsrc/css/core/core.css' => 'd3a3978f',
|
||||
'rsrc/css/core/remarkup.css' => '13368efd',
|
||||
'rsrc/css/core/syntax.css' => '9fd11da8',
|
||||
'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-lato.css' => '5f05d817',
|
||||
'rsrc/css/font/font-oswald.css' => 'd5e48ef7',
|
||||
'rsrc/css/font/font-slabo.css' => '7a85ea13',
|
||||
'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3',
|
||||
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
|
||||
'rsrc/css/layout/phabricator-hovercard-view.css' => '0d665853',
|
||||
|
|
@ -127,20 +127,20 @@ return array(
|
|||
'rsrc/css/phui/phui-action-list.css' => '32c388b3',
|
||||
'rsrc/css/phui/phui-action-panel.css' => '3ee9afd5',
|
||||
'rsrc/css/phui/phui-box.css' => 'a5bb366d',
|
||||
'rsrc/css/phui/phui-button.css' => 'afd64dc3',
|
||||
'rsrc/css/phui/phui-button.css' => '5ccb5ce4',
|
||||
'rsrc/css/phui/phui-crumbs-view.css' => 'ce840ec2',
|
||||
'rsrc/css/phui/phui-document.css' => '7f67a837',
|
||||
'rsrc/css/phui/phui-feed-story.css' => '153a2ebf',
|
||||
'rsrc/css/phui/phui-fontkit.css' => 'a230e064',
|
||||
'rsrc/css/phui/phui-fontkit.css' => 'ce1ce3ca',
|
||||
'rsrc/css/phui/phui-form-view.css' => 'a0e8f168',
|
||||
'rsrc/css/phui/phui-form.css' => 'ca501a10',
|
||||
'rsrc/css/phui/phui-form.css' => '1ecbc461',
|
||||
'rsrc/css/phui/phui-header-view.css' => '44fc449c',
|
||||
'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' => 'fc29a33a',
|
||||
'rsrc/css/phui/phui-object-box.css' => '4fd75233',
|
||||
'rsrc/css/phui/phui-object-item-list-view.css' => 'bf7463f7',
|
||||
'rsrc/css/phui/phui-pager.css' => 'bea33d23',
|
||||
'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
|
||||
|
|
@ -170,20 +170,8 @@ return array(
|
|||
'rsrc/externals/font/lato/Lato-italic.woff2' => '9e7cacda',
|
||||
'rsrc/externals/font/lato/Lato-regular.woff' => 'bdba0324',
|
||||
'rsrc/externals/font/lato/Lato-regular.woff2' => '8b23fcc6',
|
||||
'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',
|
||||
'rsrc/externals/font/sourcesans/SourceSansPro-Semibold.woff' => '67cce9ea',
|
||||
'rsrc/externals/font/sourcesans/SourceSansPro-Semibold.woff2' => 'ec2ed916',
|
||||
'rsrc/externals/font/sourcesans/SourceSansPro-SemiboldIt.woff' => 'bd1ce81d',
|
||||
'rsrc/externals/font/sourcesans/SourceSansPro-SemiboldIt.woff2' => 'd9928416',
|
||||
'rsrc/externals/font/sourcesans/SourceSansPro.woff' => '3614608c',
|
||||
'rsrc/externals/font/slabo/Slabo-Regular.woff' => 'ac58aed3',
|
||||
'rsrc/externals/font/slabo/Slabo-Regular.woff2' => '02b81b15',
|
||||
'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',
|
||||
|
|
@ -519,7 +507,7 @@ return array(
|
|||
'conpherence-transaction-css' => '85d0974c',
|
||||
'conpherence-update-css' => '1099a660',
|
||||
'conpherence-widget-pane-css' => '6e0e290b',
|
||||
'differential-changeset-view-css' => '7d07fe43',
|
||||
'differential-changeset-view-css' => '73712bee',
|
||||
'differential-core-view-css' => '7ac3cabc',
|
||||
'differential-inline-comment-editor' => 'd4c87bf4',
|
||||
'differential-results-table-css' => '181aa9d9',
|
||||
|
|
@ -534,7 +522,7 @@ return array(
|
|||
'diviner-shared-css' => '38813222',
|
||||
'font-fontawesome' => 'e2e712fe',
|
||||
'font-lato' => '5f05d817',
|
||||
'font-oswald' => 'd5e48ef7',
|
||||
'font-slabo' => '7a85ea13',
|
||||
'global-drag-and-drop-css' => '697324ad',
|
||||
'harbormaster-css' => '49d64eb4',
|
||||
'herald-css' => '826075fa',
|
||||
|
|
@ -720,7 +708,7 @@ return array(
|
|||
'phabricator-busy' => '59a7976a',
|
||||
'phabricator-chatlog-css' => 'f1971c1c',
|
||||
'phabricator-content-source-view-css' => '4b8b05d4',
|
||||
'phabricator-core-css' => '5c94541a',
|
||||
'phabricator-core-css' => 'd3a3978f',
|
||||
'phabricator-countdown-css' => '86b7b0a0',
|
||||
'phabricator-dashboard-css' => 'eb458607',
|
||||
'phabricator-drag-and-drop-file-upload' => '07de8873',
|
||||
|
|
@ -742,7 +730,7 @@ return array(
|
|||
'phabricator-object-selector-css' => '029a133d',
|
||||
'phabricator-phtize' => 'd254d646',
|
||||
'phabricator-prefab' => '6920d200',
|
||||
'phabricator-remarkup-css' => 'cbcf6768',
|
||||
'phabricator-remarkup-css' => '13368efd',
|
||||
'phabricator-search-results-css' => 'ce897fb9',
|
||||
'phabricator-shaped-request' => '7cbe244b',
|
||||
'phabricator-side-menu-view-css' => '4f2cd343',
|
||||
|
|
@ -775,7 +763,7 @@ return array(
|
|||
'phriction-document-css' => 'd1861e06',
|
||||
'phui-action-panel-css' => '3ee9afd5',
|
||||
'phui-box-css' => 'a5bb366d',
|
||||
'phui-button-css' => 'afd64dc3',
|
||||
'phui-button-css' => '5ccb5ce4',
|
||||
'phui-calendar-css' => 'ccabe893',
|
||||
'phui-calendar-day-css' => 'd1cf6f93',
|
||||
'phui-calendar-list-css' => 'c1c7f338',
|
||||
|
|
@ -784,17 +772,17 @@ return array(
|
|||
'phui-document-view-css' => '7f67a837',
|
||||
'phui-feed-story-css' => '153a2ebf',
|
||||
'phui-font-icon-base-css' => '3dad2ae3',
|
||||
'phui-fontkit-css' => 'a230e064',
|
||||
'phui-form-css' => 'ca501a10',
|
||||
'phui-fontkit-css' => 'ce1ce3ca',
|
||||
'phui-form-css' => '1ecbc461',
|
||||
'phui-form-view-css' => 'a0e8f168',
|
||||
'phui-header-view-css' => '44fc449c',
|
||||
'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' => '22ce520d',
|
||||
'phui-inline-comment-view-css' => 'e60ad106',
|
||||
'phui-list-view-css' => 'e448b6ba',
|
||||
'phui-object-box-css' => 'fc29a33a',
|
||||
'phui-object-box-css' => '4fd75233',
|
||||
'phui-object-item-list-view-css' => 'bf7463f7',
|
||||
'phui-pager-css' => 'bea33d23',
|
||||
'phui-pinboard-view-css' => '2495140e',
|
||||
|
|
@ -1398,6 +1386,9 @@ return array(
|
|||
'javelin-behavior',
|
||||
'javelin-dom',
|
||||
),
|
||||
'73712bee' => array(
|
||||
'phui-inline-comment-view-css',
|
||||
),
|
||||
'73d09eef' => array(
|
||||
'javelin-behavior',
|
||||
'javelin-vector',
|
||||
|
|
@ -1431,6 +1422,9 @@ return array(
|
|||
'owners-path-editor',
|
||||
'javelin-behavior',
|
||||
),
|
||||
'7a85ea13' => array(
|
||||
'phui-fontkit-css',
|
||||
),
|
||||
'7b98d7c5' => array(
|
||||
'javelin-behavior',
|
||||
'javelin-dom',
|
||||
|
|
@ -1443,9 +1437,6 @@ return array(
|
|||
'javelin-request',
|
||||
'javelin-router',
|
||||
),
|
||||
'7d07fe43' => array(
|
||||
'phui-inline-comment-view-css',
|
||||
),
|
||||
'7e41274a' => array(
|
||||
'javelin-install',
|
||||
),
|
||||
|
|
@ -1877,9 +1868,6 @@ return array(
|
|||
'javelin-dom',
|
||||
'javelin-stratcom',
|
||||
),
|
||||
'd5e48ef7' => array(
|
||||
'phui-fontkit-css',
|
||||
),
|
||||
'd75709e6' => array(
|
||||
'javelin-behavior',
|
||||
'javelin-workflow',
|
||||
|
|
|
|||
|
|
@ -172,10 +172,10 @@ final class CelerityResourceTransformer {
|
|||
public static function getCSSVariableMap() {
|
||||
return array(
|
||||
// Fonts
|
||||
'basefont' => "13px/1.231 'Lato', 'Segoe UI Web Regular', ".
|
||||
'basefont' => "13px/1.231 'Lato', 'Segoe UI', 'Segoe UI Web Regular', ".
|
||||
"'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif",
|
||||
|
||||
'fontfamily' => "'Lato', 'Segoe UI Web Regular', ".
|
||||
'fontfamily' => "'Lato', 'Segoe UI', 'Segoe UI Web Regular', ".
|
||||
"'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif",
|
||||
|
||||
// Drop Shadow
|
||||
|
|
|
|||
|
|
@ -174,6 +174,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-slabo');
|
||||
|
||||
Javelin::initBehavior('workflow', array());
|
||||
|
||||
|
|
|
|||
|
|
@ -141,7 +141,6 @@ final class PHUIHeaderView extends AphrontTagView {
|
|||
|
||||
protected function getTagAttributes() {
|
||||
require_celerity_resource('phui-header-view-css');
|
||||
require_celerity_resource('font-oswald');
|
||||
|
||||
$classes = array();
|
||||
$classes[] = 'phui-header-shell';
|
||||
|
|
@ -266,8 +265,8 @@ final class PHUIHeaderView extends AphrontTagView {
|
|||
$this->header);
|
||||
|
||||
if ($this->tags) {
|
||||
$header[] = ' ';
|
||||
$header[] = phutil_tag(
|
||||
$left[] = ' ';
|
||||
$left[] = phutil_tag(
|
||||
'span',
|
||||
array(
|
||||
'class' => 'phui-header-tags',
|
||||
|
|
|
|||
|
|
@ -119,41 +119,45 @@
|
|||
}
|
||||
|
||||
.phabricator-remarkup h1.remarkup-header {
|
||||
font-size: 24px;
|
||||
font-size: 28px;
|
||||
line-height: 1.625em;
|
||||
margin: 24px 0 4px;
|
||||
}
|
||||
|
||||
.phabricator-remarkup h2.remarkup-header {
|
||||
font-size: 20px;
|
||||
font-size: 24px;
|
||||
line-height: 1.5em;
|
||||
margin: 20px 0 4px;
|
||||
}
|
||||
|
||||
.phabricator-remarkup h3.remarkup-header {
|
||||
font-size: 18px;
|
||||
font-size: 20px;
|
||||
line-height: 1.375em;
|
||||
margin: 20px 0 4px;
|
||||
}
|
||||
|
||||
.phabricator-remarkup h4.remarkup-header {
|
||||
font-size: 15px;
|
||||
font-size: 18px;
|
||||
line-height: 1.25em;
|
||||
margin: 12px 0 4px;
|
||||
}
|
||||
|
||||
.phabricator-remarkup h5.remarkup-header {
|
||||
font-size: 14px;
|
||||
font-size: 16px;
|
||||
line-height: 1.125em;
|
||||
margin: 8px 0 4px;
|
||||
}
|
||||
|
||||
.phabricator-remarkup h6.remarkup-header {
|
||||
font-size: 13px;
|
||||
font-size: 15px;
|
||||
line-height: 1em;
|
||||
margin: 4px 0;
|
||||
}
|
||||
|
||||
.phabricator-remarkup .remarkup-header + .remarkup-header {
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
.phabricator-remarkup blockquote {
|
||||
border-left: 3px solid {$lightbluetext};
|
||||
color: {$darkbluetext};
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
/**
|
||||
* @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');
|
||||
}
|
||||
15
webroot/rsrc/css/font/font-slabo.css
Normal file
15
webroot/rsrc/css/font/font-slabo.css
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
/**
|
||||
* @provides font-slabo
|
||||
* @requires phui-fontkit-css
|
||||
*/
|
||||
|
||||
@font-face {
|
||||
font-family: 'Slabo';
|
||||
font-style: normal;
|
||||
src: local('Slabo'),
|
||||
local('Slabo-Regular'),
|
||||
url(/rsrc/externals/font/slabo/Slabo-Regular.woff2)
|
||||
format('woff2'),
|
||||
url(/rsrc/externals/font/slabo/Slabo-Regular.woff)
|
||||
format('woff');
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* @provides phui-fontkit-css
|
||||
*/
|
||||
|
||||
/* - Oswald --------------------------------------------------------------------
|
||||
/* - Slabo ---------------------------------------------------------------------
|
||||
|
||||
Used as Primary Headers in Object Boxes, Headers in Documents
|
||||
|
||||
|
|
@ -11,14 +11,12 @@
|
|||
.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;
|
||||
font-family: 'Slabo', {$fontfamily};
|
||||
}
|
||||
|
||||
.phui-document-view .phui-header-header {
|
||||
font-family: 'Oswald', {$fontfamily};
|
||||
font-family: 'Slabo', {$fontfamily};
|
||||
color: {$darkbluetext};
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
.phui-document-view .phabricator-remarkup h1.remarkup-header,
|
||||
|
|
@ -27,7 +25,13 @@
|
|||
.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: 'Oswald', {$fontfamily};
|
||||
color: {$darkbluetext};
|
||||
font-weight: 400;
|
||||
font-family: 'Slabo', {$fontfamily};
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.phui-document-view .phabricator-remarkup h2.remarkup-header {
|
||||
padding: 24px 24px 8px 0;
|
||||
border-bottom: 1px solid {$thinblueborder};
|
||||
color: #000;
|
||||
margin: 0 0 16px;
|
||||
}
|
||||
|
|
|
|||
92
webroot/rsrc/externals/font/oswald/LICENSE.txt
vendored
92
webroot/rsrc/externals/font/oswald/LICENSE.txt
vendored
|
|
@ -1,92 +0,0 @@
|
|||
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.
|
||||
BIN
webroot/rsrc/externals/font/oswald/Oswald-Light.eot
vendored
BIN
webroot/rsrc/externals/font/oswald/Oswald-Light.eot
vendored
Binary file not shown.
BIN
webroot/rsrc/externals/font/oswald/Oswald-Light.woff
vendored
BIN
webroot/rsrc/externals/font/oswald/Oswald-Light.woff
vendored
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
46
webroot/rsrc/externals/font/slabo/LICENSE.txt
vendored
Normal file
46
webroot/rsrc/externals/font/slabo/LICENSE.txt
vendored
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
Copyright (c) 2013, Tiro Typeworks Ltd (www.tiro.com).
|
||||
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
|
||||
|
||||
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.
|
||||
BIN
webroot/rsrc/externals/font/slabo/Slabo-Regular.woff
vendored
Normal file
BIN
webroot/rsrc/externals/font/slabo/Slabo-Regular.woff
vendored
Normal file
Binary file not shown.
BIN
webroot/rsrc/externals/font/slabo/Slabo-Regular.woff2
vendored
Normal file
BIN
webroot/rsrc/externals/font/slabo/Slabo-Regular.woff2
vendored
Normal file
Binary file not shown.
Loading…
Add table
Reference in a new issue