Page MenuHomePhabricator
Files F17854072

D13439.id32531.diff
No OneTemporary
Actions

D13439.id32531.diff
View Options

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' => '7f0d6232',
+ 'core.pkg.css' => 'cca0aa95',
'core.pkg.js' => 'a590b451',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '1b36e899',
@@ -108,13 +108,13 @@
'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
'rsrc/css/application/uiexample/example.css' => '528b19de',
'rsrc/css/core/core.css' => 'a76cefc9',
- 'rsrc/css/core/remarkup.css' => 'a4f23e80',
+ 'rsrc/css/core/remarkup.css' => 'f33ce157',
'rsrc/css/core/syntax.css' => '9fd11da8',
'rsrc/css/core/z-index.css' => '63689f49',
- 'rsrc/css/diviner/diviner-shared.css' => '7545fd9e',
+ 'rsrc/css/diviner/diviner-shared.css' => '5a337049',
'rsrc/css/font/font-awesome.css' => 'e2e712fe',
'rsrc/css/font/font-lato.css' => '564bfc7a',
- 'rsrc/css/font/font-slabo.css' => '1f520937',
+ 'rsrc/css/font/font-roboto-slab.css' => 'cda88637',
'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3',
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
'rsrc/css/layout/phabricator-hovercard-view.css' => '0a08eb6c',
@@ -129,16 +129,16 @@
'rsrc/css/phui/phui-box.css' => 'a5bb366d',
'rsrc/css/phui/phui-button.css' => 'f4d9c140',
'rsrc/css/phui/phui-crumbs-view.css' => 'ce840ec2',
- 'rsrc/css/phui/phui-document.css' => 'bc45d313',
+ 'rsrc/css/phui/phui-document.css' => 'dd07b216',
'rsrc/css/phui/phui-feed-story.css' => 'c70d2dd9',
- 'rsrc/css/phui/phui-fontkit.css' => '6790f776',
+ 'rsrc/css/phui/phui-fontkit.css' => '0d04121b',
'rsrc/css/phui/phui-form-view.css' => 'a0e8f168',
'rsrc/css/phui/phui-form.css' => '17ce37a9',
'rsrc/css/phui/phui-header-view.css' => '541c6cc7',
'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-info-view.css' => '5b16bac6',
'rsrc/css/phui/phui-list.css' => '02ab3534',
'rsrc/css/phui/phui-object-box.css' => '3db9f358',
'rsrc/css/phui/phui-object-item-list-view.css' => '762ae15a',
@@ -170,8 +170,8 @@
'rsrc/externals/font/lato/Lato-italic.woff2' => '2cc75b43',
'rsrc/externals/font/lato/Lato-regular.woff' => 'c139f3a4',
'rsrc/externals/font/lato/Lato-regular.woff2' => 'e3488ae9',
- 'rsrc/externals/font/slabo/Slabo-Regular.woff' => 'ac58aed3',
- 'rsrc/externals/font/slabo/Slabo-Regular.woff2' => '02b81b15',
+ 'rsrc/externals/font/robotoslab/RobotoSlab.woff' => '706dd595',
+ 'rsrc/externals/font/robotoslab/RobotoSlab.woff2' => '94a26562',
'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',
@@ -520,10 +520,10 @@
'diffusion-icons-css' => '4ba18923',
'diffusion-readme-css' => '2106ea08',
'diffusion-source-css' => '66fdf661',
- 'diviner-shared-css' => '7545fd9e',
+ 'diviner-shared-css' => '5a337049',
'font-fontawesome' => 'e2e712fe',
'font-lato' => '564bfc7a',
- 'font-slabo' => '1f520937',
+ 'font-roboto-slab' => 'cda88637',
'global-drag-and-drop-css' => '697324ad',
'harbormaster-css' => '49d64eb4',
'herald-css' => '826075fa',
@@ -732,7 +732,7 @@
'phabricator-object-selector-css' => '029a133d',
'phabricator-phtize' => 'd254d646',
'phabricator-prefab' => '6920d200',
- 'phabricator-remarkup-css' => 'a4f23e80',
+ 'phabricator-remarkup-css' => 'f33ce157',
'phabricator-search-results-css' => '7dea472c',
'phabricator-shaped-request' => '7cbe244b',
'phabricator-side-menu-view-css' => '4f2cd343',
@@ -771,17 +771,17 @@
'phui-calendar-list-css' => 'c1c7f338',
'phui-calendar-month-css' => '476be7e0',
'phui-crumbs-view-css' => 'ce840ec2',
- 'phui-document-view-css' => 'bc45d313',
+ 'phui-document-view-css' => 'dd07b216',
'phui-feed-story-css' => 'c70d2dd9',
'phui-font-icon-base-css' => '3dad2ae3',
- 'phui-fontkit-css' => '6790f776',
+ 'phui-fontkit-css' => '0d04121b',
'phui-form-css' => '17ce37a9',
'phui-form-view-css' => 'a0e8f168',
'phui-header-view-css' => '541c6cc7',
'phui-icon-view-css' => '88ba9081',
'phui-image-mask-css' => '5a8b09c8',
'phui-info-panel-css' => '27ea50a1',
- 'phui-info-view-css' => '33e54618',
+ 'phui-info-view-css' => '5b16bac6',
'phui-inline-comment-view-css' => 'fa5b8d1f',
'phui-list-view-css' => '02ab3534',
'phui-object-box-css' => '3db9f358',
@@ -959,9 +959,6 @@
'javelin-dom',
'javelin-reactor-dom',
),
- '1f520937' => array(
- 'phui-fontkit-css',
- ),
'2035b9cb' => array(
'javelin-behavior',
'javelin-dom',
@@ -1781,6 +1778,9 @@
'javelin-util',
'phabricator-notification-css',
),
+ 'cda88637' => array(
+ 'phui-fontkit-css',
+ ),
'cf86d16a' => array(
'javelin-behavior',
'javelin-dom',
diff --git a/src/applications/config/controller/PhabricatorConfigWelcomeController.php b/src/applications/config/controller/PhabricatorConfigWelcomeController.php
--- a/src/applications/config/controller/PhabricatorConfigWelcomeController.php
+++ b/src/applications/config/controller/PhabricatorConfigWelcomeController.php
@@ -352,17 +352,23 @@
$header = id(new PHUIHeaderView())
->setHeader(pht('Welcome to Phabricator'));
- $setup_header = id(new PHUIHeaderView())
- ->setHeader(pht('Setup and Configuration'))
- ->setBleedHeader(true);
+ $setup_header = PhabricatorMarkupEngine::renderOneObject(
+ id(new PhabricatorMarkupOneOff())
+ ->setContent(pht('=Setup and Configuration')),
+ 'default',
+ $viewer);
- $explore_header = id(new PHUIHeaderView())
- ->setHeader(pht('Explore Phabricator'))
- ->setBleedHeader(true);
+ $explore_header = PhabricatorMarkupEngine::renderOneObject(
+ id(new PhabricatorMarkupOneOff())
+ ->setContent(pht('=Explore Phabricator')),
+ 'default',
+ $viewer);
- $quick_header = id(new PHUIHeaderView())
- ->setHeader(pht('Quick Start Guides'))
- ->setBleedHeader(true);
+ $quick_header = PhabricatorMarkupEngine::renderOneObject(
+ id(new PhabricatorMarkupOneOff())
+ ->setContent(pht('=Quick Start Guides')),
+ 'default',
+ $viewer);
return id(new PHUIDocumentView())
->setHeader($header)
diff --git a/src/applications/diviner/controller/DivinerAtomController.php b/src/applications/diviner/controller/DivinerAtomController.php
--- a/src/applications/diviner/controller/DivinerAtomController.php
+++ b/src/applications/diviner/controller/DivinerAtomController.php
@@ -75,11 +75,14 @@
$group_name = null;
}
+ $prop_list = new PHUIPropertyGroupView();
+ $prop_list->addPropertyList($properties);
+
$document = id(new PHUIDocumentView())
->setBook($book->getTitle(), $group_name)
->setHeader($header)
->addClass('diviner-view')
- ->appendChild($properties);
+ ->appendChild($prop_list);
if ($atom) {
$this->buildDefined($properties, $symbol);
diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
--- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php
+++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
@@ -250,7 +250,7 @@
->setDisabled(!$can_edit)
->setWorkflow(!$can_edit));
- $preamble = null;
+ $preamble_box = null;
if (strlen($document->getPreamble())) {
$preamble_text = PhabricatorMarkupEngine::renderOneObject(
id(new PhabricatorMarkupOneOff())->setContent(
@@ -259,8 +259,14 @@
$viewer);
$preamble = id(new PHUIPropertyListView())
+ ->setUser($viewer)
+ ->setObject($document)
->addSectionHeader(pht('Preamble'))
->addTextContent($preamble_text);
+
+ $preamble_box = new PHUIPropertyGroupView();
+ $preamble_box->addPropertyList($preamble);
+
}
$content = id(new PHUIDocumentView())
@@ -269,7 +275,7 @@
->appendChild(
array(
$signed_status,
- $preamble,
+ $preamble_box,
$document_markup,
));
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -44,7 +44,7 @@
$create_uri = '/phriction/edit/?slug='.$slug;
$notice = new PHUIInfoView();
- $notice->setSeverity(PHUIInfoView::SEVERITY_NODATA);
+ $notice->setSeverity(PHUIInfoView::SEVERITY_WARNING);
$notice->setTitle(pht('No content here!'));
$notice->appendChild(
pht(
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -174,7 +174,7 @@
require_celerity_resource('phabricator-standard-page-view');
require_celerity_resource('conpherence-durable-column-view');
require_celerity_resource('font-lato');
- require_celerity_resource('font-slabo');
+ require_celerity_resource('font-roboto-slab');
Javelin::initBehavior('workflow', array());
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -356,35 +356,35 @@
padding-top: 0;
}
-.phabricator-remarkup p:first-child,
-.phabricator-remarkup ul.remarkup-list:first-child,
-.phabricator-remarkup ol.remarkup-list:first-child,
-.phabricator-remarkup .remarkup-code-block:first-child,
-.phabricator-remarkup h1.remarkup-header:first-child,
-.phabricator-remarkup h2.remarkup-header:first-child,
-.phabricator-remarkup h3.remarkup-header:first-child,
-.phabricator-remarkup h4.remarkup-header:first-child,
-.phabricator-remarkup h5.remarkup-header:first-child,
-.phabricator-remarkup h6.remarkup-header:first-child,
-.phabricator-remarkup blockquote:first-child,
-.phabricator-remarkup table.remarkup-table:first-child,
-.phabricator-remarkup .remarkup-note:first-child {
+body .phabricator-remarkup p:first-child,
+body .phabricator-remarkup ul.remarkup-list:first-child,
+body .phabricator-remarkup ol.remarkup-list:first-child,
+body .phabricator-remarkup .remarkup-code-block:first-child,
+body .phabricator-remarkup h1.remarkup-header:first-child,
+body .phabricator-remarkup h2.remarkup-header:first-child,
+body .phabricator-remarkup h3.remarkup-header:first-child,
+body .phabricator-remarkup h4.remarkup-header:first-child,
+body .phabricator-remarkup h5.remarkup-header:first-child,
+body .phabricator-remarkup h6.remarkup-header:first-child,
+body .phabricator-remarkup blockquote:first-child,
+body .phabricator-remarkup table.remarkup-table:first-child,
+body .phabricator-remarkup .remarkup-note:first-child {
margin-top: 0;
}
-.phabricator-remarkup p:last-child,
-.phabricator-remarkup ul.remarkup-list:last-child,
-.phabricator-remarkup ol.remarkup-list:last-child,
-.phabricator-remarkup .remarkup-code-block:last-child,
-.phabricator-remarkup h1.remarkup-header:last-child,
-.phabricator-remarkup h2.remarkup-header:last-child,
-.phabricator-remarkup h3.remarkup-header:last-child,
-.phabricator-remarkup h4.remarkup-header:last-child,
-.phabricator-remarkup h5.remarkup-header:last-child,
-.phabricator-remarkup h6.remarkup-header:last-child,
-.phabricator-remarkup blockquote:last-child,
-.phabricator-remarkup table.remarkup-table:last-child,
-.phabricator-remarkup .remarkup-note:last-child {
+body .phabricator-remarkup p:last-child,
+body .phabricator-remarkup ul.remarkup-list:last-child,
+body .phabricator-remarkup ol.remarkup-list:last-child,
+body .phabricator-remarkup .remarkup-code-block:last-child,
+body .phabricator-remarkup h1.remarkup-header:last-child,
+body .phabricator-remarkup h2.remarkup-header:last-child,
+body .phabricator-remarkup h3.remarkup-header:last-child,
+body .phabricator-remarkup h4.remarkup-header:last-child,
+body .phabricator-remarkup h5.remarkup-header:last-child,
+body .phabricator-remarkup h6.remarkup-header:last-child,
+body .phabricator-remarkup blockquote:last-child,
+body .phabricator-remarkup table.remarkup-table:last-child,
+body .phabricator-remarkup .remarkup-note:last-child {
margin-bottom: 0;
}
diff --git a/webroot/rsrc/css/diviner/diviner-shared.css b/webroot/rsrc/css/diviner/diviner-shared.css
--- a/webroot/rsrc/css/diviner/diviner-shared.css
+++ b/webroot/rsrc/css/diviner/diviner-shared.css
@@ -155,9 +155,9 @@
}
.diviner-book-item-title {
- font-weight: 700;
+ font-weight: bold;
font-size: 15px;
- color: {$bluetext};
+ color: {$darkbluetext};
}
.diviner-book-item-type {
diff --git a/webroot/rsrc/css/font/font-roboto-slab.css b/webroot/rsrc/css/font/font-roboto-slab.css
new file mode 100644
--- /dev/null
+++ b/webroot/rsrc/css/font/font-roboto-slab.css
@@ -0,0 +1,14 @@
+/**
+ * @provides font-roboto-slab
+ * @requires phui-fontkit-css
+ */
+
+@font-face {
+ font-family: 'Roboto Slab';
+ font-style: normal;
+ src: local('RobotoSlab'),
+ url(/rsrc/externals/font/robotoslab/RobotoSlab.woff2)
+ format('woff2'),
+ url(/rsrc/externals/font/robotoslab/RobotoSlab.woff)
+ format('woff');
+}
diff --git a/webroot/rsrc/css/font/font-slabo.css b/webroot/rsrc/css/font/font-slabo.css
deleted file mode 100644
--- a/webroot/rsrc/css/font/font-slabo.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @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');
-}
diff --git a/webroot/rsrc/css/phui/phui-document.css b/webroot/rsrc/css/phui/phui-document.css
--- a/webroot/rsrc/css/phui/phui-document.css
+++ b/webroot/rsrc/css/phui/phui-document.css
@@ -170,3 +170,11 @@
body .phui-document-view .phui-header-shell.phui-bleed-header {
padding: 0;
}
+
+.phui-document-view .phui-property-list-section-header {
+ padding: 12px 16px 0px;
+}
+
+.phui-document-view .phui-property-list-text-content {
+ padding: 0;
+}
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,22 +2,16 @@
* @provides phui-fontkit-css
*/
-/* - Slabo ---------------------------------------------------------------------
+/* - Roboto Slab ---------------------------------------------------------------
Used as Primary Headers in Object Boxes, Headers in Documents
*/
.diviner-document-section .phui-header-header {
- font-family: 'Slabo', {$fontfamily};
- color: {$darkbluetext};
- font-size: 22px;
-}
-
-.diviner-document-section .phui-header-header {
- font-family: 'Slabo', {$fontfamily};
- color: {$darkbluetext};
+ font-family: 'Roboto Slab', {$fontfamily};
font-size: 20px;
+ color: #000;
}
.phui-document-view .phabricator-remarkup h1.remarkup-header,
@@ -26,14 +20,11 @@
.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: 'Slabo', {$fontfamily};
- color: #000;
+ font-family: 'Roboto Slab', {$fontfamily};
}
.phui-document-view .phabricator-remarkup h2.remarkup-header {
- font-size: 22px;
- padding: 24px 24px 8px 0;
+ padding: 0 24px 8px 0;
border-bottom: 1px solid {$thinblueborder};
- color: #000;
- margin: 0 0 16px;
+ margin: 24px 0 16px;
}
diff --git a/webroot/rsrc/css/phui/phui-info-view.css b/webroot/rsrc/css/phui/phui-info-view.css
--- a/webroot/rsrc/css/phui/phui-info-view.css
+++ b/webroot/rsrc/css/phui/phui-info-view.css
@@ -22,6 +22,11 @@
line-height: 1.6em;
}
+.phui-info-view-body tt {
+ padding: 0 2px;
+ background-color: rgba(55,55,55,.1);
+}
+
.phui-info-view-actions {
margin-top: -3px;
margin-bottom: -4px;
diff --git a/webroot/rsrc/externals/font/robotoslab/.DS_Store b/webroot/rsrc/externals/font/robotoslab/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/externals/font/robotoslab/LICENSE.txt b/webroot/rsrc/externals/font/robotoslab/LICENSE.txt
new file mode 100644
--- /dev/null
+++ b/webroot/rsrc/externals/font/robotoslab/LICENSE.txt
@@ -0,0 +1,203 @@
+Font data copyright Google 2013
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
diff --git a/webroot/rsrc/externals/font/robotoslab/RobotoSlab.woff b/webroot/rsrc/externals/font/robotoslab/RobotoSlab.woff
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/externals/font/robotoslab/RobotoSlab.woff2 b/webroot/rsrc/externals/font/robotoslab/RobotoSlab.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/externals/font/slabo/LICENSE.txt b/webroot/rsrc/externals/font/slabo/LICENSE.txt
deleted file mode 100644
--- a/webroot/rsrc/externals/font/slabo/LICENSE.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-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.
\ No newline at end of file
diff --git a/webroot/rsrc/externals/font/slabo/Slabo-Regular.woff b/webroot/rsrc/externals/font/slabo/Slabo-Regular.woff
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/webroot/rsrc/externals/font/slabo/Slabo-Regular.woff2 b/webroot/rsrc/externals/font/slabo/Slabo-Regular.woff2
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001

File Metadata

Mime Type
text/plain
Expires
Mon, Jul 28, 2:38 PM (1 d, 22 h ago)
Storage Engine
amazon-s3
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
phabricator/secure/nn/vy/pfkpkdx3xhdxyswq
Default Alt Text
D13439.id32531.diff (34 KB)

Event Timeline

Phabricator · Built by Phacility