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' => 'e393f792', + 'core.pkg.css' => 'a20ff7f6', 'core.pkg.js' => 'a590b451', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '1b36e899', @@ -24,7 +24,7 @@ 'rsrc/css/aphront/multi-column.css' => 'fd18389d', 'rsrc/css/aphront/notification.css' => '9c279160', 'rsrc/css/aphront/panel-view.css' => '8427b78d', - 'rsrc/css/aphront/phabricator-nav-view.css' => '0ecd30a1', + 'rsrc/css/aphront/phabricator-nav-view.css' => 'f1982787', 'rsrc/css/aphront/table-view.css' => 'e3632cc9', 'rsrc/css/aphront/tokenizer.css' => '04875312', 'rsrc/css/aphront/tooltip.css' => '7672b60f', @@ -33,10 +33,10 @@ 'rsrc/css/aphront/typeahead.css' => '0e403212', 'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', 'rsrc/css/application/auth/auth.css' => 'dc62cb0e', - 'rsrc/css/application/base/main-menu-view.css' => '3cd48671', + 'rsrc/css/application/base/main-menu-view.css' => '1ca711f1', 'rsrc/css/application/base/notification-menu.css' => 'f31c0bde', - 'rsrc/css/application/base/phabricator-application-launch-view.css' => '9a233ed6', - 'rsrc/css/application/base/phui-theme.css' => 'd4a49411', + 'rsrc/css/application/base/phabricator-application-launch-view.css' => 'fa820ddf', + 'rsrc/css/application/base/phui-theme.css' => '410368da', 'rsrc/css/application/base/standard-page-view.css' => '43045fb4', 'rsrc/css/application/calendar/calendar-icon.css' => 'a95c11a9', 'rsrc/css/application/chatlog/chatlog.css' => 'f1971c1c', @@ -118,7 +118,7 @@ 'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3', 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 'rsrc/css/layout/phabricator-hovercard-view.css' => '3a8553e7', - 'rsrc/css/layout/phabricator-side-menu-view.css' => '4f2cd343', + 'rsrc/css/layout/phabricator-side-menu-view.css' => '8d13687d', 'rsrc/css/layout/phabricator-source-code-view.css' => '098e9b75', 'rsrc/css/phui/calendar/phui-calendar-day.css' => 'd1cf6f93', 'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1c7f338', @@ -706,7 +706,7 @@ 'path-typeahead' => 'f7fc67ec', 'people-profile-css' => '25970776', 'phabricator-action-list-view-css' => '32c388b3', - 'phabricator-application-launch-view-css' => '9a233ed6', + 'phabricator-application-launch-view-css' => 'fa820ddf', 'phabricator-busy' => '59a7976a', 'phabricator-chatlog-css' => 'f1971c1c', 'phabricator-content-source-view-css' => '4b8b05d4', @@ -724,8 +724,8 @@ 'phabricator-hovercard-view-css' => '3a8553e7', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'c1700f6f', - 'phabricator-main-menu-view' => '3cd48671', - 'phabricator-nav-view-css' => '0ecd30a1', + 'phabricator-main-menu-view' => '1ca711f1', + 'phabricator-nav-view-css' => 'f1982787', 'phabricator-notification' => 'ccf1cbf8', 'phabricator-notification-css' => '9c279160', 'phabricator-notification-menu-css' => 'f31c0bde', @@ -735,7 +735,7 @@ 'phabricator-remarkup-css' => '359cd31c', 'phabricator-search-results-css' => '7dea472c', 'phabricator-shaped-request' => '7cbe244b', - 'phabricator-side-menu-view-css' => '4f2cd343', + 'phabricator-side-menu-view-css' => '8d13687d', 'phabricator-slowvote-css' => '7c27f0f9', 'phabricator-source-code-view-css' => '098e9b75', 'phabricator-standard-page-view' => '43045fb4', @@ -794,7 +794,7 @@ 'phui-status-list-view-css' => '888cedb8', 'phui-tag-view-css' => '402691cc', 'phui-text-css' => 'cf019f54', - 'phui-theme-css' => 'd4a49411', + 'phui-theme-css' => '410368da', 'phui-timeline-view-css' => '47b18876', 'phui-workboard-view-css' => '0cac51a4', 'phui-workpanel-view-css' => '4bdc2562', @@ -948,6 +948,9 @@ 'javelin-util', 'phabricator-keyboard-shortcut-manager', ), + '1ca711f1' => array( + 'phui-theme-css', + ), '1d298e3a' => array( 'javelin-install', 'javelin-util', @@ -1055,9 +1058,6 @@ 'javelin-util', 'javelin-uri', ), - '3cd48671' => array( - 'phui-theme-css', - ), '3ee3408b' => array( 'javelin-behavior', 'javelin-behavior-device', diff --git a/webroot/rsrc/css/aphront/phabricator-nav-view.css b/webroot/rsrc/css/aphront/phabricator-nav-view.css --- a/webroot/rsrc/css/aphront/phabricator-nav-view.css +++ b/webroot/rsrc/css/aphront/phabricator-nav-view.css @@ -32,7 +32,11 @@ white-space: nowrap; overflow-x: hidden; overflow-y: auto; - padding-top: 8px; + margin-top: 8px; +} + +.phabricator-side-menu-home .phabricator-nav-local { + margin-top: 16px; } .phabricator-nav-drag { @@ -74,4 +78,5 @@ .device-phone .phabricator-side-menu-home .phabricator-nav-local { width: 100%; + padding-top: 0; } 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 @@ -67,7 +67,7 @@ } .device-desktop .phabricator-main-menu-brand:hover { - background-color: rgba(55,55,55,.08); + background-color: rgba(55,55,55,.2); cursor: hand; } diff --git a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css --- a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css +++ b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css @@ -40,11 +40,11 @@ .phabricator-application-launch-icon { position: absolute; - width: 28px; - height: 28px; - top: 12px; - left: 6px; - font-size: 20px; + width: 18px; + height: 18px; + top: 8px; + left: 10px; + font-size: 18px; text-align: center; vertical-align: bottom; color: {$darkbluetext}; @@ -52,7 +52,7 @@ } .device-desktop a.phabricator-application-launch-container:hover { - background-color: rgba(0,0,0,.05); + background-color: rgba(0,0,0,.07); text-decoration: none; } @@ -64,11 +64,6 @@ margin: 6px 0 2px 38px; } -.device-desktop a.phabricator-application-launch-container:hover - .phui-icon-view { - color: {$sky}; -} - .phabricator-application-launch-description { color: {$bluetext}; font-size: 11px; diff --git a/webroot/rsrc/css/application/base/phui-theme.css b/webroot/rsrc/css/application/base/phui-theme.css --- a/webroot/rsrc/css/application/base/phui-theme.css +++ b/webroot/rsrc/css/application/base/phui-theme.css @@ -43,6 +43,11 @@ background-image: none; } +.device-desktop.phui-theme-light .phabricator-main-menu-brand:hover { + background-color: rgba(55,55,55,.08); + cursor: hand; +} + /*--- Messages / Notifications -----------------------------------------------*/ .device-desktop .phui-theme-light .alert-notifications:hover .phui-icon-view { diff --git a/webroot/rsrc/css/layout/phabricator-side-menu-view.css b/webroot/rsrc/css/layout/phabricator-side-menu-view.css --- a/webroot/rsrc/css/layout/phabricator-side-menu-view.css +++ b/webroot/rsrc/css/layout/phabricator-side-menu-view.css @@ -19,10 +19,15 @@ } .phabricator-side-menu .phui-list-item-selected { - background-color: {$lightsky}; - border-left: 4px solid {$sky}; + background-color: rgba(0,0,0,.05); + border-left: 4px solid {$blue}; border-top-right-radius: 3px; border-bottom-right-radius: 3px; + font-weight: bold; +} + +.phabricator-icon-nav .phabricator-side-menu .phui-list-item-selected { + background-color: rgba(0,0,0,.1); } .device-desktop .phabricator-side-menu .phui-list-item-selected @@ -45,11 +50,23 @@ .device-desktop .phabricator-side-menu a.phui-list-item-href:hover { text-decoration: none; - background-color: rgba(0,0,0,.05); + background-color: rgba(0,0,0,.07); } +.device-desktop .phabricator-icon-nav a.phui-list-item-href:hover + .phui-list-item-icon { + color: {$darkbluetext}; + } + .device-desktop .phabricator-icon-nav .phabricator-nav-local { width: 40px; + margin-top: 16px; + border-color: {$lightblueborder}; + border-width: 1px 1px 1px 0; + border-style: solid; + background-color: #fff; + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; } .device-desktop .phabricator-icon-nav .phabricator-nav-content { @@ -69,6 +86,7 @@ text-align: center; vertical-align: bottom; text-shadow: {$whitetextshadow}; + color: {$blue}; } .phabricator-icon-nav .phabricator-side-menu .phui-list-item-selected { @@ -77,7 +95,7 @@ .phabricator-icon-nav .phabricator-side-menu .phui-list-item-selected .phui-icon-view { - color: {$sky}; + color: {$darkbluetext}; } .phabricator-icon-nav .phui-icon-view.phuihead-small {