From 636e5dfda95e18f2cd66cc7a5b6e5a7e93fe154e Mon Sep 17 00:00:00 2001 From: Chad Little Date: Wed, 22 Apr 2015 17:56:47 -0700 Subject: [PATCH] Tweak uber search dropdown styles Summary: Moved the dropdown outside of the input to give text more space. Also changed the 'current app' icon to the target icon, it feels a little better in use. I will follow up with a fix to T5218. Test Plan: Tested desktop, mobile, tablet searching. {F379466} Reviewers: btrahan, epriestley Reviewed By: epriestley Subscribers: Korvin, epriestley Differential Revision: https://secure.phabricator.com/D12516 --- resources/celerity/map.php | 6 ++-- .../menu/PhabricatorMainMenuSearchView.php | 2 +- .../css/application/base/main-menu-view.css | 36 ++++++++++++++++--- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 062b6136bb..cc168eb179 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'f7d01efc', + 'core.pkg.css' => '7382134c', 'core.pkg.js' => 'd3f3a35c', 'darkconsole.pkg.js' => '8ab24e01', 'differential.pkg.css' => '3500921f', @@ -34,7 +34,7 @@ return array( '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' => '31e66da9', + 'rsrc/css/application/base/main-menu-view.css' => '0657ac93', 'rsrc/css/application/base/notification-menu.css' => '3c9d8aa1', 'rsrc/css/application/base/phabricator-application-launch-view.css' => '16ca323f', 'rsrc/css/application/base/standard-page-view.css' => 'd3e1abe9', @@ -737,7 +737,7 @@ return array( 'phabricator-hovercard-view-css' => '44394670', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'c1700f6f', - 'phabricator-main-menu-view' => '31e66da9', + 'phabricator-main-menu-view' => '0657ac93', 'phabricator-nav-view-css' => '7aeaf435', 'phabricator-notification' => '0c6946e7', 'phabricator-notification-css' => '9c279160', diff --git a/src/view/page/menu/PhabricatorMainMenuSearchView.php b/src/view/page/menu/PhabricatorMainMenuSearchView.php index 700f9db445..196a22a07c 100644 --- a/src/view/page/menu/PhabricatorMainMenuSearchView.php +++ b/src/view/page/menu/PhabricatorMainMenuSearchView.php @@ -115,7 +115,7 @@ final class PhabricatorMainMenuSearchView extends AphrontView { ); $application_value = null; - $application_icon = 'fa-file-o'; + $application_icon = 'fa-dot-circle-o'; $application = $this->getApplication(); if ($application) { $application_value = get_class($application); diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css index ccdd20edb0..9b1a102499 100644 --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -160,7 +160,7 @@ height: 28px; line-height: 12px; box-shadow: 0px 1px 1px rgba(128, 128, 128, 0.25); - padding: 6px 30px 6px 46px; + padding: 6px 30px 6px 6px; float: left; width: 205px; } @@ -174,6 +174,7 @@ height: 32px; font-size: 15px; width: 100%; + padding-left: 50px; } .phabricator-main-menu .phabricator-main-menu-search input:focus { @@ -200,7 +201,7 @@ height: 24px; width: 28px; top: 10px; - right: -7px; + right: -6px; margin: 0 8px 0 0; padding: 0; border-radius: 0; @@ -209,8 +210,30 @@ .phabricator-main-menu-search button.phabricator-main-menu-search-dropdown { position: absolute; right: auto; - left: 0; + left: -45px; width: 40px; + background: transparent; +} + +.device-desktop .phabricator-main-menu-search + button.phabricator-main-menu-search-dropdown:hover .phui-icon-view { + color: #fff; +} + +.device .phabricator-main-menu-search + button.phabricator-main-menu-search-dropdown { + left: 2px; + background: #000; +} + +.device .phabricator-main-menu-search + button.phabricator-main-menu-search-dropdown .phui-icon-view { + margin-top: 2px; + } + +.device .phabricator-main-menu-search + button.phabricator-main-menu-search-dropdown .caret { + margin-top: 9px; } .phabricator-main-menu-search button.phabricator-main-menu-search-dropdown @@ -222,6 +245,11 @@ position: absolute; right: 4px; top: 3px; + border-top-color: rgba(255,255,255,.8); +} + +.device-desktop .phabricator-main-menu-search-dropdown:hover .caret { + border-top-color: #fff; } @@ -237,7 +265,7 @@ } .phabricator-main-menu-search-target div.jx-typeahead-results { - background: #ffffff; + background: #fff; word-wrap: break-word; overflow-y: auto; box-shadow: {$dropshadow};