From 11ed4e4f2146a3348d8dd1c71b41c2a38094649c Mon Sep 17 00:00:00 2001 From: Chad Little Date: Fri, 22 May 2015 12:50:01 -0700 Subject: [PATCH] [Redesign] PHUICrumbs touchups Summary: Ref T8099, minor adds back the border, makes blue highlight {$blue} Test Plan: Hover over new crumbs, match header hovers. Check Phriction for border Reviewers: btrahan, epriestley Reviewed By: epriestley Subscribers: Korvin, epriestley Maniphest Tasks: T8099 Differential Revision: https://secure.phabricator.com/D12959 --- resources/celerity/map.php | 10 +++++----- .../PhabricatorChatLogChannelLogController.php | 1 - .../controller/ManiphestReportController.php | 1 - .../controller/PhabricatorOwnersListController.php | 1 - .../PhabricatorApplicationSearchController.php | 1 - .../PhabricatorUIExampleRenderController.php | 11 +++++------ .../examples/PhabricatorSortTableUIExample.php | 2 +- webroot/rsrc/css/application/base/main-menu-view.css | 2 +- webroot/rsrc/css/phui/phui-crumbs-view.css | 6 +++++- 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 22f6e03df2..5d3da4ea75 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => '6bad4591', + 'core.pkg.css' => '4362e142', 'core.pkg.js' => 'f3e08b38', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => 'bb338e4b', @@ -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' => '44975d4b', - 'rsrc/css/application/base/main-menu-view.css' => '680360ea', + 'rsrc/css/application/base/main-menu-view.css' => '4b7ecab2', 'rsrc/css/application/base/notification-menu.css' => '713df25a', 'rsrc/css/application/base/phabricator-application-launch-view.css' => '132f9d14', 'rsrc/css/application/base/standard-page-view.css' => '062f0f54', @@ -127,7 +127,7 @@ return array( 'rsrc/css/phui/phui-action-panel.css' => '3ee9afd5', 'rsrc/css/phui/phui-box.css' => 'a5bb366d', 'rsrc/css/phui/phui-button.css' => 'b995182d', - 'rsrc/css/phui/phui-crumbs-view.css' => 'aeff7a21', + 'rsrc/css/phui/phui-crumbs-view.css' => '3840dc4c', 'rsrc/css/phui/phui-document.css' => '8be7a5e3', 'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5', 'rsrc/css/phui/phui-fontkit.css' => 'b664ac96', @@ -711,7 +711,7 @@ return array( 'phabricator-hovercard-view-css' => 'd2a28ca5', 'phabricator-keyboard-shortcut' => '1ae869f2', 'phabricator-keyboard-shortcut-manager' => 'c1700f6f', - 'phabricator-main-menu-view' => '680360ea', + 'phabricator-main-menu-view' => '4b7ecab2', 'phabricator-nav-view-css' => '949b43d9', 'phabricator-notification' => '0c6946e7', 'phabricator-notification-css' => '9c279160', @@ -758,7 +758,7 @@ return array( 'phui-calendar-day-css' => '38891735', 'phui-calendar-list-css' => 'c1d0ca59', 'phui-calendar-month-css' => '75e6a2ee', - 'phui-crumbs-view-css' => 'aeff7a21', + 'phui-crumbs-view-css' => '3840dc4c', 'phui-document-view-css' => '8be7a5e3', 'phui-feed-story-css' => 'c9f3a0b5', 'phui-font-icon-base-css' => '3dad2ae3', diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php index c7d2dc990e..eff8637f12 100644 --- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php +++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php @@ -191,7 +191,6 @@ final class PhabricatorChatLogChannelLogController $crumbs = $this ->buildApplicationCrumbs() - ->setBorder(true) ->addTextCrumb($channel->getChannelName(), $uri); $form = id(new AphrontFormView()) diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php index cf97970c92..0f1ca9f845 100644 --- a/src/applications/maniphest/controller/ManiphestReportController.php +++ b/src/applications/maniphest/controller/ManiphestReportController.php @@ -52,7 +52,6 @@ final class ManiphestReportController extends ManiphestController { $nav->appendChild($core); $nav->setCrumbs( $this->buildApplicationCrumbs() - ->setBorder(true) ->addTextCrumb(pht('Reports'))); return $this->buildApplicationPage( diff --git a/src/applications/owners/controller/PhabricatorOwnersListController.php b/src/applications/owners/controller/PhabricatorOwnersListController.php index 01ae38dc23..015ff86489 100644 --- a/src/applications/owners/controller/PhabricatorOwnersListController.php +++ b/src/applications/owners/controller/PhabricatorOwnersListController.php @@ -196,7 +196,6 @@ final class PhabricatorOwnersListController $crumbs = $this->buildApplicationCrumbs(); $crumbs->addTextCrumb($header); - $crumbs->setBorder(true); $nav = $this->buildSideNavView(); $nav->appendChild($crumbs); diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php index ac67585268..0733347341 100644 --- a/src/applications/search/controller/PhabricatorApplicationSearchController.php +++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php @@ -268,7 +268,6 @@ final class PhabricatorApplicationSearchController $crumbs = $parent ->buildApplicationCrumbs() - ->setBorder(true) ->addTextCrumb($title); $nav->setCrumbs($crumbs); diff --git a/src/applications/uiexample/controller/PhabricatorUIExampleRenderController.php b/src/applications/uiexample/controller/PhabricatorUIExampleRenderController.php index c56332fcdb..00dd4daf41 100644 --- a/src/applications/uiexample/controller/PhabricatorUIExampleRenderController.php +++ b/src/applications/uiexample/controller/PhabricatorUIExampleRenderController.php @@ -41,18 +41,17 @@ final class PhabricatorUIExampleRenderController extends PhabricatorController { require_celerity_resource('phabricator-ui-example-css'); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->setBorder(true); $crumbs->addTextCrumb($example->getName()); - $header = id(new PHUIHeaderView()) - ->setHeader(pht('%s (%s)', $example->getName(), get_class($example))) - ->setSubheader($example->getDescription()) - ->setNoBackground(true); + $note = id(new PHUIInfoView()) + ->setTitle(pht('%s (%s)', $example->getName(), get_class($example))) + ->appendChild($example->getDescription()) + ->setSeverity(PHUIInfoView::SEVERITY_NODATA); $nav->appendChild( array( $crumbs, - $header, + $note, $result, )); diff --git a/src/applications/uiexample/examples/PhabricatorSortTableUIExample.php b/src/applications/uiexample/examples/PhabricatorSortTableUIExample.php index 7ed2cdce2b..db673571ff 100644 --- a/src/applications/uiexample/examples/PhabricatorSortTableUIExample.php +++ b/src/applications/uiexample/examples/PhabricatorSortTableUIExample.php @@ -89,7 +89,7 @@ final class PhabricatorSortTableUIExample extends PhabricatorUIExample { $panel = new PHUIObjectBoxView(); $panel->setHeaderText('Sortable Table of Vehicles'); - $panel->appendChild($table); + $panel->setTable($table); return $panel; } diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css index 996d4f2880..2453b80185 100644 --- a/webroot/rsrc/css/application/base/main-menu-view.css +++ b/webroot/rsrc/css/application/base/main-menu-view.css @@ -66,7 +66,7 @@ } .device-desktop .phabricator-main-menu-brand:hover { - background-color: rgba(55,55,55,..08); + background-color: rgba(55,55,55,.08); cursor: hand; } diff --git a/webroot/rsrc/css/phui/phui-crumbs-view.css b/webroot/rsrc/css/phui/phui-crumbs-view.css index de67543adf..6c62ee8e94 100644 --- a/webroot/rsrc/css/phui/phui-crumbs-view.css +++ b/webroot/rsrc/css/phui/phui-crumbs-view.css @@ -80,7 +80,7 @@ .device-desktop .phui-crumbs-view a:hover, .device-desktop .phui-crumbs-view a:hover .phui-icon-view { - color: {$sky}; + color: {$blue}; text-decoration: none; } @@ -101,6 +101,10 @@ a.phui-crumbs-action .phui-icon-view { margin: 2px 8px; } +.phui-crumbs-view.phui-crumbs-border { + border-bottom: 1px solid {$thinblueborder}; +} + body .phui-crumbs-view + .phui-object-box { margin-top: 0; }