From 86312d698667fe85923c0ef4c096d527622d8eac Mon Sep 17 00:00:00 2001 From: Anh Nhan Nguyen Date: Tue, 2 Apr 2013 09:01:09 -0700 Subject: [PATCH] Fix Main Directory Jump Nav CSS leak Summary: Good that this isn't a water leak. Else I'd be screwed. Test Plan: Visited Main Dir. Looks normal. Visited Maniphest. Saw ominous shadow on top for saved query. Saw normal paddings for populated list filters. Reviewers: epriestley, chad Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D5536 --- src/__celerity_resource_map__.php | 78 +++++++++---------- .../PhabricatorDirectoryMainController.php | 6 +- .../directory/phabricator-jump-nav.css | 4 +- 3 files changed, 46 insertions(+), 42 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 7f3cc63a6b..ee31b216d4 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -2975,7 +2975,7 @@ celerity_register_resource_map(array( ), 'phabricator-jump-nav' => array( - 'uri' => '/res/b33dd475/rsrc/css/application/directory/phabricator-jump-nav.css', + 'uri' => '/res/745c0e89/rsrc/css/application/directory/phabricator-jump-nav.css', 'type' => 'css', 'requires' => array( @@ -3805,7 +3805,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '9882678b' => + 'c4fbf0c2' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -3847,7 +3847,7 @@ celerity_register_resource_map(array( 34 => 'phabricator-object-item-list-view-css', 35 => 'global-drag-and-drop-css', ), - 'uri' => '/res/pkg/9882678b/core.pkg.css', + 'uri' => '/res/pkg/c4fbf0c2/core.pkg.css', 'type' => 'css', ), 'def4c982' => @@ -4038,16 +4038,16 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => '6b1fccc6', - 'aphront-dialog-view-css' => '9882678b', - 'aphront-error-view-css' => '9882678b', - 'aphront-form-view-css' => '9882678b', - 'aphront-list-filter-view-css' => '9882678b', - 'aphront-pager-view-css' => '9882678b', - 'aphront-panel-view-css' => '9882678b', - 'aphront-table-view-css' => '9882678b', - 'aphront-tokenizer-control-css' => '9882678b', - 'aphront-tooltip-css' => '9882678b', - 'aphront-typeahead-control-css' => '9882678b', + 'aphront-dialog-view-css' => 'c4fbf0c2', + 'aphront-error-view-css' => 'c4fbf0c2', + 'aphront-form-view-css' => 'c4fbf0c2', + 'aphront-list-filter-view-css' => 'c4fbf0c2', + 'aphront-pager-view-css' => 'c4fbf0c2', + 'aphront-panel-view-css' => 'c4fbf0c2', + 'aphront-table-view-css' => 'c4fbf0c2', + 'aphront-tokenizer-control-css' => 'c4fbf0c2', + 'aphront-tooltip-css' => 'c4fbf0c2', + 'aphront-typeahead-control-css' => 'c4fbf0c2', 'differential-changeset-view-css' => '8aaacd1b', 'differential-core-view-css' => '8aaacd1b', 'differential-inline-comment-editor' => '68d5f4ba', @@ -4061,7 +4061,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => '8aaacd1b', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => '9882678b', + 'global-drag-and-drop-css' => 'c4fbf0c2', 'inline-comment-summary-css' => '8aaacd1b', 'javelin-aphlict' => 'def4c982', 'javelin-behavior' => 'fe22443b', @@ -4133,48 +4133,48 @@ celerity_register_resource_map(array( 'javelin-util' => 'fe22443b', 'javelin-vector' => 'fe22443b', 'javelin-workflow' => 'fe22443b', - 'lightbox-attachment-css' => '9882678b', + 'lightbox-attachment-css' => 'c4fbf0c2', 'maniphest-task-summary-css' => '6b1fccc6', 'maniphest-transaction-detail-css' => '6b1fccc6', 'phabricator-busy' => 'def4c982', 'phabricator-content-source-view-css' => '8aaacd1b', - 'phabricator-core-buttons-css' => '9882678b', - 'phabricator-core-css' => '9882678b', - 'phabricator-crumbs-view-css' => '9882678b', - 'phabricator-directory-css' => '9882678b', + 'phabricator-core-buttons-css' => 'c4fbf0c2', + 'phabricator-core-css' => 'c4fbf0c2', + 'phabricator-crumbs-view-css' => 'c4fbf0c2', + 'phabricator-directory-css' => 'c4fbf0c2', 'phabricator-drag-and-drop-file-upload' => '68d5f4ba', 'phabricator-dropdown-menu' => 'def4c982', 'phabricator-file-upload' => 'def4c982', - 'phabricator-filetree-view-css' => '9882678b', - 'phabricator-flag-css' => '9882678b', - 'phabricator-form-view-css' => '9882678b', - 'phabricator-header-view-css' => '9882678b', - 'phabricator-jump-nav' => '9882678b', + 'phabricator-filetree-view-css' => 'c4fbf0c2', + 'phabricator-flag-css' => 'c4fbf0c2', + 'phabricator-form-view-css' => 'c4fbf0c2', + 'phabricator-header-view-css' => 'c4fbf0c2', + 'phabricator-jump-nav' => 'c4fbf0c2', 'phabricator-keyboard-shortcut' => 'def4c982', 'phabricator-keyboard-shortcut-manager' => 'def4c982', - 'phabricator-main-menu-view' => '9882678b', + 'phabricator-main-menu-view' => 'c4fbf0c2', 'phabricator-menu-item' => 'def4c982', - 'phabricator-nav-view-css' => '9882678b', + 'phabricator-nav-view-css' => 'c4fbf0c2', 'phabricator-notification' => 'def4c982', - 'phabricator-notification-css' => '9882678b', - 'phabricator-notification-menu-css' => '9882678b', - 'phabricator-object-item-list-view-css' => '9882678b', + 'phabricator-notification-css' => 'c4fbf0c2', + 'phabricator-notification-menu-css' => 'c4fbf0c2', + 'phabricator-object-item-list-view-css' => 'c4fbf0c2', 'phabricator-object-selector-css' => '8aaacd1b', 'phabricator-paste-file-upload' => 'def4c982', 'phabricator-prefab' => 'def4c982', 'phabricator-project-tag-css' => '6b1fccc6', - 'phabricator-remarkup-css' => '9882678b', + 'phabricator-remarkup-css' => 'c4fbf0c2', 'phabricator-shaped-request' => '68d5f4ba', - 'phabricator-side-menu-view-css' => '9882678b', - 'phabricator-standard-page-view' => '9882678b', + 'phabricator-side-menu-view-css' => 'c4fbf0c2', + 'phabricator-standard-page-view' => 'c4fbf0c2', 'phabricator-textareautils' => 'def4c982', 'phabricator-tooltip' => 'def4c982', - 'phabricator-transaction-view-css' => '9882678b', - 'phabricator-zindex-css' => '9882678b', - 'sprite-apps-large-css' => '9882678b', - 'sprite-gradient-css' => '9882678b', - 'sprite-icon-css' => '9882678b', - 'sprite-menu-css' => '9882678b', - 'syntax-highlighting-css' => '9882678b', + 'phabricator-transaction-view-css' => 'c4fbf0c2', + 'phabricator-zindex-css' => 'c4fbf0c2', + 'sprite-apps-large-css' => 'c4fbf0c2', + 'sprite-gradient-css' => 'c4fbf0c2', + 'sprite-icon-css' => 'c4fbf0c2', + 'sprite-menu-css' => 'c4fbf0c2', + 'syntax-highlighting-css' => 'c4fbf0c2', ), )); diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php index 597634449e..622cc1bcff 100644 --- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php +++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php @@ -360,7 +360,11 @@ final class PhabricatorDirectoryMainController $list_filter->appendChild(phutil_tag('h1', array(), 'Jump Nav')); $list_filter->appendChild($form); - return $list_filter; + $container = phutil_tag('div', + array('class' => 'phabricator-jump-nav-container'), + $list_filter); + + return $container; } private function renderMiniPanel($title, $body) { diff --git a/webroot/rsrc/css/application/directory/phabricator-jump-nav.css b/webroot/rsrc/css/application/directory/phabricator-jump-nav.css index 383aa28c0d..2b7faedd7d 100644 --- a/webroot/rsrc/css/application/directory/phabricator-jump-nav.css +++ b/webroot/rsrc/css/application/directory/phabricator-jump-nav.css @@ -25,11 +25,11 @@ text-align: left; } -.aphront-list-filter-view-controls { +.phabricator-jump-nav-container .aphront-list-filter-view-controls { padding: 20px; } -.aphront-list-filter-view-controls h1 { +.phabricator-jump-nav-container .aphront-list-filter-view-controls h1 { color: #555; padding-top: 4px; margin-bottom: 0.67em;