diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index df4ef1f03f..8f6dc75c2b 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -656,7 +656,7 @@ celerity_register_resource_map(array( ), 'aphront-panel-view-css' => array( - 'uri' => '/res/1bf6e48e/rsrc/css/aphront/panel-view.css', + 'uri' => '/res/2bafebac/rsrc/css/aphront/panel-view.css', 'type' => 'css', 'requires' => array( @@ -2570,7 +2570,7 @@ celerity_register_resource_map(array( ), 'phabricator-jump-nav' => array( - 'uri' => '/res/8bdc0fc3/rsrc/css/application/directory/phabricator-jump-nav.css', + 'uri' => '/res/2e0e2211/rsrc/css/application/directory/phabricator-jump-nav.css', 'type' => 'css', 'requires' => array( @@ -3229,7 +3229,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '828acc91' => + 'ded5cb21' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -3273,7 +3273,7 @@ celerity_register_resource_map(array( 36 => 'phabricator-object-item-list-view-css', 37 => 'global-drag-and-drop-css', ), - 'uri' => '/res/pkg/828acc91/core.pkg.css', + 'uri' => '/res/pkg/ded5cb21/core.pkg.css', 'type' => 'css', ), 'c90b892e' => @@ -3463,19 +3463,19 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => 'a88951d1', - 'aphront-crumbs-view-css' => '828acc91', - 'aphront-dialog-view-css' => '828acc91', - 'aphront-error-view-css' => '828acc91', - 'aphront-form-view-css' => '828acc91', + 'aphront-crumbs-view-css' => 'ded5cb21', + 'aphront-dialog-view-css' => 'ded5cb21', + 'aphront-error-view-css' => 'ded5cb21', + 'aphront-form-view-css' => 'ded5cb21', 'aphront-headsup-action-list-view-css' => 'ec01d039', - 'aphront-headsup-view-css' => '828acc91', - 'aphront-list-filter-view-css' => '828acc91', - 'aphront-pager-view-css' => '828acc91', - 'aphront-panel-view-css' => '828acc91', - 'aphront-table-view-css' => '828acc91', - 'aphront-tokenizer-control-css' => '828acc91', - 'aphront-tooltip-css' => '828acc91', - 'aphront-typeahead-control-css' => '828acc91', + 'aphront-headsup-view-css' => 'ded5cb21', + 'aphront-list-filter-view-css' => 'ded5cb21', + 'aphront-pager-view-css' => 'ded5cb21', + 'aphront-panel-view-css' => 'ded5cb21', + 'aphront-table-view-css' => 'ded5cb21', + 'aphront-tokenizer-control-css' => 'ded5cb21', + 'aphront-tooltip-css' => 'ded5cb21', + 'aphront-typeahead-control-css' => 'ded5cb21', 'differential-changeset-view-css' => 'ec01d039', 'differential-core-view-css' => 'ec01d039', 'differential-inline-comment-editor' => 'bbd79ca2', @@ -3489,7 +3489,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => 'ec01d039', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => '828acc91', + 'global-drag-and-drop-css' => 'ded5cb21', 'inline-comment-summary-css' => 'ec01d039', 'javelin-aphlict' => 'c90b892e', 'javelin-behavior' => 'fbeded59', @@ -3559,48 +3559,48 @@ celerity_register_resource_map(array( 'javelin-util' => 'fbeded59', 'javelin-vector' => 'fbeded59', 'javelin-workflow' => 'fbeded59', - 'lightbox-attachment-css' => '828acc91', + 'lightbox-attachment-css' => 'ded5cb21', 'maniphest-task-summary-css' => 'a88951d1', 'maniphest-transaction-detail-css' => 'a88951d1', 'phabricator-busy' => 'c90b892e', 'phabricator-content-source-view-css' => 'ec01d039', - 'phabricator-core-buttons-css' => '828acc91', - 'phabricator-core-css' => '828acc91', - 'phabricator-crumbs-view-css' => '828acc91', - 'phabricator-directory-css' => '828acc91', + 'phabricator-core-buttons-css' => 'ded5cb21', + 'phabricator-core-css' => 'ded5cb21', + 'phabricator-crumbs-view-css' => 'ded5cb21', + 'phabricator-directory-css' => 'ded5cb21', 'phabricator-drag-and-drop-file-upload' => 'bbd79ca2', 'phabricator-dropdown-menu' => 'c90b892e', 'phabricator-file-upload' => 'c90b892e', - 'phabricator-filetree-view-css' => '828acc91', - 'phabricator-flag-css' => '828acc91', - 'phabricator-form-view-css' => '828acc91', - 'phabricator-header-view-css' => '828acc91', - 'phabricator-jump-nav' => '828acc91', + 'phabricator-filetree-view-css' => 'ded5cb21', + 'phabricator-flag-css' => 'ded5cb21', + 'phabricator-form-view-css' => 'ded5cb21', + 'phabricator-header-view-css' => 'ded5cb21', + 'phabricator-jump-nav' => 'ded5cb21', 'phabricator-keyboard-shortcut' => 'c90b892e', 'phabricator-keyboard-shortcut-manager' => 'c90b892e', - 'phabricator-main-menu-view' => '828acc91', + 'phabricator-main-menu-view' => 'ded5cb21', 'phabricator-menu-item' => 'c90b892e', - 'phabricator-nav-view-css' => '828acc91', + 'phabricator-nav-view-css' => 'ded5cb21', 'phabricator-notification' => 'c90b892e', - 'phabricator-notification-css' => '828acc91', - 'phabricator-notification-menu-css' => '828acc91', - 'phabricator-object-item-list-view-css' => '828acc91', + 'phabricator-notification-css' => 'ded5cb21', + 'phabricator-notification-menu-css' => 'ded5cb21', + 'phabricator-object-item-list-view-css' => 'ded5cb21', 'phabricator-object-selector-css' => 'ec01d039', 'phabricator-paste-file-upload' => 'c90b892e', 'phabricator-prefab' => 'c90b892e', 'phabricator-project-tag-css' => 'a88951d1', - 'phabricator-remarkup-css' => '828acc91', + 'phabricator-remarkup-css' => 'ded5cb21', 'phabricator-shaped-request' => 'bbd79ca2', - 'phabricator-side-menu-view-css' => '828acc91', - 'phabricator-standard-page-view' => '828acc91', + 'phabricator-side-menu-view-css' => 'ded5cb21', + 'phabricator-standard-page-view' => 'ded5cb21', 'phabricator-textareautils' => 'c90b892e', 'phabricator-tooltip' => 'c90b892e', - 'phabricator-transaction-view-css' => '828acc91', - 'phabricator-zindex-css' => '828acc91', - 'sprite-apps-large-css' => '828acc91', - 'sprite-gradient-css' => '828acc91', - 'sprite-icon-css' => '828acc91', - 'sprite-menu-css' => '828acc91', - 'syntax-highlighting-css' => '828acc91', + 'phabricator-transaction-view-css' => 'ded5cb21', + 'phabricator-zindex-css' => 'ded5cb21', + 'sprite-apps-large-css' => 'ded5cb21', + 'sprite-gradient-css' => 'ded5cb21', + 'sprite-icon-css' => 'ded5cb21', + 'sprite-menu-css' => 'ded5cb21', + 'syntax-highlighting-css' => 'ded5cb21', ), )); diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php index ce1e7c100f..360fc6c2dc 100644 --- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php +++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php @@ -4,6 +4,7 @@ final class PhabricatorDirectoryMainController extends PhabricatorDirectoryController { private $filter; + private $minipanels = array(); public function willProcessRequest(array $data) { $this->filter = idx($data, 'filter'); @@ -52,6 +53,7 @@ final class PhabricatorDirectoryMainController $tasks_panel, $audit_panel, $commit_panel, + $this->minipanels, ); $nav->appendChild($content); @@ -114,6 +116,7 @@ final class PhabricatorDirectoryMainController "View All Unbreak Now \xC2\xBB")); $panel->appendChild($this->buildTaskListView($tasks)); + $panel->setNoBackground(); return $panel; } @@ -159,6 +162,7 @@ final class PhabricatorDirectoryMainController ), "View All Triage \xC2\xBB")); $panel->appendChild($this->buildTaskListView($tasks)); + $panel->setNoBackground(); return $panel; } @@ -214,6 +218,7 @@ final class PhabricatorDirectoryMainController $revision_view->setHandles($handles); $panel->appendChild($revision_view); + $panel->setNoBackground(); return $panel; } @@ -239,7 +244,6 @@ final class PhabricatorDirectoryMainController $panel = new AphrontPanelView(); $panel->setHeader('Assigned Tasks'); - $panel->setCaption('Tasks assigned to you.'); $panel->addButton( phutil_render_tag( @@ -250,6 +254,7 @@ final class PhabricatorDirectoryMainController ), "View Active Tasks \xC2\xBB")); $panel->appendChild($this->buildTaskListView($tasks)); + $panel->setNoBackground(); return $panel; } @@ -312,7 +317,7 @@ final class PhabricatorDirectoryMainController 'it. See '.$doc_link.' or type help.'); $panel = new AphrontPanelView(); - $panel->addClass('aphront-unpadded-panel-view'); + $panel->setHeader('Jump Nav'); $panel->appendChild( phabricator_render_form( $user, @@ -335,7 +340,7 @@ final class PhabricatorDirectoryMainController array( ), ''.$title.': '.$body)); - return $panel; + $this->minipanels[] = $panel; } public function buildAuditPanel() { @@ -373,14 +378,15 @@ final class PhabricatorDirectoryMainController $panel->setHeader('Audits'); $panel->setCaption('Commits awaiting your audit.'); $panel->appendChild($view); - $panel->addButton( - phutil_render_tag( - 'a', - array( - 'href' => '/audit/', - 'class' => 'button grey', - ), - "View Active Audits \xC2\xBB")); + $panel->addButton( + phutil_render_tag( + 'a', + array( + 'href' => '/audit/', + 'class' => 'button grey', + ), + "View Active Audits \xC2\xBB")); + $panel->setNoBackground(); return $panel; } @@ -417,14 +423,15 @@ final class PhabricatorDirectoryMainController $panel->setHeader('Problem Commits'); $panel->setCaption('Commits which auditors have raised concerns about.'); $panel->appendChild($view); - $panel->addButton( - phutil_render_tag( - 'a', - array( - 'href' => '/audit/', - 'class' => 'button grey', - ), - "View Problem Commits \xC2\xBB")); + $panel->addButton( + phutil_render_tag( + 'a', + array( + 'href' => '/audit/', + 'class' => 'button grey', + ), + "View Problem Commits \xC2\xBB")); + $panel->setNoBackground(); return $panel; } diff --git a/webroot/rsrc/css/aphront/panel-view.css b/webroot/rsrc/css/aphront/panel-view.css index a157e5a4f1..8239365b06 100644 --- a/webroot/rsrc/css/aphront/panel-view.css +++ b/webroot/rsrc/css/aphront/panel-view.css @@ -111,13 +111,13 @@ .aphront-mini-panel-view { background: #f3f3f3; - padding: 4px 2em; - margin: 2px 2em; + padding: 10px; + margin: 5px 20px; border: 1px solid #e6e6e6; } .aphront-mini-panel-view p { - font-size: 11px; + font-size: 12px; color: #666666; } diff --git a/webroot/rsrc/css/application/directory/phabricator-jump-nav.css b/webroot/rsrc/css/application/directory/phabricator-jump-nav.css index 745f9a18df..8756012e14 100644 --- a/webroot/rsrc/css/application/directory/phabricator-jump-nav.css +++ b/webroot/rsrc/css/application/directory/phabricator-jump-nav.css @@ -5,11 +5,10 @@ .phabricator-jump-nav-form { text-align: center; padding: 0px; - margin: 0 2em; + margin: 0; } .phabricator-jump-nav { - margin-top: -8px; font-size: 16px; width: 100%; padding: 2px 0;