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' => '559c85eb', + 'core.pkg.css' => '0552939d', 'core.pkg.js' => '6a4f677f', 'darkconsole.pkg.js' => '8ab24e01', 'differential.pkg.css' => '3500921f', @@ -34,7 +34,7 @@ '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' => '361a51f9', + 'rsrc/css/application/base/main-menu-view.css' => '96739658', 'rsrc/css/application/base/notification-menu.css' => '6aa0a74b', 'rsrc/css/application/base/phabricator-application-launch-view.css' => '16ca323f', 'rsrc/css/application/base/standard-page-view.css' => 'd2a6518d', @@ -729,7 +729,7 @@ 'phabricator-hovercard-view-css' => '893f4783', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'c1700f6f', - 'phabricator-main-menu-view' => '361a51f9', + 'phabricator-main-menu-view' => '96739658', '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 --- a/src/view/page/menu/PhabricatorMainMenuSearchView.php +++ b/src/view/page/menu/PhabricatorMainMenuSearchView.php @@ -75,7 +75,7 @@ 'button', array( 'id' => $button_id, - 'class' => 'phui-icon-view phui-font-fa fa-search lightgreytext', + 'class' => 'phui-icon-view phui-font-fa fa-search', ), $search_text), $primary_input, 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 @@ -110,7 +110,7 @@ } .phabricator-main-menu-search-container { - padding: 9px 0 10px 0; + padding: 8px 0; position: relative; height: 24px; margin: 0 8px; @@ -146,14 +146,18 @@ right: 0; position: absolute; font-size: 13px; + border-width: 2px; border-color: rgba(0,0,0,.6); - border-radius: 12px; + border-radius: 3px 0 0 3px; background-color: rgba(0,0,0,.5); opacity: .8; - height: 26px; + height: 28px; line-height: 12px; box-shadow: 0px 1px 1px rgba(128, 128, 128, 0.25); - padding: 6px 32px 6px 10px; + padding: 6px 8px; + float: left; + width: 175px; + left: 0; } .phabricator-main-menu.main-header-dark .phabricator-main-menu-search input { @@ -171,7 +175,7 @@ background: #fff; opacity: 1; color: #333; - border-color: {$lightgreyborder}; + border-color: rgba(0,0,0, .4); box-shadow: none; } @@ -180,19 +184,26 @@ } .phabricator-main-menu-search button { + color: rgba(255,255,255,.8); position: absolute; - background: transparent; + background: #000; border: none; outline: none; box-shadow: none; text-shadow: none; min-width: 0; - - height: 24px; - width: 16px; - top: 10px; - right: 10px; + height: 28px; + width: 30px; + top: 8px; + right: -7px; + margin: 0 8px 0 0; padding: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} + +.phabricator-main-menu-search button:hover { + color: #fff; } .device .phabricator-main-menu-search button { @@ -461,7 +472,7 @@ } .device-desktop .phabricator-core-menu-icon { - top: 5px; + top: 4px; left: 4px; }