Page MenuHomePhabricator
Files F15434552

D8431.id20012.diff
No OneTemporary
Actions

D8431.id20012.diff
View Options

diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -222,10 +222,6 @@
$page->setDeviceReady(true);
}
- if (idx($options, 'fonts')) {
- $page->setExtraFonts(true);
- }
-
$page->setShowChrome(idx($options, 'chrome', true));
$application_menu = $this->buildApplicationMenu();
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
@@ -249,7 +249,6 @@
array(
'title' => $symbol->getTitle(),
'device' => true,
- 'fonts' => true,
));
}
diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php
--- a/src/applications/diviner/controller/DivinerBookController.php
+++ b/src/applications/diviner/controller/DivinerBookController.php
@@ -92,7 +92,6 @@
array(
'title' => $book->getTitle(),
'device' => true,
- 'fonts' => true,
));
}
diff --git a/src/applications/diviner/controller/DivinerFindController.php b/src/applications/diviner/controller/DivinerFindController.php
--- a/src/applications/diviner/controller/DivinerFindController.php
+++ b/src/applications/diviner/controller/DivinerFindController.php
@@ -86,7 +86,6 @@
array(
'title' => array(pht('Find'), pht('"%s"', $query_text)),
'device' => true,
- 'fonts' => true,
));
}
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
@@ -12,7 +12,6 @@
private $glyph;
private $menuContent;
private $showChrome = true;
- private $extraFonts;
private $disableConsole;
private $pageObjects = array();
private $applicationMenu;
@@ -58,15 +57,6 @@
return $this->showChrome;
}
- public function setExtraFonts($extra) {
- $this->extraFonts = $extra;
- return $this;
- }
-
- public function getExtraFonts() {
- return $this->extraFonts;
- }
-
public function appendPageObjects(array $objs) {
foreach ($objs as $obj) {
$this->pageObjects[] = $obj;
@@ -243,16 +233,8 @@
$response = CelerityAPI::getStaticResourceResponse();
- $fonts = null;
- if ($this->getExtraFonts()) {
- $fonts = hsprintf("<link
- href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700'
- rel='stylesheet'
- type='text/css'>");
- }
-
return hsprintf(
- '%s%s<style type="text/css">'.
+ '%s<style type="text/css">'.
'.PhabricatorMonospaced, '.
'.phabricator-remarkup .remarkup-code-block { font: %s; } '.
'.platform-windows .PhabricatorMonospaced, '.
@@ -260,7 +242,6 @@
'.remarkup-code-block { font: %s; }'.
'</style>%s',
parent::getHead(),
- $fonts,
phutil_safe_html($monospaced),
phutil_safe_html($monospaced_win),
$response->renderSingleResource('javelin-magical-init', 'phabricator'));
diff --git a/src/view/phui/PHUIDocumentView.php b/src/view/phui/PHUIDocumentView.php
--- a/src/view/phui/PHUIDocumentView.php
+++ b/src/view/phui/PHUIDocumentView.php
@@ -75,6 +75,12 @@
require_celerity_resource('phui-fontkit-css');
}
+ switch ($this->fontKit) {
+ case self::FONT_SOURCE_SANS:
+ require_celerity_resource('font-source-sans-pro');
+ break;
+ }
+
$classes = array();
$classes[] = 'phui-document-view';
if ($this->offset) {

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 26, 4:23 AM (4 w, 15 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7704905
Default Alt Text
D8431.id20012.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility