diff --git a/resources/celerity/map.php b/resources/celerity/map.php index c3cf1aa045..678aeff394 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ return array( 'names' => array( - 'core.pkg.css' => '32302948', + 'core.pkg.css' => 'f39a873a', 'core.pkg.js' => '7db41c19', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => 'fbf57382', @@ -37,14 +37,14 @@ return array( 'rsrc/css/aphront/typeahead.css' => 'a989b5b3', 'rsrc/css/application/auth/auth.css' => '1e655982', 'rsrc/css/application/base/main-menu-view.css' => '72d1d2ef', - 'rsrc/css/application/base/notification-menu.css' => '8637a3db', + 'rsrc/css/application/base/notification-menu.css' => 'cbff1b94', 'rsrc/css/application/base/phabricator-application-launch-view.css' => 'cb9f4db1', 'rsrc/css/application/base/standard-page-view.css' => '517cdfb1', 'rsrc/css/application/chatlog/chatlog.css' => '852140ff', 'rsrc/css/application/config/config-options.css' => '7fedf08b', 'rsrc/css/application/config/config-template.css' => '25d446d6', 'rsrc/css/application/config/setup-issue.css' => '69e640e7', - 'rsrc/css/application/conpherence/menu.css' => '828ddd3e', + 'rsrc/css/application/conpherence/menu.css' => 'e1e0fdf1', 'rsrc/css/application/conpherence/message-pane.css' => '7703a9a9', 'rsrc/css/application/conpherence/notification.css' => '04a6e10a', 'rsrc/css/application/conpherence/update.css' => '1099a660', @@ -117,7 +117,7 @@ return array( 'rsrc/css/layout/phabricator-crumbs-view.css' => '989a48b6', 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 'rsrc/css/layout/phabricator-hovercard-view.css' => '46a13cf0', - 'rsrc/css/layout/phabricator-side-menu-view.css' => 'c1986b85', + 'rsrc/css/layout/phabricator-side-menu-view.css' => 'a2ccd7bd', 'rsrc/css/layout/phabricator-source-code-view.css' => '62a99814', 'rsrc/css/phui/calendar/phui-calendar-day.css' => 'de035c8a', 'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1d0ca59', @@ -503,7 +503,7 @@ return array( 'aphront-typeahead-control-css' => 'a989b5b3', 'auth-css' => '1e655982', 'config-options-css' => '7fedf08b', - 'conpherence-menu-css' => '828ddd3e', + 'conpherence-menu-css' => 'e1e0fdf1', 'conpherence-message-pane-css' => '7703a9a9', 'conpherence-notification-css' => '04a6e10a', 'conpherence-update-css' => '1099a660', @@ -713,7 +713,7 @@ return array( 'phabricator-nav-view-css' => '9283c2df', 'phabricator-notification' => '0c6946e7', 'phabricator-notification-css' => 'ef2c9b34', - 'phabricator-notification-menu-css' => '8637a3db', + 'phabricator-notification-menu-css' => 'cbff1b94', 'phabricator-object-selector-css' => '029a133d', 'phabricator-phtize' => 'd254d646', 'phabricator-prefab' => '41ed7994', @@ -722,7 +722,7 @@ return array( 'phabricator-remarkup-css' => '80c3a48c', 'phabricator-search-results-css' => 'f240504c', 'phabricator-shaped-request' => '7cbe244b', - 'phabricator-side-menu-view-css' => 'c1986b85', + 'phabricator-side-menu-view-css' => 'a2ccd7bd', 'phabricator-slowvote-css' => '266df6a1', 'phabricator-source-code-view-css' => '62a99814', 'phabricator-standard-page-view' => '517cdfb1', diff --git a/src/infrastructure/celerity/CelerityResourceTransformer.php b/src/infrastructure/celerity/CelerityResourceTransformer.php index d17b33d63c..daff44b7cf 100644 --- a/src/infrastructure/celerity/CelerityResourceTransformer.php +++ b/src/infrastructure/celerity/CelerityResourceTransformer.php @@ -196,6 +196,8 @@ final class CelerityResourceTransformer { 'hovergrey' => '#c5cbcf', 'hoverblue' => '#eceff5', 'hoverborder' => '#dfe1e9', + 'hoverselectedgrey' => '#bbc4ca', + 'hoverselectedblue' => '#e6e9ee', // Base Greys 'lightgreyborder' => '#C7CCD9', diff --git a/webroot/rsrc/css/application/base/notification-menu.css b/webroot/rsrc/css/application/base/notification-menu.css index 4f2d230523..c48e117b5b 100644 --- a/webroot/rsrc/css/application/base/notification-menu.css +++ b/webroot/rsrc/css/application/base/notification-menu.css @@ -52,6 +52,11 @@ background: {$hoverblue}; } +.device-desktop .phabricator-notification-menu + .phabricator-notification-unread.phabricator-notification:hover { + background: {$hoverselectedblue}; +} + .phabricator-notification + .phabricator-notification { border-top: 1px solid {$hoverborder}; } diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css index 2698a87f13..7e883a38f4 100644 --- a/webroot/rsrc/css/application/conpherence/menu.css +++ b/webroot/rsrc/css/application/conpherence/menu.css @@ -102,6 +102,11 @@ border-left: 4px solid {$sky}; } +.device-desktop .conpherence-menu + .conpherence-selected.conpherence-menu-item-view:hover { + background-color: {$hoverselectedgrey}; +} + .conpherence-menu .loading { font-style: italic; } diff --git a/webroot/rsrc/css/layout/phabricator-side-menu-view.css b/webroot/rsrc/css/layout/phabricator-side-menu-view.css index 803f9d690f..0d430bc730 100644 --- a/webroot/rsrc/css/layout/phabricator-side-menu-view.css +++ b/webroot/rsrc/css/layout/phabricator-side-menu-view.css @@ -16,13 +16,16 @@ color: {$darkbluetext}; } -.phabricator-side-menu .phui-list-item-selected, -.device-desktop .phui-side-menu - .phui-list-item-selected.phui-list-item-href:hover { +.phabricator-side-menu .phui-list-item-selected { background-color: {$hovergrey}; border-left: 4px solid {$sky}; } +.device-desktop .phabricator-side-menu .phui-list-item-selected + a.phui-list-item-href:hover { + background-color: {$hoverselectedgrey}; +} + .phabricator-side-menu .phui-list-item-selected .phui-list-item-href { padding-left: 20px; }