From e2e890672ae7b5d44a07ee9a2498faa3808dfcca Mon Sep 17 00:00:00 2001 From: Chad Little Date: Mon, 14 Jan 2013 16:40:04 -0800 Subject: [PATCH] Adds a new 'setnobackground' panel class, implements in Differential / Diffusion. Summary: Still working through basic re-design. Adds the ability to re-use panel view without the background. Test Plan: Viewed Diffusion and Differential in Chrome, FF, Safari. Reviewers: epriestley, btrahan Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D4430 --- src/__celerity_resource_map__.php | 86 +++++++++---------- .../DifferentialRevisionListController.php | 1 + .../controller/DiffusionBrowseController.php | 1 + .../controller/DiffusionHistoryController.php | 1 + .../controller/DiffusionHomeController.php | 1 + .../DiffusionRepositoryController.php | 4 + src/view/layout/AphrontPanelView.php | 5 ++ webroot/rsrc/css/aphront/panel-view.css | 17 +++- .../application/base/standard-page-view.css | 2 +- 9 files changed, 71 insertions(+), 47 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index b0b6e42af7..2712b42a53 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -698,7 +698,7 @@ celerity_register_resource_map(array( ), 'aphront-panel-view-css' => array( - 'uri' => '/res/77bb2527/rsrc/css/aphront/panel-view.css', + 'uri' => '/res/91497368/rsrc/css/aphront/panel-view.css', 'type' => 'css', 'requires' => array( @@ -2868,7 +2868,7 @@ celerity_register_resource_map(array( ), 'phabricator-standard-page-view' => array( - 'uri' => '/res/395bbefe/rsrc/css/application/base/standard-page-view.css', + 'uri' => '/res/e4e96b83/rsrc/css/application/base/standard-page-view.css', 'type' => 'css', 'requires' => array( @@ -3268,7 +3268,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '2fc52778' => + 'b6d1f956' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -3313,7 +3313,7 @@ celerity_register_resource_map(array( 37 => 'phabricator-object-item-list-view-css', 38 => 'global-drag-and-drop-css', ), - 'uri' => '/res/pkg/2fc52778/core.pkg.css', + 'uri' => '/res/pkg/b6d1f956/core.pkg.css', 'type' => 'css', ), 'b239ff06' => @@ -3502,19 +3502,19 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => 'ac211174', - 'aphront-crumbs-view-css' => '2fc52778', - 'aphront-dialog-view-css' => '2fc52778', - 'aphront-error-view-css' => '2fc52778', - 'aphront-form-view-css' => '2fc52778', + 'aphront-crumbs-view-css' => 'b6d1f956', + 'aphront-dialog-view-css' => 'b6d1f956', + 'aphront-error-view-css' => 'b6d1f956', + 'aphront-form-view-css' => 'b6d1f956', 'aphront-headsup-action-list-view-css' => '20933a11', - 'aphront-headsup-view-css' => '2fc52778', - 'aphront-list-filter-view-css' => '2fc52778', - 'aphront-pager-view-css' => '2fc52778', - 'aphront-panel-view-css' => '2fc52778', - 'aphront-table-view-css' => '2fc52778', - 'aphront-tokenizer-control-css' => '2fc52778', - 'aphront-tooltip-css' => '2fc52778', - 'aphront-typeahead-control-css' => '2fc52778', + 'aphront-headsup-view-css' => 'b6d1f956', + 'aphront-list-filter-view-css' => 'b6d1f956', + 'aphront-pager-view-css' => 'b6d1f956', + 'aphront-panel-view-css' => 'b6d1f956', + 'aphront-table-view-css' => 'b6d1f956', + 'aphront-tokenizer-control-css' => 'b6d1f956', + 'aphront-tooltip-css' => 'b6d1f956', + 'aphront-typeahead-control-css' => 'b6d1f956', 'differential-changeset-view-css' => '20933a11', 'differential-core-view-css' => '20933a11', 'differential-inline-comment-editor' => 'bbd79ca2', @@ -3528,7 +3528,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => '20933a11', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => '2fc52778', + 'global-drag-and-drop-css' => 'b6d1f956', 'inline-comment-summary-css' => '20933a11', 'javelin-aphlict' => 'b239ff06', 'javelin-behavior' => 'fbeded59', @@ -3597,49 +3597,49 @@ celerity_register_resource_map(array( 'javelin-util' => 'fbeded59', 'javelin-vector' => 'fbeded59', 'javelin-workflow' => 'fbeded59', - 'lightbox-attachment-css' => '2fc52778', + 'lightbox-attachment-css' => 'b6d1f956', 'maniphest-task-summary-css' => 'ac211174', 'maniphest-transaction-detail-css' => 'ac211174', - 'phabricator-app-buttons-css' => '2fc52778', + 'phabricator-app-buttons-css' => 'b6d1f956', 'phabricator-busy' => 'b239ff06', 'phabricator-content-source-view-css' => '20933a11', - 'phabricator-core-buttons-css' => '2fc52778', - 'phabricator-core-css' => '2fc52778', - 'phabricator-crumbs-view-css' => '2fc52778', - 'phabricator-directory-css' => '2fc52778', + 'phabricator-core-buttons-css' => 'b6d1f956', + 'phabricator-core-css' => 'b6d1f956', + 'phabricator-crumbs-view-css' => 'b6d1f956', + 'phabricator-directory-css' => 'b6d1f956', 'phabricator-drag-and-drop-file-upload' => 'bbd79ca2', 'phabricator-dropdown-menu' => 'b239ff06', 'phabricator-file-upload' => 'b239ff06', - 'phabricator-filetree-view-css' => '2fc52778', - 'phabricator-flag-css' => '2fc52778', - 'phabricator-form-view-css' => '2fc52778', - 'phabricator-header-view-css' => '2fc52778', - 'phabricator-jump-nav' => '2fc52778', + 'phabricator-filetree-view-css' => 'b6d1f956', + 'phabricator-flag-css' => 'b6d1f956', + 'phabricator-form-view-css' => 'b6d1f956', + 'phabricator-header-view-css' => 'b6d1f956', + 'phabricator-jump-nav' => 'b6d1f956', 'phabricator-keyboard-shortcut' => 'b239ff06', 'phabricator-keyboard-shortcut-manager' => 'b239ff06', - 'phabricator-main-menu-view' => '2fc52778', + 'phabricator-main-menu-view' => 'b6d1f956', 'phabricator-menu-item' => 'b239ff06', - 'phabricator-nav-view-css' => '2fc52778', + 'phabricator-nav-view-css' => 'b6d1f956', 'phabricator-notification' => 'b239ff06', - 'phabricator-notification-css' => '2fc52778', - 'phabricator-notification-menu-css' => '2fc52778', - 'phabricator-object-item-list-view-css' => '2fc52778', + 'phabricator-notification-css' => 'b6d1f956', + 'phabricator-notification-menu-css' => 'b6d1f956', + 'phabricator-object-item-list-view-css' => 'b6d1f956', 'phabricator-object-selector-css' => '20933a11', 'phabricator-paste-file-upload' => 'b239ff06', 'phabricator-prefab' => 'b239ff06', 'phabricator-project-tag-css' => 'ac211174', - 'phabricator-remarkup-css' => '2fc52778', + 'phabricator-remarkup-css' => 'b6d1f956', 'phabricator-shaped-request' => 'bbd79ca2', - 'phabricator-side-menu-view-css' => '2fc52778', - 'phabricator-standard-page-view' => '2fc52778', + 'phabricator-side-menu-view-css' => 'b6d1f956', + 'phabricator-standard-page-view' => 'b6d1f956', 'phabricator-textareautils' => 'b239ff06', 'phabricator-tooltip' => 'b239ff06', - 'phabricator-transaction-view-css' => '2fc52778', - 'phabricator-zindex-css' => '2fc52778', - 'sprite-apps-large-css' => '2fc52778', - 'sprite-gradient-css' => '2fc52778', - 'sprite-icon-css' => '2fc52778', - 'sprite-menu-css' => '2fc52778', - 'syntax-highlighting-css' => '2fc52778', + 'phabricator-transaction-view-css' => 'b6d1f956', + 'phabricator-zindex-css' => 'b6d1f956', + 'sprite-apps-large-css' => 'b6d1f956', + 'sprite-gradient-css' => 'b6d1f956', + 'sprite-icon-css' => 'b6d1f956', + 'sprite-menu-css' => 'b6d1f956', + 'syntax-highlighting-css' => 'b6d1f956', ), )); diff --git a/src/applications/differential/controller/DifferentialRevisionListController.php b/src/applications/differential/controller/DifferentialRevisionListController.php index 306c60cad5..191bf8043c 100644 --- a/src/applications/differential/controller/DifferentialRevisionListController.php +++ b/src/applications/differential/controller/DifferentialRevisionListController.php @@ -155,6 +155,7 @@ final class DifferentialRevisionListController extends DifferentialController { if ($pager) { $panel->appendChild($pager); } + $panel->setNoBackground(); $panels[] = $panel; } } diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php index ecee20a4f2..b0565ca6ce 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseController.php @@ -66,6 +66,7 @@ final class DiffusionBrowseController extends DiffusionController { $browse_panel = new AphrontPanelView(); $browse_panel->appendChild($browse_table); + $browse_panel->setNoBackground(); $content[] = $browse_panel; } diff --git a/src/applications/diffusion/controller/DiffusionHistoryController.php b/src/applications/diffusion/controller/DiffusionHistoryController.php index 074bbe7840..4b9193616d 100644 --- a/src/applications/diffusion/controller/DiffusionHistoryController.php +++ b/src/applications/diffusion/controller/DiffusionHistoryController.php @@ -75,6 +75,7 @@ final class DiffusionHistoryController extends DiffusionController { $history_panel->addButton($button); $history_panel->appendChild($history_table); $history_panel->appendChild($pager); + $history_panel->setNoBackground(); $content[] = $history_panel; diff --git a/src/applications/diffusion/controller/DiffusionHomeController.php b/src/applications/diffusion/controller/DiffusionHomeController.php index 8a43e35441..96436d8c33 100644 --- a/src/applications/diffusion/controller/DiffusionHomeController.php +++ b/src/applications/diffusion/controller/DiffusionHomeController.php @@ -199,6 +199,7 @@ final class DiffusionHomeController extends DiffusionController { $panel = new AphrontPanelView(); $panel->setHeader('Browse Repositories'); $panel->appendChild($table); + $panel->setNoBackground(); $crumbs = $this->buildCrumbs(); $crumbs->addCrumb( diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php index b0c68c195c..5af0a056ba 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php @@ -70,6 +70,7 @@ final class DiffusionRepositoryController extends DiffusionController { $panel = new AphrontPanelView(); $panel->setHeader("Recent Commits · {$all}"); $panel->appendChild($history_table); + $panel->setNoBackground(); $content[] = $panel; @@ -83,6 +84,7 @@ final class DiffusionRepositoryController extends DiffusionController { $browse_panel = new AphrontPanelView(); $browse_panel->setHeader('Browse Repository'); $browse_panel->appendChild($browse_table); + $browse_panel->setNoBackground(); $content[] = $browse_panel; @@ -138,6 +140,7 @@ final class DiffusionRepositoryController extends DiffusionController { $panel = new AphrontPanelView(); $panel->setHeader('Repository Properties'); $panel->appendChild($table); + $panel->setNoBackground(); return $panel; } @@ -172,6 +175,7 @@ final class DiffusionRepositoryController extends DiffusionController { $panel = new AphrontPanelView(); $panel->setHeader('Branches'); + $panel->setNoBackground(); if ($more_branches) { $panel->setCaption('Showing ' . $limit . ' branches.'); diff --git a/src/view/layout/AphrontPanelView.php b/src/view/layout/AphrontPanelView.php index 783ad37fa9..2c186d6e24 100644 --- a/src/view/layout/AphrontPanelView.php +++ b/src/view/layout/AphrontPanelView.php @@ -56,6 +56,11 @@ final class AphrontPanelView extends AphrontView { return $this; } + public function setNoBackground() { + $this->classes[] = 'aphront-panel-plain'; + return $this; + } + public function render() { if ($this->header !== null) { $header = '

'.$this->header.'

'; diff --git a/webroot/rsrc/css/aphront/panel-view.css b/webroot/rsrc/css/aphront/panel-view.css index 2a27f22577..f453bb564a 100644 --- a/webroot/rsrc/css/aphront/panel-view.css +++ b/webroot/rsrc/css/aphront/panel-view.css @@ -8,11 +8,17 @@ border: 1px solid #c0c0c0; border-width: 1px 0 0; padding: 1em 2em; - margin: 1em 2em; + margin: 20px 20px 40px 20px; } .aphront-unpadded-panel-view { - padding: 0px; + padding: 0; +} + +.aphront-panel-view.aphront-panel-plain { + padding: 0; + border: none; + background: transparent; } .aphront-panel-view .aphront-panel-header { @@ -20,11 +26,16 @@ } .aphront-panel-view h1 { - font-size: 14px; + font-size: 15px; font-weight: bold; + color: #555; padding: 4px 0 0 0; } +.aphront-panel-plain h1 { + padding: 0 0 4px 0; +} + .aphront-panel-view-caption { font-size: 11px; color: #666666; diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css index 46a0b7a25e..1317b746dd 100644 --- a/webroot/rsrc/css/application/base/standard-page-view.css +++ b/webroot/rsrc/css/application/base/standard-page-view.css @@ -19,7 +19,7 @@ .phabricator-page-foot { text-align: right; - margin: 2em; + margin: 4em 2em; border-top: 1px solid #dfdfdf; padding: .5em 1em; font-size: 11px;