From 4743ad96497b4ca96d4981bed6ae0dc781648787 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Fri, 31 Jan 2014 09:10:32 -0800 Subject: [PATCH] Miniturize the nav buttons Summary: This uses the slightly smaller icons. Not sure about the logout icon, will play with it more in the morning. Test Plan: tested new nav on desktop and mobile. Reviewers: epriestley Reviewed By: epriestley CC: Korvin, epriestley, aran Differential Revision: https://secure.phabricator.com/D8119 --- resources/celerity/map.php | 26 +++++++++---------- .../PhabricatorApplicationAuth.php | 2 +- .../PhabricatorApplicationDiviner.php | 4 +-- .../PhabricatorApplicationHome.php | 4 +-- .../PhabricatorApplicationPeople.php | 2 +- .../PhabricatorApplicationSettings.php | 2 +- .../css/application/base/main-menu-view.css | 12 ++++++--- .../phabricator-application-launch-view.css | 5 ++++ 8 files changed, 33 insertions(+), 24 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index b025abb082..6b3ca7e43c 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ return array( 'names' => array( - 'core.pkg.css' => '9ed733e4', + 'core.pkg.css' => 'e1b7fbee', 'core.pkg.js' => 'c7854cc5', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => '5a65a762', @@ -39,9 +39,9 @@ return array( 'rsrc/css/aphront/two-column.css' => '16ab3ad2', 'rsrc/css/aphront/typeahead.css' => '00c9a200', 'rsrc/css/application/auth/auth.css' => '1e655982', - 'rsrc/css/application/base/main-menu-view.css' => 'aa18107a', + 'rsrc/css/application/base/main-menu-view.css' => 'e5bbc5cc', 'rsrc/css/application/base/notification-menu.css' => 'fc9a363c', - 'rsrc/css/application/base/phabricator-application-launch-view.css' => 'd2b2916f', + 'rsrc/css/application/base/phabricator-application-launch-view.css' => '55ba7571', 'rsrc/css/application/base/standard-page-view.css' => '517cdfb1', 'rsrc/css/application/chatlog/chatlog.css' => '0cd2bc78', 'rsrc/css/application/config/config-options.css' => '7fedf08b', @@ -148,9 +148,9 @@ return array( 'rsrc/css/phui/phui-workboard-view.css' => 'bf70dd2e', 'rsrc/css/phui/phui-workpanel-view.css' => '6f8527f6', 'rsrc/css/sprite-actions.css' => '4557baf8', - 'rsrc/css/sprite-apps-large.css' => 'e37c2ff1', + 'rsrc/css/sprite-apps-large.css' => '0a453d4b', 'rsrc/css/sprite-apps-xlarge.css' => 'db66c878', - 'rsrc/css/sprite-apps.css' => 'a09ca329', + 'rsrc/css/sprite-apps.css' => '224fa7ac', 'rsrc/css/sprite-conpherence.css' => '084b1f13', 'rsrc/css/sprite-docs.css' => '7ea4927e', 'rsrc/css/sprite-gradient.css' => 'a10def53', @@ -300,11 +300,11 @@ return array( 'rsrc/image/search.png' => '82625a7e', 'rsrc/image/sprite-actions-X2.png' => '7dfd5652', 'rsrc/image/sprite-actions.png' => '7b370d72', - 'rsrc/image/sprite-apps-X2.png' => '1fbcf361', - 'rsrc/image/sprite-apps-large-X2.png' => '9d369fd6', - 'rsrc/image/sprite-apps-large.png' => 'd4de37a3', + 'rsrc/image/sprite-apps-X2.png' => '8d56a056', + 'rsrc/image/sprite-apps-large-X2.png' => '0e676838', + 'rsrc/image/sprite-apps-large.png' => 'b0aa7d64', 'rsrc/image/sprite-apps-xlarge.png' => 'a751a580', - 'rsrc/image/sprite-apps.png' => 'c50dcffd', + 'rsrc/image/sprite-apps.png' => '35052ada', 'rsrc/image/sprite-conpherence-X2.png' => '5ed80fb0', 'rsrc/image/sprite-conpherence.png' => '7146f76f', 'rsrc/image/sprite-docs-X2.png' => '520858fa', @@ -670,7 +670,7 @@ return array( 'people-profile-css' => 'd0bababe', 'phabricator-action-header-view-css' => 'cc654b91', 'phabricator-action-list-view-css' => '81383e25', - 'phabricator-application-launch-view-css' => 'd2b2916f', + 'phabricator-application-launch-view-css' => '55ba7571', 'phabricator-busy' => '6453c869', 'phabricator-chatlog-css' => '0cd2bc78', 'phabricator-content-source-view-css' => '4b8b05d4', @@ -690,7 +690,7 @@ return array( 'phabricator-jump-nav' => 'f0c5e726', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'ad7a69ca', - 'phabricator-main-menu-view' => 'aa18107a', + 'phabricator-main-menu-view' => 'e5bbc5cc', 'phabricator-menu-item' => '0f386ef4', 'phabricator-nav-view-css' => 'd0d4a509', 'phabricator-notification' => '95944043', @@ -775,8 +775,8 @@ return array( 'releeph-status' => 'a20631d9', 'setup-issue-css' => '1bb81c53', 'sprite-actions-css' => '4557baf8', - 'sprite-apps-css' => 'a09ca329', - 'sprite-apps-large-css' => 'e37c2ff1', + 'sprite-apps-css' => '224fa7ac', + 'sprite-apps-large-css' => '0a453d4b', 'sprite-apps-xlarge-css' => 'db66c878', 'sprite-conpherence-css' => '084b1f13', 'sprite-docs-css' => '7ea4927e', diff --git a/src/applications/auth/application/PhabricatorApplicationAuth.php b/src/applications/auth/application/PhabricatorApplicationAuth.php index 1e9228b01c..79a781fa33 100644 --- a/src/applications/auth/application/PhabricatorApplicationAuth.php +++ b/src/applications/auth/application/PhabricatorApplicationAuth.php @@ -36,7 +36,7 @@ final class PhabricatorApplicationAuth extends PhabricatorApplication { $item = id(new PHUIListItemView()) ->addClass('core-menu-item') ->setName(pht('Log Out')) - ->setIcon('power') + ->setIcon('logout-sm') ->setWorkflow(true) ->setHref('/logout/') ->setSelected(($controller instanceof PhabricatorLogoutController)) diff --git a/src/applications/diviner/application/PhabricatorApplicationDiviner.php b/src/applications/diviner/application/PhabricatorApplicationDiviner.php index b4db1281ca..a0b140ae77 100644 --- a/src/applications/diviner/application/PhabricatorApplicationDiviner.php +++ b/src/applications/diviner/application/PhabricatorApplicationDiviner.php @@ -61,8 +61,8 @@ final class PhabricatorApplicationDiviner extends PhabricatorApplication { $item = id(new PHUIListItemView()) ->setName(pht('%s Help', $application->getName())) ->addClass('core-menu-item') - ->setIcon('help') - ->setOrder(100) + ->setIcon('info-sm') + ->setOrder(200) ->setHref($application->getHelpURI()); $items[] = $item; } diff --git a/src/applications/home/application/PhabricatorApplicationHome.php b/src/applications/home/application/PhabricatorApplicationHome.php index 2f530b4b27..34ab9db4a9 100644 --- a/src/applications/home/application/PhabricatorApplicationHome.php +++ b/src/applications/home/application/PhabricatorApplicationHome.php @@ -7,7 +7,7 @@ final class PhabricatorApplicationHome extends PhabricatorApplication { } public function getShortDescription() { - return pht('Where the Heart Is'); + return pht('Where the <3 is'); } public function getIconName() { @@ -55,7 +55,7 @@ final class PhabricatorApplicationHome extends PhabricatorApplication { $item = id(new PHUIListItemView()) ->setName(pht('Create New...')) - ->setIcon('new') + ->setIcon('new-sm') ->addClass('core-menu-item') ->setHref('/home/create/') ->addSigil('quick-create-menu') diff --git a/src/applications/people/application/PhabricatorApplicationPeople.php b/src/applications/people/application/PhabricatorApplicationPeople.php index addd709354..8ea84fd95d 100644 --- a/src/applications/people/application/PhabricatorApplicationPeople.php +++ b/src/applications/people/application/PhabricatorApplicationPeople.php @@ -109,7 +109,7 @@ final class PhabricatorApplicationPeople extends PhabricatorApplication { ->setName($user->getUsername()) ->setHref('/p/'.$user->getUsername().'/') ->addClass('core-menu-item') - ->setOrder(200); + ->setOrder(100); $classes = array( 'phabricator-core-menu-icon', diff --git a/src/applications/settings/application/PhabricatorApplicationSettings.php b/src/applications/settings/application/PhabricatorApplicationSettings.php index 7f0f32ef1a..40950dedbf 100644 --- a/src/applications/settings/application/PhabricatorApplicationSettings.php +++ b/src/applications/settings/application/PhabricatorApplicationSettings.php @@ -41,7 +41,7 @@ final class PhabricatorApplicationSettings extends PhabricatorApplication { $selected = ($controller instanceof PhabricatorSettingsMainController); $item = id(new PHUIListItemView()) ->setName(pht('Settings')) - ->setIcon('settings') + ->setIcon('settings-sm') ->addClass('core-menu-item') ->setSelected($selected) ->setHref('/settings/') diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css index d9830b89a7..7ddf9e43e8 100644 --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -20,6 +20,7 @@ .device-desktop .phabricator-main-menu { height: 44px; + padding-right: 4px; } .phabricator-main-menu a:hover { @@ -364,18 +365,21 @@ .core-menu-item.phui-list-item-view:hover, .device-desktop .phabricator-main-menu-logo:hover { background-color: rgba(0,0,0,.3); + box-shadow: inset 0 5px 10px rgba(0,0,0,0.5); + border-radius: 3px; } .device-desktop .phabricator-application-menu .phui-list-item-view { float: left; position: relative; - min-width: 40px; - height: 44px; + min-width: 36px; + height: 36px; + margin-top: 4px; } .device-desktop .phabricator-core-menu-icon { - top: 9px; - left: 6px; + top: 5px; + left: 4px; } .device .phabricator-core-menu-icon { diff --git a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css index d3fe64668f..54952c2e3d 100644 --- a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css +++ b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css @@ -65,6 +65,11 @@ a.application-tile-full.application-tile-create { left: 10px; } +.device-desktop a.phabricator-application-launch-container:hover { + background-color: #1e2225; + text-decoration: none; +} + .phabricator-application-launch-name { display: block; margin-top: 42px;