Commit 9170e901 authored by Chad Little's avatar Chad Little
Browse files

[Redesign] Move basefont to Lato, remove Source Sans Pro

Summary: Working towards a more unified look and feel. This brings in Lato as a complete base font over Helvetica Neue, as well as removing Source Sans Pro from DocumentView and Conpherence. Design-wise Lato provides the nice readability at larger font sizes that Source Sans Pro did, with the ability to scale down to tables and UI widgets with ease. This gives us one font instead of two, and now Object descriptions and Timeline posts all can benefit from a consistent, readable font.

Test Plan:
Test main UI, smaller elements like tables, menus, DocumentViews, Previews, Conpherence.

{F498135}

{F498136}

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D13276
parent 57b898af
This diff is collapsed.
......@@ -172,10 +172,10 @@ final class CelerityResourceTransformer {
public static function getCSSVariableMap() {
return array(
// Fonts
'basefont' => "13px/1.231 'Segoe UI', 'Segoe UI Web Regular', ".
'basefont' => "13px/1.231 'Lato', 'Segoe UI Web Regular', ".
"'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif",
'fontfamily' => "'Segoe UI', 'Segoe UI Web Regular', ".
'fontfamily' => "'Lato', 'Segoe UI Web Regular', ".
"'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif",
// Drop Shadow
......
......@@ -14,7 +14,6 @@ final class PhabricatorConfigWelcomeController
$crumbs = $this
->buildApplicationCrumbs()
->setBorder(true)
->addTextCrumb(pht('Welcome'));
$nav->setCrumbs($crumbs);
......@@ -32,7 +31,7 @@ final class PhabricatorConfigWelcomeController
$this->requireResource('config-welcome-css');
$content = pht(
"==== Install Phabricator ====\n\n".
"=== Install Phabricator ===\n\n".
"You have successfully installed Phabricator. This screen will guide ".
"you through configuration and orientation. ".
"These steps are optional, and you can go through them in any order. ".
......@@ -51,7 +50,7 @@ final class PhabricatorConfigWelcomeController
$setup_href = PhabricatorEnv::getURI('/config/issue/');
if ($issues_resolved) {
$content = pht(
"==== Resolve Setup Issues ====\n\n".
"=== Resolve Setup Issues ===\n\n".
"You've resolved (or ignored) all outstanding setup issues. ".
"You can review issues in the **Config** application, under ".
"**[[ %s | Setup Issues ]]**.",
......@@ -59,7 +58,7 @@ final class PhabricatorConfigWelcomeController
$icon = 'fa-check-square-o green';
} else {
$content = pht(
"==== Resolve Setup Issues ====\n\n".
"=== Resolve Setup Issues ===\n\n".
"You have some unresolved setup issues to take care of. Click ".
"the link in the yellow banner at the top of the screen to see ".
"them, or find them in the **Config** application under ".
......@@ -86,7 +85,7 @@ final class PhabricatorConfigWelcomeController
$have_auth = (bool)$configs;
if ($have_auth) {
$content = pht(
"==== Login and Registration ====\n\n".
"=== Login and Registration ===\n\n".
"You've configured at least one authentication provider, so users ".
"can register or log in. ".
"To configure more providers or adjust settings, use the ".
......@@ -95,7 +94,7 @@ final class PhabricatorConfigWelcomeController
$icon = 'fa-check-square-o green';
} else {
$content = pht(
"==== Login and Registration ====\n\n".
"=== Login and Registration ===\n\n".
"You haven't configured any authentication providers yet. ".
"Authentication providers allow users to register accounts and ".
"log in to Phabricator. You can configure Phabricator to accept ".
......@@ -120,7 +119,7 @@ final class PhabricatorConfigWelcomeController
if ($have_config) {
$content = pht(
"==== Configure Phabricator Settings ====\n\n".
"=== Configure Phabricator Settings ===\n\n".
"You've configured at least one setting from the web interface. ".
"To configure more settings later, use the ".
"**[[ %s | Config Application ]]**.",
......@@ -128,7 +127,7 @@ final class PhabricatorConfigWelcomeController
$icon = 'fa-check-square-o green';
} else {
$content = pht(
"==== Configure Phabricator Settings ====\n\n".
"=== Configure Phabricator Settings ===\n\n".
'Many aspects of Phabricator are configurable. To explore and '.
'adjust settings, use the **[[ %s | Config Application ]]**.',
$config_href);
......@@ -145,7 +144,7 @@ final class PhabricatorConfigWelcomeController
$have_settings = !empty($prefs);
if ($have_settings) {
$content = pht(
"==== Adjust Account Settings ====\n\n".
"=== Adjust Account Settings ===\n\n".
"You've adjusted at least one setting on your account. ".
"To make more adjustments, visit the ".
"**[[ %s | Settings Application ]]**.",
......@@ -153,7 +152,7 @@ final class PhabricatorConfigWelcomeController
$icon = 'fa-check-square-o green';
} else {
$content = pht(
"==== Adjust Account Settings ====\n\n".
"=== Adjust Account Settings ===\n\n".
'You can configure settings for your account by clicking the '.
'wrench icon in the main menu bar, or visiting the '.
'**[[ %s | Settings Application ]]** directly.',
......@@ -173,7 +172,7 @@ final class PhabricatorConfigWelcomeController
'PhabricatorHomeApplication');
if ($have_dashboard) {
$content = pht(
"==== Customize Home Page ====\n\n".
"=== Customize Home Page ===\n\n".
"You've installed a default dashboard to replace this welcome screen ".
"on the home page. ".
"You can still visit the welcome screen here at any time if you ".
......@@ -185,7 +184,7 @@ final class PhabricatorConfigWelcomeController
$icon = 'fa-check-square-o green';
} else {
$content = pht(
"==== Customize Home Page ====\n\n".
"=== Customize Home Page ===\n\n".
"When you're done setting things up, you can create a custom ".
"dashboard and install it. Your dashboard will replace this ".
"welcome screen on the Phabricator home page. ".
......@@ -209,7 +208,7 @@ final class PhabricatorConfigWelcomeController
$apps_href = PhabricatorEnv::getURI('/applications/');
$content = pht(
"==== Explore Applications ====\n\n".
"=== Explore Applications ===\n\n".
"Phabricator is a large suite of applications that work together to ".
"help you develop software, manage tasks, and communicate. A few of ".
"the most commonly used applications are pinned to the left navigation ".
......@@ -229,7 +228,7 @@ final class PhabricatorConfigWelcomeController
$support_href = PhabricatorEnv::getDoclink('Give Feedback! Get Support!');
$content = pht(
"==== Need Help with Setup? ====\n\n".
"=== Need Help with Setup? ===\n\n".
'Having trouble getting something set up? See '.
'**[[ %s | Give Feedback! Get Support! ]]** for ways to get in touch '.
'to get answers to questions, report bugs, and request features.',
......@@ -255,7 +254,7 @@ final class PhabricatorConfigWelcomeController
$request,
'fa-gear',
pht(
"==== Quick Start: Code Review ====\n\n".
"=== Quick Start: Code Review ===\n\n".
"Review code with **[[ %s | Differential ]]**. ".
"Engineers can use Differential to share, review, and approve ".
"changes to source code. ".
......@@ -283,7 +282,7 @@ final class PhabricatorConfigWelcomeController
$request,
'fa-anchor',
pht(
"==== Quick Start: Bugs and Tasks ====\n\n".
"=== Quick Start: Bugs and Tasks ===\n\n".
"Track bugs and tasks in Phabricator with ".
"**[[ %s | Maniphest ]]**. ".
"Users in all roles can use Maniphest to manage current and ".
......@@ -304,7 +303,7 @@ final class PhabricatorConfigWelcomeController
$request,
'fa-camera-retro',
pht(
"==== Quick Start: Design Review ====\n\n".
"=== Quick Start: Design Review ===\n\n".
"Review proposed designs with **[[ %s | Pholio ]]**. ".
"Designers can use Pholio to share images of what they're working on ".
"and show off things they've made. ".
......@@ -328,7 +327,7 @@ final class PhabricatorConfigWelcomeController
$request,
'fa-code',
pht(
"==== Quick Start: Repositories ====\n\n".
"=== Quick Start: Repositories ===\n\n".
"Manage and browse source code repositories with ".
"**[[ %s | Diffusion ]]**. ".
"Engineers can use Diffusion to browse and audit source code. ".
......@@ -368,8 +367,6 @@ final class PhabricatorConfigWelcomeController
return id(new PHUIDocumentView())
->setHeader($header)
->setFluid(true)
->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS)
// ->setSidenav($sidenav)
->appendChild($setup_header)
->appendChild($setup)
->appendChild($explore_header)
......
......@@ -109,7 +109,6 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
protected function getTagContent() {
$column_key = PhabricatorUserPreferences::PREFERENCE_CONPHERENCE_COLUMN;
require_celerity_resource('font-source-sans-pro');
Javelin::initBehavior(
'durable-column',
......
......@@ -60,9 +60,6 @@ final class ConpherenceLayoutView extends AphrontView {
require_celerity_resource('conpherence-message-pane-css');
require_celerity_resource('conpherence-widget-pane-css');
require_celerity_resource('phui-fontkit-css');
require_celerity_resource('font-source-sans-pro');
$layout_id = celerity_generate_unique_node_id();
$selected_id = null;
......@@ -174,7 +171,7 @@ final class ConpherenceLayoutView extends AphrontView {
javelin_tag(
'div',
array(
'class' => 'conpherence-message-pane phui-font-source-sans',
'class' => 'conpherence-message-pane',
'id' => 'conpherence-message-pane',
'sigil' => 'conpherence-message-pane',
),
......
......@@ -113,8 +113,7 @@ final class DiffusionReadmeView extends DiffusionView {
->setFluid(true)
->appendChild($readme_content)
->addClass('diffusion-readme-view')
->setHeader($header)
->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS);
->setHeader($header);
}
}
......@@ -88,7 +88,6 @@ final class DivinerAtomController extends DivinerController {
->setBook($book->getTitle(), $group_name)
->setHeader($header)
->addClass('diviner-view')
->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS)
->appendChild($properties);
if ($atom) {
......
......@@ -41,7 +41,6 @@ final class DivinerBookController extends DivinerController {
$document = new PHUIDocumentView();
$document->setHeader($header);
$document->addClass('diviner-view');
$document->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS);
$atoms = id(new DivinerAtomQuery())
->setViewer($viewer)
......
......@@ -33,7 +33,6 @@ final class DivinerMainController extends DivinerController {
$document = new PHUIDocumentView();
$document->setHeader($header);
$document->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS);
$document->addClass('diviner-view');
if ($books) {
......
......@@ -245,8 +245,7 @@ final class LegalpadDocumentEditController extends LegalpadController {
$preview = id(new PHUIRemarkupPreviewPanel())
->setHeader(pht('Document Preview'))
->setPreviewURI($this->getApplicationURI('document/preview/'))
->setControlID('document-text')
->setSkin('document');
->setControlID('document-text');
return $this->buildApplicationPage(
array(
......
......@@ -266,7 +266,6 @@ final class LegalpadDocumentSignController extends LegalpadController {
$content = id(new PHUIDocumentView())
->addClass('legalpad')
->setHeader($header)
->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS)
->appendChild(
array(
$signed_status,
......
......@@ -136,7 +136,6 @@ final class PhabricatorApplicationEmailCommandsController
$document = id(new PHUIDocumentView())
->setHeader($header)
->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS)
->appendChild($info_view)
->appendChild($content_box);
......
......@@ -217,7 +217,6 @@ final class PhrictionDocumentController
}
$page_content = id(new PHUIDocumentView())
->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS)
->setHeader($header)
->appendChild(
array(
......
......@@ -264,8 +264,7 @@ final class PhrictionEditController
$preview = id(new PHUIRemarkupPreviewPanel())
->setHeader(pht('Document Preview'))
->setPreviewURI('/phriction/preview/')
->setControlID('document-textarea')
->setSkin('document');
->setControlID('document-textarea');
$crumbs = $this->buildApplicationCrumbs();
if ($document->getID()) {
......
......@@ -131,7 +131,6 @@ final class PhabricatorTypeaheadFunctionHelpController
$document = id(new PHUIDocumentView())
->setHeader($header)
->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS)
->appendChild($content_box);
$crumbs = $this->buildApplicationCrumbs();
......
......@@ -193,7 +193,6 @@ final class PHUIDocumentExample extends PhabricatorUIExample {
$content->setTopNav($topnav);
$content->setSidenav($sidenav);
$content->appendChild($document);
$content->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS);
return $content;
}
......
......@@ -173,6 +173,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
require_celerity_resource('phui-form-css');
require_celerity_resource('phabricator-standard-page-view');
require_celerity_resource('conpherence-durable-column-view');
require_celerity_resource('font-lato');
Javelin::initBehavior('workflow', array());
......
......@@ -5,7 +5,6 @@ final class PHUIDocumentView extends AphrontTagView {
/* For mobile displays, where do you want the sidebar */
const NAV_BOTTOM = 'nav_bottom';
const NAV_TOP = 'nav_top';
const FONT_SOURCE_SANS = 'source-sans';
private $offset;
private $header;
......@@ -15,7 +14,6 @@ final class PHUIDocumentView extends AphrontTagView {
private $bookname;
private $bookdescription;
private $mobileview;
private $fontKit;
private $fluid;
public function setOffset($offset) {
......@@ -53,11 +51,6 @@ final class PHUIDocumentView extends AphrontTagView {
return $this;
}
public function setFontKit($kit) {
$this->fontKit = $kit;
return $this;
}
public function setFluid($fluid) {
$this->fluid = $fluid;
return $this;
......@@ -81,15 +74,6 @@ final class PHUIDocumentView extends AphrontTagView {
protected function getTagContent() {
require_celerity_resource('phui-document-view-css');
if ($this->fontKit) {
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';
......@@ -135,16 +119,7 @@ final class PHUIDocumentView extends AphrontTagView {
$this->bookName);
}
if ($this->fontKit) {
$main_content = phutil_tag(
'div',
array(
'class' => 'phui-font-'.$this->fontKit,
),
$this->renderChildren());
} else {
$main_content = $this->renderChildren();
}
$main_content = $this->renderChildren();
if ($book) {
$this->header->setSubheader($book);
......
......@@ -9,7 +9,6 @@ final class PHUIRemarkupPreviewPanel extends AphrontTagView {
private $loadingText;
private $controlID;
private $previewURI;
private $skin = 'default';
protected function canAppendChild() {
return false;
......@@ -35,24 +34,6 @@ final class PHUIRemarkupPreviewPanel extends AphrontTagView {
return $this;
}
public function setSkin($skin) {
static $skins = array(
'default' => true,
'document' => true,
);
if (empty($skins[$skin])) {
throw new Exception(
pht(
"Invalid skin '%s'. Valid skins are: %s.",
$skin,
implode(', ', array_keys($skins))));
}
$this->skin = $skin;
return $this;
}
protected function getTagName() {
return 'div';
}
......@@ -61,10 +42,6 @@ final class PHUIRemarkupPreviewPanel extends AphrontTagView {
$classes = array();
$classes[] = 'phui-remarkup-preview';
if ($this->skin) {
$classes[] = 'phui-remarkup-preview-skin-'.$this->skin;
}
return array(
'class' => $classes,
);
......@@ -116,23 +93,12 @@ final class PHUIRemarkupPreviewPanel extends AphrontTagView {
$content = array($header, $preview);
switch ($this->skin) {
case 'document':
$content = id(new PHUIDocumentView())
->appendChild($content)
->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS);
break;
default:
$content = id(new PHUIBoxView())
->appendChild($content)
->setBorder(true)
->addMargin(PHUI::MARGIN_LARGE)
->addPadding(PHUI::PADDING_LARGE)
->addClass('phui-panel-preview');
break;
}
return $content;
return id(new PHUIBoxView())
->appendChild($content)
->setBorder(true)
->addMargin(PHUI::MARGIN_LARGE)
->addPadding(PHUI::PADDING_LARGE)
->addClass('phui-panel-preview');
}
}
......@@ -250,13 +250,16 @@
}
.conpherence-durable-column-transactions .conpherence-transaction-detail
.conpherence-transaction-header .conpherence-transaction-info,
.conpherence-transaction-header .epoch-link {
.conpherence-transaction-header .conpherence-transaction-info {
color: {$lightbluetext};
float: none;
font-size: 12px;
}
.conpherence-transaction-header .epoch-link {
color: {$lightgreytext};
}
.conpherence-durable-column-transactions .conpherence-transaction-detail
.conpherence-transaction-header .phui-link-person {
margin: 0 8px 0 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment