Roll out more FontIcons

Summary: Sidenav launcher, search typeahead results, apps launcher

Test Plan:
Used each of these items

{F275814}

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D11499
This commit is contained in:
Chad Little
2015-01-26 08:19:22 -08:00
parent b303d719ef
commit 96edc9d2bc
21 changed files with 54 additions and 900 deletions

View File

@@ -434,15 +434,15 @@ abstract class PhabricatorController extends AphrontController {
$application = $this->getCurrentApplication();
if ($application) {
$sprite = $application->getIconName();
if (!$sprite) {
$sprite = 'application';
$icon = $application->getFontIcon();
if (!$icon) {
$icon = 'fa-puzzle';
}
$crumbs[] = id(new PHUICrumbView())
->setHref($this->getApplicationURI())
->setAural($application->getName())
->setIcon($sprite);
->setIcon($icon);
}
$view = new PHUICrumbsView();

View File

@@ -19,7 +19,7 @@ final class PhabricatorDiffusionApplication extends PhabricatorApplication {
}
public function getFontIcon() {
return 'fa-file-code-o';
return 'fa-code';
}
public function isPinnedByDefault(PhabricatorUser $viewer) {

View File

@@ -11,7 +11,7 @@ final class PhabricatorDivinerApplication extends PhabricatorApplication {
}
public function getFontIcon() {
return 'fa-sun';
return 'fa-sun-o';
}
public function getName() {

View File

@@ -19,7 +19,7 @@ final class PhabricatorMacroApplication extends PhabricatorApplication {
}
public function getFontIcon() {
return 'fa-smile';
return 'fa-smile-o';
}
public function getTitleGlyph() {

View File

@@ -191,7 +191,7 @@ final class PhabricatorAppSearchEngine
$list->addClass('phui-object-item-launcher-list');
foreach ($applications as $application) {
$icon = $application->getIconName();
$icon = $application->getFontIcon();
if (!$icon) {
$icon = 'application';
}
@@ -203,8 +203,7 @@ final class PhabricatorAppSearchEngine
$icon_view = javelin_tag(
'span',
array(
'class' => 'phui-icon-view '.
'sprite-apps-large apps-'.$icon.'-dark-large',
'class' => 'phui-icon-view phui-font-fa '.$icon,
'aural' => false,
),
'');

View File

@@ -24,7 +24,7 @@ final class PhabricatorApplicationDatasource
continue;
}
$name = $application->getName().' '.$application->getShortDescription();
$img = 'apps-'.$application->getIconName().'-dark-large';
$img = 'phui-font-fa phui-icon-view '.$application->getFontIcon();
$results[] = id(new PhabricatorTypeaheadResult())
->setName($name)
->setURI($uri)
@@ -34,7 +34,7 @@ final class PhabricatorApplicationDatasource
->setDisplayType($application->getShortDescription())
->setImageuRI($application->getIconURI())
->setPriorityType('apps')
->setImageSprite('phabricator-search-icon sprite-apps-large '.$img);
->setImageSprite('phabricator-search-icon '.$img);
}
return $results;

View File

@@ -31,7 +31,6 @@ final class PhabricatorApplicationLaunchView extends AphrontTagView {
$application = $this->application;
require_celerity_resource('phabricator-application-launch-view-css');
require_celerity_resource('sprite-apps-large-css');
$content = array();
$icon = null;
@@ -113,9 +112,9 @@ final class PhabricatorApplicationLaunchView extends AphrontTagView {
if ($application->getIconURI()) {
$styles[] = 'background-image: url('.$application->getIconURI().')';
} else {
$icon = $application->getIconName();
$classes[] = 'sprite-apps-large';
$classes[] = 'apps-'.$icon.'-dark-large';
$classes[] = $application->getFontIcon();
$classes[] = 'phui-icon-view';
$classes[] = 'phui-font-fa';
}
$icon = phutil_tag(

View File

@@ -141,7 +141,7 @@ final class PhabricatorHomePreferencesSettingsPanel
continue;
}
$icon = $application->getIconName();
$icon = $application->getFontIcon();
if (!$icon) {
$icon = 'application';
}
@@ -149,8 +149,7 @@ final class PhabricatorHomePreferencesSettingsPanel
$icon_view = javelin_tag(
'span',
array(
'class' => 'phui-icon-view '.
'sprite-apps-large apps-'.$icon.'-dark-large',
'class' => 'phui-icon-view phui-font-fa '.$icon,
'aural' => false,
),
'');

View File

@@ -72,8 +72,7 @@ final class PHUICrumbView extends AphrontView {
$icon = phutil_tag(
'span',
array(
'class' => 'phui-crumb-icon '.
'sprite-apps-large apps-'.$this->icon.'-dark-large',
'class' => 'phui-crumb-icon phui-icon-view phui-font-fa '.$this->icon,
),
'');
}