Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15415854
D11499.id27657.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
9 KB
Referenced Files
None
Subscribers
None
D11499.id27657.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' => '232f2fa7',
+ 'core.pkg.css' => '3a55c973',
'core.pkg.js' => '63963771',
'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '8af45893',
@@ -36,9 +36,9 @@
'rsrc/css/aphront/typeahead.css' => '0e403212',
'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
'rsrc/css/application/auth/auth.css' => '1e655982',
- 'rsrc/css/application/base/main-menu-view.css' => '3cf893a9',
+ 'rsrc/css/application/base/main-menu-view.css' => '7bb9c588',
'rsrc/css/application/base/notification-menu.css' => '6aa0a74b',
- 'rsrc/css/application/base/phabricator-application-launch-view.css' => '5d71008f',
+ 'rsrc/css/application/base/phabricator-application-launch-view.css' => '16ca323f',
'rsrc/css/application/base/standard-page-view.css' => '6dafdb3b',
'rsrc/css/application/chatlog/chatlog.css' => '852140ff',
'rsrc/css/application/config/config-options.css' => '7fedf08b',
@@ -136,7 +136,7 @@
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
'rsrc/css/phui/phui-list.css' => '53deb25c',
'rsrc/css/phui/phui-object-box.css' => '0d47b3c8',
- 'rsrc/css/phui/phui-object-item-list-view.css' => 'de963765',
+ 'rsrc/css/phui/phui-object-item-list-view.css' => 'b9f11c9e',
'rsrc/css/phui/phui-pinboard-view.css' => '3dd4a269',
'rsrc/css/phui/phui-property-list-view.css' => '51480060',
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
@@ -701,7 +701,7 @@
'path-typeahead' => 'f7fc67ec',
'people-profile-css' => '25970776',
'phabricator-action-list-view-css' => '9ee9910a',
- 'phabricator-application-launch-view-css' => '5d71008f',
+ 'phabricator-application-launch-view-css' => '16ca323f',
'phabricator-busy' => '6453c869',
'phabricator-chatlog-css' => '852140ff',
'phabricator-content-source-view-css' => '4b8b05d4',
@@ -719,7 +719,7 @@
'phabricator-hovercard-view-css' => '893f4783',
'phabricator-keyboard-shortcut' => '1ae869f2',
'phabricator-keyboard-shortcut-manager' => 'c1700f6f',
- 'phabricator-main-menu-view' => '3cf893a9',
+ 'phabricator-main-menu-view' => '7bb9c588',
'phabricator-nav-view-css' => '7aeaf435',
'phabricator-notification' => '0c6946e7',
'phabricator-notification-css' => '9c279160',
@@ -780,7 +780,7 @@
'phui-info-panel-css' => '27ea50a1',
'phui-list-view-css' => '53deb25c',
'phui-object-box-css' => '0d47b3c8',
- 'phui-object-item-list-view-css' => 'de963765',
+ 'phui-object-item-list-view-css' => 'b9f11c9e',
'phui-pinboard-view-css' => '3dd4a269',
'phui-property-list-view-css' => '51480060',
'phui-remarkup-preview-css' => '19ad512b',
diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -19,7 +19,7 @@
}
public function getFontIcon() {
- return 'fa-file-code-o';
+ return 'fa-code';
}
public function isPinnedByDefault(PhabricatorUser $viewer) {
diff --git a/src/applications/diviner/application/PhabricatorDivinerApplication.php b/src/applications/diviner/application/PhabricatorDivinerApplication.php
--- a/src/applications/diviner/application/PhabricatorDivinerApplication.php
+++ b/src/applications/diviner/application/PhabricatorDivinerApplication.php
@@ -11,7 +11,7 @@
}
public function getFontIcon() {
- return 'fa-sun';
+ return 'fa-sun-o';
}
public function getName() {
diff --git a/src/applications/macro/application/PhabricatorMacroApplication.php b/src/applications/macro/application/PhabricatorMacroApplication.php
--- a/src/applications/macro/application/PhabricatorMacroApplication.php
+++ b/src/applications/macro/application/PhabricatorMacroApplication.php
@@ -19,7 +19,7 @@
}
public function getFontIcon() {
- return 'fa-smile';
+ return 'fa-smile-o';
}
public function getTitleGlyph() {
diff --git a/src/applications/meta/query/PhabricatorAppSearchEngine.php b/src/applications/meta/query/PhabricatorAppSearchEngine.php
--- a/src/applications/meta/query/PhabricatorAppSearchEngine.php
+++ b/src/applications/meta/query/PhabricatorAppSearchEngine.php
@@ -191,7 +191,7 @@
$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 @@
$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,
),
'');
diff --git a/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php b/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php
--- a/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php
+++ b/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php
@@ -24,7 +24,7 @@
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 @@
->setDisplayType($application->getShortDescription())
->setImageuRI($application->getIconURI())
->setPriorityType('apps')
- ->setImageSprite('phabricator-search-icon sprite-apps-large '.$img);
+ ->setImageSprite('phabricator-search-icon '.$img);
}
return $results;
diff --git a/src/applications/meta/view/PhabricatorApplicationLaunchView.php b/src/applications/meta/view/PhabricatorApplicationLaunchView.php
--- a/src/applications/meta/view/PhabricatorApplicationLaunchView.php
+++ b/src/applications/meta/view/PhabricatorApplicationLaunchView.php
@@ -31,7 +31,6 @@
$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 @@
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(
diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css
--- a/webroot/rsrc/css/application/base/main-menu-view.css
+++ b/webroot/rsrc/css/application/base/main-menu-view.css
@@ -214,12 +214,14 @@
}
.phabricator-main-search-typeahead-result .phabricator-search-icon {
- display: inline-block;
width: 28px;
height: 28px;
position: absolute;
- top: 9px;
- left: 9px;
+ top: 8px;
+ left: 8px;
+ font-size: 24px;
+ text-align: center;
+ vertical-align: bottom;
}
.phabricator-main-search-typeahead-result {
diff --git a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css
--- a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css
+++ b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css
@@ -38,12 +38,16 @@
}
.phabricator-application-launch-icon {
- display: block;
position: absolute;
width: 28px;
height: 28px;
- top: 8px;
- left: 8px;
+ top: 12px;
+ left: 6px;
+ font-size: 20px;
+ text-align: center;
+ vertical-align: bottom;
+ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9);
+ color: {$darkbluetext};
}
.device-desktop a.phabricator-application-launch-container:hover {
@@ -56,14 +60,14 @@
font-weight: bold;
color: {$darkbluetext};
font-size: 13px;
- margin: 6px 0 2px 44px;
+ margin: 6px 0 2px 38px;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9);
}
.phabricator-application-launch-description {
- color: {$bluetext};
+ color: {$darkbluetext};
font-size: 11px;
- margin-left: 44px;
+ margin-left: 38px;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.9);
text-overflow: ellipsis;
width: 150px;
diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css
--- a/webroot/rsrc/css/phui/phui-object-item-list-view.css
+++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css
@@ -737,10 +737,13 @@
.phui-object-item-image-icon .phui-icon-view {
position: absolute;
- width: 28px;
- height: 28px;
- left: 8px;
- top: 8px;
+ width: 24px;
+ height: 24px;
+ left: 6px;
+ top: 10px;
+ font-size: 24px;
+ text-align: center;
+ vertical-align: bottom;
}
.phui-object-item-with-image-icon .phui-object-item-frame {
@@ -748,7 +751,7 @@
}
.phui-object-item-with-image-icon .phui-object-item-content-box {
- margin-left: 44px;
+ margin-left: 36px;
}
.device-desktop .phui-object-item-launcher-list .phui-object-item-content {
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Mar 21, 7:59 AM (3 d, 11 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7572758
Default Alt Text
D11499.id27657.diff (9 KB)
Attached To
Mode
D11499: Roll out more FontIcons
Attached
Detach File
Event Timeline
Log In to Comment