diff --git a/resources/celerity/map.php b/resources/celerity/map.php index bb25514deb..f97ff966fd 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'dac18977', + 'core.pkg.css' => 'b6b5fe6c', 'core.pkg.js' => 'fbf1d615', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '7d01bee8', @@ -34,9 +34,9 @@ return array( 'rsrc/css/aphront/typeahead.css' => '0e403212', 'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af', 'rsrc/css/application/auth/auth.css' => '44975d4b', - 'rsrc/css/application/base/main-menu-view.css' => '4b7ecab2', + 'rsrc/css/application/base/main-menu-view.css' => '1d2f0ad0', 'rsrc/css/application/base/notification-menu.css' => '713df25a', - 'rsrc/css/application/base/phabricator-application-launch-view.css' => '214e2510', + 'rsrc/css/application/base/phabricator-application-launch-view.css' => '9a233ed6', 'rsrc/css/application/base/standard-page-view.css' => '43045fb4', 'rsrc/css/application/calendar/calendar-icon.css' => '98ce946d', 'rsrc/css/application/chatlog/chatlog.css' => 'f1971c1c', @@ -118,7 +118,7 @@ return array( 'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3', 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 'rsrc/css/layout/phabricator-hovercard-view.css' => '0d665853', - 'rsrc/css/layout/phabricator-side-menu-view.css' => 'a440478a', + 'rsrc/css/layout/phabricator-side-menu-view.css' => '4f2cd343', 'rsrc/css/layout/phabricator-source-code-view.css' => '2ceee894', 'rsrc/css/phui/calendar/phui-calendar-day.css' => 'd1cf6f93', 'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1c7f338', @@ -130,18 +130,18 @@ return array( 'rsrc/css/phui/phui-button.css' => 'b995182d', 'rsrc/css/phui/phui-crumbs-view.css' => 'ce840ec2', 'rsrc/css/phui/phui-document.css' => '8be7a5e3', - 'rsrc/css/phui/phui-feed-story.css' => 'e5682f4c', + 'rsrc/css/phui/phui-feed-story.css' => '92f55311', 'rsrc/css/phui/phui-fontkit.css' => 'b664ac96', 'rsrc/css/phui/phui-form-view.css' => 'a0e8f168', 'rsrc/css/phui/phui-form.css' => 'f535f938', - 'rsrc/css/phui/phui-header-view.css' => '7ad91dd2', + 'rsrc/css/phui/phui-header-view.css' => '47b8f221', 'rsrc/css/phui/phui-icon.css' => '88ba9081', 'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8', 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', 'rsrc/css/phui/phui-info-view.css' => '33e54618', 'rsrc/css/phui/phui-list.css' => 'e448b6ba', - 'rsrc/css/phui/phui-object-box.css' => '8eacbeed', - 'rsrc/css/phui/phui-object-item-list-view.css' => '24ed8d94', + 'rsrc/css/phui/phui-object-box.css' => '59db5c05', + 'rsrc/css/phui/phui-object-item-list-view.css' => '29ded459', 'rsrc/css/phui/phui-pinboard-view.css' => '55b27bc3', 'rsrc/css/phui/phui-property-list-view.css' => '1baf23eb', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', @@ -149,7 +149,7 @@ return array( 'rsrc/css/phui/phui-status.css' => '888cedb8', 'rsrc/css/phui/phui-tag-view.css' => '402691cc', 'rsrc/css/phui/phui-text.css' => 'cf019f54', - 'rsrc/css/phui/phui-timeline-view.css' => '8eaab66c', + 'rsrc/css/phui/phui-timeline-view.css' => '07a1bd0f', 'rsrc/css/phui/phui-workboard-view.css' => '720efdde', 'rsrc/css/phui/phui-workpanel-view.css' => '01b6e9c6', 'rsrc/css/sprite-login.css' => 'a3526809', @@ -697,7 +697,7 @@ return array( 'path-typeahead' => 'f7fc67ec', 'people-profile-css' => '25970776', 'phabricator-action-list-view-css' => '32c388b3', - 'phabricator-application-launch-view-css' => '214e2510', + 'phabricator-application-launch-view-css' => '9a233ed6', 'phabricator-busy' => '59a7976a', 'phabricator-chatlog-css' => 'f1971c1c', 'phabricator-content-source-view-css' => '4b8b05d4', @@ -715,7 +715,7 @@ return array( 'phabricator-hovercard-view-css' => '0d665853', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'c1700f6f', - 'phabricator-main-menu-view' => '4b7ecab2', + 'phabricator-main-menu-view' => '1d2f0ad0', 'phabricator-nav-view-css' => '0ecd30a1', 'phabricator-notification' => '0c6946e7', 'phabricator-notification-css' => '9c279160', @@ -727,7 +727,7 @@ return array( 'phabricator-remarkup-css' => 'ea91b3ee', 'phabricator-search-results-css' => '15c71110', 'phabricator-shaped-request' => '7cbe244b', - 'phabricator-side-menu-view-css' => 'a440478a', + 'phabricator-side-menu-view-css' => '4f2cd343', 'phabricator-slowvote-css' => '266df6a1', 'phabricator-source-code-view-css' => '2ceee894', 'phabricator-standard-page-view' => '43045fb4', @@ -764,20 +764,20 @@ return array( 'phui-calendar-month-css' => '476be7e0', 'phui-crumbs-view-css' => 'ce840ec2', 'phui-document-view-css' => '8be7a5e3', - 'phui-feed-story-css' => 'e5682f4c', + 'phui-feed-story-css' => '92f55311', 'phui-font-icon-base-css' => '3dad2ae3', 'phui-fontkit-css' => 'b664ac96', 'phui-form-css' => 'f535f938', 'phui-form-view-css' => 'a0e8f168', - 'phui-header-view-css' => '7ad91dd2', + 'phui-header-view-css' => '47b8f221', 'phui-icon-view-css' => '88ba9081', 'phui-image-mask-css' => '5a8b09c8', 'phui-info-panel-css' => '27ea50a1', 'phui-info-view-css' => '33e54618', 'phui-inline-comment-view-css' => 'aa16f165', 'phui-list-view-css' => 'e448b6ba', - 'phui-object-box-css' => '8eacbeed', - 'phui-object-item-list-view-css' => '24ed8d94', + 'phui-object-box-css' => '59db5c05', + 'phui-object-item-list-view-css' => '29ded459', 'phui-pinboard-view-css' => '55b27bc3', 'phui-property-list-view-css' => '1baf23eb', 'phui-remarkup-preview-css' => '19ad512b', @@ -785,7 +785,7 @@ return array( 'phui-status-list-view-css' => '888cedb8', 'phui-tag-view-css' => '402691cc', 'phui-text-css' => 'cf019f54', - 'phui-timeline-view-css' => '8eaab66c', + 'phui-timeline-view-css' => '07a1bd0f', 'phui-workboard-view-css' => '720efdde', 'phui-workpanel-view-css' => '01b6e9c6', 'phuix-action-list-view' => 'b5c256b8', diff --git a/src/applications/celerity/CelerityResourceTransformer.php b/src/applications/celerity/CelerityResourceTransformer.php index a812e29ebf..a8bd24ec8e 100644 --- a/src/applications/celerity/CelerityResourceTransformer.php +++ b/src/applications/celerity/CelerityResourceTransformer.php @@ -177,6 +177,7 @@ final class CelerityResourceTransformer { // Drop Shadow 'dropshadow' => '0 1px 6px rgba(0, 0, 0, .25)', + 'whitetextshadow' => '0 1px 0 rgba(255, 255, 255, 1)', // Anchors 'anchor' => '#136CB2', @@ -194,7 +195,7 @@ final class CelerityResourceTransformer { 'lightblue' => '#daeaf3', 'sky' => '#3498db', 'lightsky' => '#ddeef9', - 'fire' => '#fa4b2a', + 'fire' => '#e62f17', 'indigo' => '#6e5cb6', 'lightindigo' => '#eae6f7', 'pink' => '#da49be', diff --git a/src/applications/feed/builder/PhabricatorFeedBuilder.php b/src/applications/feed/builder/PhabricatorFeedBuilder.php index c6a6c17a93..18ce66c6aa 100644 --- a/src/applications/feed/builder/PhabricatorFeedBuilder.php +++ b/src/applications/feed/builder/PhabricatorFeedBuilder.php @@ -59,7 +59,7 @@ final class PhabricatorFeedBuilder { $last_date = $date; $header = new PHUIHeaderView(); $header->setHeader($date); - $header->setHeaderIcon('fa-calendar blue msr'); + $header->setHeaderIcon('fa-calendar msr'); $null_view->appendChild($header); } diff --git a/src/applications/home/controller/PhabricatorHomeController.php b/src/applications/home/controller/PhabricatorHomeController.php index ea84e564a6..024807b74b 100644 --- a/src/applications/home/controller/PhabricatorHomeController.php +++ b/src/applications/home/controller/PhabricatorHomeController.php @@ -74,7 +74,7 @@ abstract class PhabricatorHomeController extends PhabricatorController { $nav->addFilter( '', - pht('Customize Applications...'), + pht('Customize Menu...'), '/settings/panel/home/'); $nav->addClass('phabricator-side-menu-home'); diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css index 2453b80185..9ac312bfa2 100644 --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -92,6 +92,7 @@ text-align: center; vertical-align: middle; line-height: 24px; + text-shadow: {$whitetextshadow}; } .phabricator-expand-application-menu, @@ -220,7 +221,7 @@ .device-desktop .phabricator-main-menu-search button.phabricator-main-menu-search-dropdown:hover .phui-icon-view { - color: {$sky}; + color: {$darkbluetext}; } .device-desktop .phabricator-main-menu-search @@ -238,15 +239,16 @@ button.phabricator-main-menu-search-dropdown .caret:before { content: "\f107"; font-family: FontAwesome; - color: {$bluetext}; + color: {$lightbluetext}; } .phabricator-main-menu-search button.phabricator-main-menu-search-dropdown .phui-icon-view { - color: {$bluetext}; + color: {$lightbluetext}; font-size: 15px; top: 6px; left: 8px; + text-shadow: {$whitetextshadow}; } .phabricator-main-menu-search-dropdown .caret { @@ -351,6 +353,7 @@ button.phabricator-main-menu-search-dropdown .caret:before { .alert-notifications .phui-icon-view { color: {$lightbluetext}; + text-shadow: {$whitetextshadow}; } .device-desktop .alert-notifications:hover { @@ -387,6 +390,7 @@ button.phabricator-main-menu-search-dropdown .caret:before { float: left; margin: 11px 6px 0 -2px; font-size: 12px; + text-shadow: {$whitetextshadow}; } .device-phone .alert-unread .phabricator-main-menu-alert-count, @@ -489,10 +493,11 @@ button.phabricator-main-menu-search-dropdown .caret:before { font-size: 20px; height: 20px; width: 20px; - color: {$bluetext}; + color: {$lightbluetext}; margin: 8px; text-align: center; vertical-align: middle; + text-shadow: {$whitetextshadow}; } .device .phabricator-application-menu .phui-list-item-icon.phui-font-fa { @@ -506,7 +511,7 @@ button.phabricator-main-menu-search-dropdown .caret:before { .device-desktop .phabricator-application-menu .core-menu-item.phui-list-item-view:hover .phui-list-item-icon.phui-font-fa { - color: {$sky}; + color: {$darkbluetext}; } .device-desktop .phabricator-application-menu 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 1e0dc6338c..f927e27043 100644 --- a/webroot/rsrc/css/application/base/phabricator-application-launch-view.css +++ b/webroot/rsrc/css/application/base/phabricator-application-launch-view.css @@ -48,6 +48,7 @@ div.phabricator-application-launch-container { text-align: center; vertical-align: bottom; color: {$darkbluetext}; + text-shadow: {$whitetextshadow}; } .device-desktop a.phabricator-application-launch-container:hover { diff --git a/webroot/rsrc/css/layout/phabricator-side-menu-view.css b/webroot/rsrc/css/layout/phabricator-side-menu-view.css index 80c154c412..f59c3d106f 100644 --- a/webroot/rsrc/css/layout/phabricator-side-menu-view.css +++ b/webroot/rsrc/css/layout/phabricator-side-menu-view.css @@ -19,7 +19,7 @@ } .phabricator-side-menu .phui-list-item-selected { - background-color: rgba(0,0,0,.05); + background-color: {$lightsky}; border-left: 4px solid {$sky}; border-top-right-radius: 3px; border-bottom-right-radius: 3px; @@ -68,6 +68,7 @@ line-height: 38px; text-align: center; vertical-align: bottom; + text-shadow: {$whitetextshadow}; } .phabricator-icon-nav .phabricator-side-menu .phui-list-item-selected { diff --git a/webroot/rsrc/css/phui/phui-feed-story.css b/webroot/rsrc/css/phui/phui-feed-story.css index 77ea4fc37a..fa63138cd3 100644 --- a/webroot/rsrc/css/phui/phui-feed-story.css +++ b/webroot/rsrc/css/phui/phui-feed-story.css @@ -1,9 +1,6 @@ /** * @provides phui-feed-story-css */ -.phui-object-box .phabricator-feed-frame .phui-header-shell h1 { - color: {$blue}; -} .phui-feed-story-head .phui-feed-story-actor-image { width: 35px; diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css index 379e1878cb..56f60b7729 100644 --- a/webroot/rsrc/css/phui/phui-header-view.css +++ b/webroot/rsrc/css/phui/phui-header-view.css @@ -64,7 +64,7 @@ body .phui-header-shell.phui-bleed-header } .phui-header-view { - font-size: 15px; + font-size: 16px; color: #000; font-weight: 500; position: relative; diff --git a/webroot/rsrc/css/phui/phui-object-box.css b/webroot/rsrc/css/phui/phui-object-box.css index 6ca999111d..31a9d2bec5 100644 --- a/webroot/rsrc/css/phui/phui-object-box.css +++ b/webroot/rsrc/css/phui/phui-object-box.css @@ -113,11 +113,12 @@ div.phui-object-box.phui-object-box-flush { } .phui-object-box .phui-object-box .phui-header-shell h1 { - padding: 8px 4px; + padding: 8px; font-size: 13px; margin: 0; - color: {$bluetext}; + color: {$darkbluetext}; font-weight: 500; + background-color: {$lightgreybackground}; } .phui-object-box .phui-object-box .phui-header-shell { diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css index a2222bf3f6..7cbcceebf2 100644 --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -608,11 +608,12 @@ ul.phui-object-item-list-view .phui-object-item-selected .phui-object-box .phui-object-item-list-header { font-size: 13px; - color: {$bluetext}; + color: {$darkbluetext}; border-top: 1px solid {$thinblueborder}; border-bottom: 1px solid {$thinblueborder}; - padding: 8px 4px; + padding: 8px; font-weight: 500; + background-color: {$lightgreybackground}; } .phui-object-box .phui-header-shell + .phui-object-item-list-view diff --git a/webroot/rsrc/css/phui/phui-timeline-view.css b/webroot/rsrc/css/phui/phui-timeline-view.css index 95bcbe1ab2..df36a4ac52 100644 --- a/webroot/rsrc/css/phui/phui-timeline-view.css +++ b/webroot/rsrc/css/phui/phui-timeline-view.css @@ -318,19 +318,19 @@ } .phui-timeline-older-transactions-are-hidden { - background: {$lightyellow}; - border: 1px solid {$yellow}; + background: {$sh-yellowbackground}; + border: 1px solid {$sh-yellowborder}; text-align: center; padding: 12px; color: {$darkgreytext}; cursor: pointer; + border-radius: 3px; } .device-phone .phui-timeline-older-transactions-are-hidden { margin: 0 8px; } - .phui-timeline-title .phui-timeline-extra-information a { font-weight: normal; color: {$bluetext};