1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-26 08:42:41 +01:00

Use new application icons and intended side nav icons

Summary: @chad, can you do the icon sheets based on 1.6? We're using a few icons not present in 1.5. I put the 1.6 "pro" source on Dropbox.

Test Plan:
Nav hover and selected states:

{F20598}

Launch hover state:

{F20596}

Reviewers: chad

Reviewed By: chad

CC: aran

Maniphest Tasks: T1856

Differential Revision: https://secure.phabricator.com/D3649
This commit is contained in:
epriestley 2012-10-06 14:48:46 -07:00
parent 22cb8f5d08
commit a7cdc312e6
8 changed files with 537 additions and 131 deletions

View file

@ -105,17 +105,46 @@ foreach ($icon_map as $icon => $coords) {
} }
} }
$app_template_full = id(new PhutilSprite()) $app_template_large = id(new PhutilSprite())
->setSourceFile($srcroot.'/application_normal_2x.png') ->setSourceFile($srcroot.'/application_large_1x.png')
->setSourceSize(60, 60); ->setSourceSize(60, 60);
$app_template_mini = id(new PhutilSprite()) $app_template_large_hover = id(new PhutilSprite())
->setSourceFile($srcroot.'/application_large_hover_1x.png')
->setSourceSize(60, 60);
$app_template_small = id(new PhutilSprite())
->setSourceFile($srcroot.'/menu_normal_1x.png') ->setSourceFile($srcroot.'/menu_normal_1x.png')
->setSourceSize(30, 30); ->setSourceSize(30, 30);
$app_template_small_hover = id(new PhutilSprite())
->setSourceFile($srcroot.'/menu_hover_1x.png')
->setSourceSize(30, 30);
$app_template_small_selected = id(new PhutilSprite())
->setSourceFile($srcroot.'/menu_selected_1x.png')
->setSourceSize(30, 30);
$app_source_map = array( $app_source_map = array(
'-full' => array($app_template_full, 2), '-large' => array($app_template_large, 2),
'' => array($app_template_mini, 1),
// For the application launch view, we only show hover state on the desktop
// because it looks glitchy on touch devices. We show the hover state when
// the surrounding <a> is hovered, not the icon itself.
'-large /* hover */' => array(
$app_template_large_hover,
2,
'.device-desktop .phabricator-application-launch-container:hover '),
'' => array($app_template_small, 1),
// Show hover state only for the desktop.
':hover' => array(
$app_template_small_hover,
1,
'.device-desktop ',
),
'-selected' => array($app_template_small_selected, 1),
); );
$app_map = array( $app_map = array(
@ -157,10 +186,15 @@ foreach ($app_map as $icon => $coords) {
list($x, $y) = $coords; list($x, $y) = $coords;
foreach ($app_source_map as $suffix => $spec) { foreach ($app_source_map as $suffix => $spec) {
list($template, $scale) = $spec; list($template, $scale) = $spec;
if (isset($spec[2])) {
$prefix = $spec[2];
} else {
$prefix = '';
}
$sheet->addSprite( $sheet->addSprite(
id(clone $template) id(clone $template)
->setSourcePosition(($xadj + glx($x)) * $scale, gly($y) * $scale) ->setSourcePosition(($xadj + glx($x)) * $scale, gly($y) * $scale)
->setTargetCSS('.app-'.$icon.$suffix)); ->setTargetCSS($prefix.'.app-'.$icon.$suffix));
} }
} }

View file

@ -51,8 +51,8 @@ celerity_register_resource_map(array(
), ),
'/rsrc/image/autosprite.png' => '/rsrc/image/autosprite.png' =>
array( array(
'hash' => '10b50d4636be52a6f36fb28b3a05f90e', 'hash' => 'c7f9d2dd752a24c518c0eb426a4853a5',
'uri' => '/res/10b50d46/rsrc/image/autosprite.png', 'uri' => '/res/c7f9d2dd/rsrc/image/autosprite.png',
'disk' => '/rsrc/image/autosprite.png', 'disk' => '/rsrc/image/autosprite.png',
'type' => 'png', 'type' => 'png',
), ),
@ -657,7 +657,7 @@ celerity_register_resource_map(array(
), ),
'autosprite-css' => 'autosprite-css' =>
array( array(
'uri' => '/res/5de6fe77/rsrc/css/autosprite.css', 'uri' => '/res/947e1dcf/rsrc/css/autosprite.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -2298,7 +2298,7 @@ celerity_register_resource_map(array(
), ),
'phabricator-application-launch-view-css' => 'phabricator-application-launch-view-css' =>
array( array(
'uri' => '/res/51aa93f4/rsrc/css/application/base/phabricator-application-launch-view.css', 'uri' => '/res/cd9e0fcb/rsrc/css/application/base/phabricator-application-launch-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -2490,7 +2490,7 @@ celerity_register_resource_map(array(
), ),
'phabricator-nav-view-css' => 'phabricator-nav-view-css' =>
array( array(
'uri' => '/res/bdb3b66e/rsrc/css/aphront/phabricator-nav-view.css', 'uri' => '/res/cda35516/rsrc/css/aphront/phabricator-nav-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(

View file

@ -97,7 +97,7 @@ final class PhabricatorApplicationLaunchView extends AphrontView {
} else { } else {
$autosprite = $application->getAutospriteName(); $autosprite = $application->getAutospriteName();
$classes[] = 'autosprite'; $classes[] = 'autosprite';
$classes[] = 'app-'.$autosprite.'-full'; $classes[] = 'app-'.$autosprite.'-large';
} }
$icon = phutil_render_tag( $icon = phutil_render_tag(

View file

@ -226,8 +226,11 @@ final class AphrontSideNavView extends AphrontView {
foreach ($core as $phid => $application) { foreach ($core as $phid => $application) {
$classes = array(); $classes = array();
$classes[] = 'phabricator-nav-app-item'; $classes[] = 'phabricator-nav-app-item';
if ($current && $phid == $current->getPHID()) { if ($current && $phid == $current->getPHID()) {
$classes[] = 'phabricator-nav-app-item-selected'; $selected = true;
} else {
$selected = false;
} }
$iclasses = array(); $iclasses = array();
@ -238,7 +241,11 @@ final class AphrontSideNavView extends AphrontView {
'background-size: 30px auto;'; 'background-size: 30px auto;';
} else { } else {
$iclasses[] = 'autosprite'; $iclasses[] = 'autosprite';
$iclasses[] = 'app-'.$application->getAutospriteName(); $sprite = $application->getAutospriteName();
if ($selected) {
$sprite .= '-selected';
}
$iclasses[] = 'app-'.$sprite;
} }
$icon = phutil_render_tag( $icon = phutil_render_tag(

View file

@ -113,11 +113,6 @@
background-color: #a1bbe5; background-color: #a1bbe5;
} }
.device-desktop .phabricator-nav-col a:hover {
background-color: #3875d7;
color: #ffffff;
}
a.phabricator-nav-app-item { a.phabricator-nav-app-item {
color: #e9e9e9; color: #e9e9e9;
font-weight: normal; font-weight: normal;
@ -139,10 +134,6 @@ a.phabricator-nav-app-item {
padding-right: 0px; padding-right: 0px;
} }
a.phabricator-nav-app-item-selected {
background-color: #55595d;
}
span.phabricator-nav-app-item-icon { span.phabricator-nav-app-item-icon {
position: absolute; position: absolute;
display: block; display: block;

View file

@ -126,7 +126,9 @@ a.phabricator-application-launch-container:hover {
} }
.device-desktop a.phabricator-application-launch-container:hover .device-desktop a.phabricator-application-launch-container:hover
.phabricator-application-status { .phabricator-application-status,
.device-desktop a.phabricator-application-launch-container:hover
.phabricator-application-flavor-text {
color: #eeeeee; color: #eeeeee;
} }

View file

@ -68,310 +68,682 @@
background-position: 0px -378px; background-position: 0px -378px;
} }
.app-differential-full { .app-differential-large {
background-position: 0px -405px; background-position: 0px -405px;
} }
.app-differential { .device-desktop .phabricator-application-launch-container:hover .app-differential-large /* hover */ {
background-position: 0px -466px; background-position: 0px -466px;
} }
.app-fact-full { .app-differential {
background-position: 0px -497px; background-position: 0px -527px;
} }
.app-fact { .device-desktop .app-differential:hover {
background-position: 0px -558px; background-position: 0px -558px;
} }
.app-mail-full { .app-differential-selected {
background-position: 0px -589px; background-position: 0px -589px;
} }
.app-mail { .app-fact-large {
background-position: 0px -650px; background-position: 0px -620px;
} }
.app-diffusion-full { .device-desktop .phabricator-application-launch-container:hover .app-fact-large /* hover */ {
background-position: 0px -681px; background-position: 0px -681px;
} }
.app-diffusion { .app-fact {
background-position: 0px -742px; background-position: 0px -742px;
} }
.app-slowvote-full { .device-desktop .app-fact:hover {
background-position: 0px -773px; background-position: 0px -773px;
} }
.app-slowvote { .app-fact-selected {
background-position: 0px -834px; background-position: 0px -804px;
} }
.app-phriction-full { .app-mail-large {
background-position: 0px -865px; background-position: 0px -835px;
} }
.app-phriction { .device-desktop .phabricator-application-launch-container:hover .app-mail-large /* hover */ {
background-position: 0px -926px; background-position: 0px -896px;
} }
.app-maniphest-full { .app-mail {
background-position: 0px -957px; background-position: 0px -957px;
} }
.app-maniphest { .device-desktop .app-mail:hover {
background-position: 0px -1018px; background-position: 0px -988px;
} }
.app-flags-full { .app-mail-selected {
background-position: 0px -1049px; background-position: 0px -1019px;
}
.app-diffusion-large {
background-position: 0px -1050px;
}
.device-desktop .phabricator-application-launch-container:hover .app-diffusion-large /* hover */ {
background-position: 0px -1111px;
}
.app-diffusion {
background-position: 0px -1172px;
}
.device-desktop .app-diffusion:hover {
background-position: 0px -1203px;
}
.app-diffusion-selected {
background-position: 0px -1234px;
}
.app-slowvote-large {
background-position: 0px -1265px;
}
.device-desktop .phabricator-application-launch-container:hover .app-slowvote-large /* hover */ {
background-position: 0px -1326px;
}
.app-slowvote {
background-position: 0px -1387px;
}
.device-desktop .app-slowvote:hover {
background-position: 0px -1418px;
}
.app-slowvote-selected {
background-position: 0px -1449px;
}
.app-phriction-large {
background-position: 0px -1480px;
}
.device-desktop .phabricator-application-launch-container:hover .app-phriction-large /* hover */ {
background-position: 0px -1541px;
}
.app-phriction {
background-position: 0px -1602px;
}
.device-desktop .app-phriction:hover {
background-position: 0px -1633px;
}
.app-phriction-selected {
background-position: 0px -1664px;
}
.app-maniphest-large {
background-position: 0px -1695px;
}
.device-desktop .phabricator-application-launch-container:hover .app-maniphest-large /* hover */ {
background-position: 0px -1756px;
}
.app-maniphest {
background-position: 0px -1817px;
}
.device-desktop .app-maniphest:hover {
background-position: 0px -1848px;
}
.app-maniphest-selected {
background-position: 0px -1879px;
}
.app-flags-large {
background-position: 0px -1910px;
}
.device-desktop .phabricator-application-launch-container:hover .app-flags-large /* hover */ {
background-position: 0px -1971px;
} }
.app-flags { .app-flags {
background-position: 0px -1110px; background-position: 0px -2032px;
} }
.app-settings-full { .device-desktop .app-flags:hover {
background-position: 0px -1141px; background-position: 0px -2063px;
}
.app-flags-selected {
background-position: 0px -2094px;
}
.app-settings-large {
background-position: 0px -2125px;
}
.device-desktop .phabricator-application-launch-container:hover .app-settings-large /* hover */ {
background-position: 0px -2186px;
} }
.app-settings { .app-settings {
background-position: 0px -1202px; background-position: 0px -2247px;
} }
.app-applications-full { .device-desktop .app-settings:hover {
background-position: 0px -1233px; background-position: 0px -2278px;
}
.app-settings-selected {
background-position: 0px -2309px;
}
.app-applications-large {
background-position: 0px -2340px;
}
.device-desktop .phabricator-application-launch-container:hover .app-applications-large /* hover */ {
background-position: 0px -2401px;
} }
.app-applications { .app-applications {
background-position: 0px -1294px; background-position: 0px -2462px;
} }
.app-default-full { .device-desktop .app-applications:hover {
background-position: 0px -1325px; background-position: 0px -2493px;
}
.app-applications-selected {
background-position: 0px -2524px;
}
.app-default-large {
background-position: 0px -2555px;
}
.device-desktop .phabricator-application-launch-container:hover .app-default-large /* hover */ {
background-position: 0px -2616px;
} }
.app-default { .app-default {
background-position: 0px -1386px; background-position: 0px -2677px;
} }
.app-people-full { .device-desktop .app-default:hover {
background-position: 0px -1417px; background-position: 0px -2708px;
}
.app-default-selected {
background-position: 0px -2739px;
}
.app-people-large {
background-position: 0px -2770px;
}
.device-desktop .phabricator-application-launch-container:hover .app-people-large /* hover */ {
background-position: 0px -2831px;
} }
.app-people { .app-people {
background-position: 0px -1478px; background-position: 0px -2892px;
} }
.app-ponder-full { .device-desktop .app-people:hover {
background-position: 0px -1509px; background-position: 0px -2923px;
}
.app-people-selected {
background-position: 0px -2954px;
}
.app-ponder-large {
background-position: 0px -2985px;
}
.device-desktop .phabricator-application-launch-container:hover .app-ponder-large /* hover */ {
background-position: 0px -3046px;
} }
.app-ponder { .app-ponder {
background-position: 0px -1570px; background-position: 0px -3107px;
} }
.app-calendar-full { .device-desktop .app-ponder:hover {
background-position: 0px -1601px; background-position: 0px -3138px;
}
.app-ponder-selected {
background-position: 0px -3169px;
}
.app-calendar-large {
background-position: 0px -3200px;
}
.device-desktop .phabricator-application-launch-container:hover .app-calendar-large /* hover */ {
background-position: 0px -3261px;
} }
.app-calendar { .app-calendar {
background-position: 0px -1662px; background-position: 0px -3322px;
} }
.app-files-full { .device-desktop .app-calendar:hover {
background-position: 0px -1693px; background-position: 0px -3353px;
}
.app-calendar-selected {
background-position: 0px -3384px;
}
.app-files-large {
background-position: 0px -3415px;
}
.device-desktop .phabricator-application-launch-container:hover .app-files-large /* hover */ {
background-position: 0px -3476px;
} }
.app-files { .app-files {
background-position: 0px -1754px; background-position: 0px -3537px;
} }
.app-projects-full { .device-desktop .app-files:hover {
background-position: 0px -1785px; background-position: 0px -3568px;
}
.app-files-selected {
background-position: 0px -3599px;
}
.app-projects-large {
background-position: 0px -3630px;
}
.device-desktop .phabricator-application-launch-container:hover .app-projects-large /* hover */ {
background-position: 0px -3691px;
} }
.app-projects { .app-projects {
background-position: 0px -1846px; background-position: 0px -3752px;
} }
.app-daemons-full { .device-desktop .app-projects:hover {
background-position: 0px -1877px; background-position: 0px -3783px;
}
.app-projects-selected {
background-position: 0px -3814px;
}
.app-daemons-large {
background-position: 0px -3845px;
}
.device-desktop .phabricator-application-launch-container:hover .app-daemons-large /* hover */ {
background-position: 0px -3906px;
} }
.app-daemons { .app-daemons {
background-position: 0px -1938px; background-position: 0px -3967px;
} }
.app-herald-full { .device-desktop .app-daemons:hover {
background-position: 0px -1969px; background-position: 0px -3998px;
}
.app-daemons-selected {
background-position: 0px -4029px;
}
.app-herald-large {
background-position: 0px -4060px;
}
.device-desktop .phabricator-application-launch-container:hover .app-herald-large /* hover */ {
background-position: 0px -4121px;
} }
.app-herald { .app-herald {
background-position: 0px -2030px; background-position: 0px -4182px;
} }
.app-countdown-full { .device-desktop .app-herald:hover {
background-position: 0px -2061px; background-position: 0px -4213px;
}
.app-herald-selected {
background-position: 0px -4244px;
}
.app-countdown-large {
background-position: 0px -4275px;
}
.device-desktop .phabricator-application-launch-container:hover .app-countdown-large /* hover */ {
background-position: 0px -4336px;
} }
.app-countdown { .app-countdown {
background-position: 0px -2122px; background-position: 0px -4397px;
} }
.app-conduit-full { .device-desktop .app-countdown:hover {
background-position: 0px -2153px; background-position: 0px -4428px;
}
.app-countdown-selected {
background-position: 0px -4459px;
}
.app-conduit-large {
background-position: 0px -4490px;
}
.device-desktop .phabricator-application-launch-container:hover .app-conduit-large /* hover */ {
background-position: 0px -4551px;
} }
.app-conduit { .app-conduit {
background-position: 0px -2214px; background-position: 0px -4612px;
} }
.app-feed-full { .device-desktop .app-conduit:hover {
background-position: 0px -2245px; background-position: 0px -4643px;
}
.app-conduit-selected {
background-position: 0px -4674px;
}
.app-feed-large {
background-position: 0px -4705px;
}
.device-desktop .phabricator-application-launch-container:hover .app-feed-large /* hover */ {
background-position: 0px -4766px;
} }
.app-feed { .app-feed {
background-position: 0px -2306px; background-position: 0px -4827px;
} }
.app-paste-full { .device-desktop .app-feed:hover {
background-position: 0px -2337px; background-position: 0px -4858px;
}
.app-feed-selected {
background-position: 0px -4889px;
}
.app-paste-large {
background-position: 0px -4920px;
}
.device-desktop .phabricator-application-launch-container:hover .app-paste-large /* hover */ {
background-position: 0px -4981px;
} }
.app-paste { .app-paste {
background-position: 0px -2398px; background-position: 0px -5042px;
} }
.app-audit-full { .device-desktop .app-paste:hover {
background-position: 0px -2429px; background-position: 0px -5073px;
}
.app-paste-selected {
background-position: 0px -5104px;
}
.app-audit-large {
background-position: 0px -5135px;
}
.device-desktop .phabricator-application-launch-container:hover .app-audit-large /* hover */ {
background-position: 0px -5196px;
} }
.app-audit { .app-audit {
background-position: 0px -2490px; background-position: 0px -5257px;
} }
.app-uiexample-full { .device-desktop .app-audit:hover {
background-position: 0px -2521px; background-position: 0px -5288px;
}
.app-audit-selected {
background-position: 0px -5319px;
}
.app-uiexample-large {
background-position: 0px -5350px;
}
.device-desktop .phabricator-application-launch-container:hover .app-uiexample-large /* hover */ {
background-position: 0px -5411px;
} }
.app-uiexample { .app-uiexample {
background-position: 0px -2582px; background-position: 0px -5472px;
} }
.app-phpast-full { .device-desktop .app-uiexample:hover {
background-position: 0px -2613px; background-position: 0px -5503px;
}
.app-uiexample-selected {
background-position: 0px -5534px;
}
.app-phpast-large {
background-position: 0px -5565px;
}
.device-desktop .phabricator-application-launch-container:hover .app-phpast-large /* hover */ {
background-position: 0px -5626px;
} }
.app-phpast { .app-phpast {
background-position: 0px -2674px; background-position: 0px -5687px;
} }
.app-owners-full { .device-desktop .app-phpast:hover {
background-position: 0px -2705px; background-position: 0px -5718px;
}
.app-phpast-selected {
background-position: 0px -5749px;
}
.app-owners-large {
background-position: 0px -5780px;
}
.device-desktop .phabricator-application-launch-container:hover .app-owners-large /* hover */ {
background-position: 0px -5841px;
} }
.app-owners { .app-owners {
background-position: 0px -2766px; background-position: 0px -5902px;
} }
.app-phid-full { .device-desktop .app-owners:hover {
background-position: 0px -2797px; background-position: 0px -5933px;
}
.app-owners-selected {
background-position: 0px -5964px;
}
.app-phid-large {
background-position: 0px -5995px;
}
.device-desktop .phabricator-application-launch-container:hover .app-phid-large /* hover */ {
background-position: 0px -6056px;
} }
.app-phid { .app-phid {
background-position: 0px -2858px; background-position: 0px -6117px;
} }
.app-diviner-full { .device-desktop .app-phid:hover {
background-position: 0px -2889px; background-position: 0px -6148px;
}
.app-phid-selected {
background-position: 0px -6179px;
}
.app-diviner-large {
background-position: 0px -6210px;
}
.device-desktop .phabricator-application-launch-container:hover .app-diviner-large /* hover */ {
background-position: 0px -6271px;
} }
.app-diviner { .app-diviner {
background-position: 0px -2950px; background-position: 0px -6332px;
} }
.app-repositories-full { .device-desktop .app-diviner:hover {
background-position: 0px -2981px; background-position: 0px -6363px;
}
.app-diviner-selected {
background-position: 0px -6394px;
}
.app-repositories-large {
background-position: 0px -6425px;
}
.device-desktop .phabricator-application-launch-container:hover .app-repositories-large /* hover */ {
background-position: 0px -6486px;
} }
.app-repositories { .app-repositories {
background-position: 0px -3042px; background-position: 0px -6547px;
} }
.app-phame-full { .device-desktop .app-repositories:hover {
background-position: 0px -3073px; background-position: 0px -6578px;
}
.app-repositories-selected {
background-position: 0px -6609px;
}
.app-phame-large {
background-position: 0px -6640px;
}
.device-desktop .phabricator-application-launch-container:hover .app-phame-large /* hover */ {
background-position: 0px -6701px;
} }
.app-phame { .app-phame {
background-position: 0px -3134px; background-position: 0px -6762px;
} }
.app-macro-full { .device-desktop .app-phame:hover {
background-position: 0px -3165px; background-position: 0px -6793px;
}
.app-phame-selected {
background-position: 0px -6824px;
}
.app-macro-large {
background-position: 0px -6855px;
}
.device-desktop .phabricator-application-launch-container:hover .app-macro-large /* hover */ {
background-position: 0px -6916px;
} }
.app-macro { .app-macro {
background-position: 0px -3226px; background-position: 0px -6977px;
}
.device-desktop .app-macro:hover {
background-position: 0px -7008px;
}
.app-macro-selected {
background-position: 0px -7039px;
} }
.action-file { .action-file {
background-position: 0px -3257px; background-position: 0px -7070px;
} }
.action-fork { .action-fork {
background-position: 0px -3274px; background-position: 0px -7087px;
} }
.action-edit { .action-edit {
background-position: 0px -3291px; background-position: 0px -7104px;
} }
.action-flag-0 { .action-flag-0 {
background-position: 0px -3308px; background-position: 0px -7121px;
} }
.action-flag-1 { .action-flag-1 {
background-position: 0px -3325px; background-position: 0px -7138px;
} }
.action-flag-2 { .action-flag-2 {
background-position: 0px -3342px; background-position: 0px -7155px;
} }
.action-flag-3 { .action-flag-3 {
background-position: 0px -3359px; background-position: 0px -7172px;
} }
.action-flag-4 { .action-flag-4 {
background-position: 0px -3376px; background-position: 0px -7189px;
} }
.action-flag-5 { .action-flag-5 {
background-position: 0px -3393px; background-position: 0px -7206px;
} }
.action-flag-6 { .action-flag-6 {
background-position: 0px -3410px; background-position: 0px -7223px;
} }
.action-flag-7 { .action-flag-7 {
background-position: 0px -3427px; background-position: 0px -7240px;
} }
.action-flag-ghost { .action-flag-ghost {
background-position: 0px -3444px; background-position: 0px -7257px;
} }
.action-subscribe-auto { .action-subscribe-auto {
background-position: 0px -3461px; background-position: 0px -7274px;
} }
.action-subscribe-add { .action-subscribe-add {
background-position: 0px -3478px; background-position: 0px -7291px;
} }
.action-subscribe-delete { .action-subscribe-delete {
background-position: 0px -3495px; background-position: 0px -7308px;
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 139 KiB