diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 30daf8e562..28df6866af 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -718,7 +718,7 @@ celerity_register_resource_map(array( ), 'config-options-css' => array( - 'uri' => '/res/6f7f64e8/rsrc/css/application/config/config-options.css', + 'uri' => '/res/8f7f8a20/rsrc/css/application/config/config-options.css', 'type' => 'css', 'requires' => array( @@ -2766,7 +2766,7 @@ celerity_register_resource_map(array( ), 'phabricator-object-item-list-view-css' => array( - 'uri' => '/res/1f9c7ebb/rsrc/css/layout/phabricator-object-item-list-view.css', + 'uri' => '/res/b2051a98/rsrc/css/layout/phabricator-object-item-list-view.css', 'type' => 'css', 'requires' => array( @@ -3338,7 +3338,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '8fd19266' => + 'bae79082' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -3382,7 +3382,7 @@ celerity_register_resource_map(array( 36 => 'phabricator-object-item-list-view-css', 37 => 'global-drag-and-drop-css', ), - 'uri' => '/res/pkg/8fd19266/core.pkg.css', + 'uri' => '/res/pkg/bae79082/core.pkg.css', 'type' => 'css', ), '66dca903' => @@ -3572,19 +3572,19 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => 'e30a3fa8', - 'aphront-crumbs-view-css' => '8fd19266', - 'aphront-dialog-view-css' => '8fd19266', - 'aphront-error-view-css' => '8fd19266', - 'aphront-form-view-css' => '8fd19266', + 'aphront-crumbs-view-css' => 'bae79082', + 'aphront-dialog-view-css' => 'bae79082', + 'aphront-error-view-css' => 'bae79082', + 'aphront-form-view-css' => 'bae79082', 'aphront-headsup-action-list-view-css' => 'ec01d039', - 'aphront-headsup-view-css' => '8fd19266', - 'aphront-list-filter-view-css' => '8fd19266', - 'aphront-pager-view-css' => '8fd19266', - 'aphront-panel-view-css' => '8fd19266', - 'aphront-table-view-css' => '8fd19266', - 'aphront-tokenizer-control-css' => '8fd19266', - 'aphront-tooltip-css' => '8fd19266', - 'aphront-typeahead-control-css' => '8fd19266', + 'aphront-headsup-view-css' => 'bae79082', + 'aphront-list-filter-view-css' => 'bae79082', + 'aphront-pager-view-css' => 'bae79082', + 'aphront-panel-view-css' => 'bae79082', + 'aphront-table-view-css' => 'bae79082', + 'aphront-tokenizer-control-css' => 'bae79082', + 'aphront-tooltip-css' => 'bae79082', + 'aphront-typeahead-control-css' => 'bae79082', 'differential-changeset-view-css' => 'ec01d039', 'differential-core-view-css' => 'ec01d039', 'differential-inline-comment-editor' => 'ac53d36a', @@ -3598,7 +3598,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' => '8fd19266', + 'global-drag-and-drop-css' => 'bae79082', 'inline-comment-summary-css' => 'ec01d039', 'javelin-aphlict' => '66dca903', 'javelin-behavior' => 'fbeded59', @@ -3668,48 +3668,48 @@ celerity_register_resource_map(array( 'javelin-util' => 'fbeded59', 'javelin-vector' => 'fbeded59', 'javelin-workflow' => 'fbeded59', - 'lightbox-attachment-css' => '8fd19266', + 'lightbox-attachment-css' => 'bae79082', 'maniphest-task-summary-css' => 'e30a3fa8', 'maniphest-transaction-detail-css' => 'e30a3fa8', 'phabricator-busy' => '66dca903', 'phabricator-content-source-view-css' => 'ec01d039', - 'phabricator-core-buttons-css' => '8fd19266', - 'phabricator-core-css' => '8fd19266', - 'phabricator-crumbs-view-css' => '8fd19266', - 'phabricator-directory-css' => '8fd19266', + 'phabricator-core-buttons-css' => 'bae79082', + 'phabricator-core-css' => 'bae79082', + 'phabricator-crumbs-view-css' => 'bae79082', + 'phabricator-directory-css' => 'bae79082', 'phabricator-drag-and-drop-file-upload' => 'ac53d36a', 'phabricator-dropdown-menu' => '66dca903', 'phabricator-file-upload' => '66dca903', - 'phabricator-filetree-view-css' => '8fd19266', - 'phabricator-flag-css' => '8fd19266', - 'phabricator-form-view-css' => '8fd19266', - 'phabricator-header-view-css' => '8fd19266', - 'phabricator-jump-nav' => '8fd19266', + 'phabricator-filetree-view-css' => 'bae79082', + 'phabricator-flag-css' => 'bae79082', + 'phabricator-form-view-css' => 'bae79082', + 'phabricator-header-view-css' => 'bae79082', + 'phabricator-jump-nav' => 'bae79082', 'phabricator-keyboard-shortcut' => '66dca903', 'phabricator-keyboard-shortcut-manager' => '66dca903', - 'phabricator-main-menu-view' => '8fd19266', + 'phabricator-main-menu-view' => 'bae79082', 'phabricator-menu-item' => '66dca903', - 'phabricator-nav-view-css' => '8fd19266', + 'phabricator-nav-view-css' => 'bae79082', 'phabricator-notification' => '66dca903', - 'phabricator-notification-css' => '8fd19266', - 'phabricator-notification-menu-css' => '8fd19266', - 'phabricator-object-item-list-view-css' => '8fd19266', + 'phabricator-notification-css' => 'bae79082', + 'phabricator-notification-menu-css' => 'bae79082', + 'phabricator-object-item-list-view-css' => 'bae79082', 'phabricator-object-selector-css' => 'ec01d039', 'phabricator-paste-file-upload' => '66dca903', 'phabricator-prefab' => '66dca903', 'phabricator-project-tag-css' => 'e30a3fa8', - 'phabricator-remarkup-css' => '8fd19266', + 'phabricator-remarkup-css' => 'bae79082', 'phabricator-shaped-request' => 'ac53d36a', - 'phabricator-side-menu-view-css' => '8fd19266', - 'phabricator-standard-page-view' => '8fd19266', + 'phabricator-side-menu-view-css' => 'bae79082', + 'phabricator-standard-page-view' => 'bae79082', 'phabricator-textareautils' => '66dca903', 'phabricator-tooltip' => '66dca903', - 'phabricator-transaction-view-css' => '8fd19266', - 'phabricator-zindex-css' => '8fd19266', - 'sprite-apps-large-css' => '8fd19266', - 'sprite-gradient-css' => '8fd19266', - 'sprite-icon-css' => '8fd19266', - 'sprite-menu-css' => '8fd19266', - 'syntax-highlighting-css' => '8fd19266', + 'phabricator-transaction-view-css' => 'bae79082', + 'phabricator-zindex-css' => 'bae79082', + 'sprite-apps-large-css' => 'bae79082', + 'sprite-gradient-css' => 'bae79082', + 'sprite-icon-css' => 'bae79082', + 'sprite-menu-css' => 'bae79082', + 'syntax-highlighting-css' => 'bae79082', ), )); diff --git a/src/applications/config/controller/PhabricatorConfigAllController.php b/src/applications/config/controller/PhabricatorConfigAllController.php index e5bbc7552a..a429d2390e 100644 --- a/src/applications/config/controller/PhabricatorConfigAllController.php +++ b/src/applications/config/controller/PhabricatorConfigAllController.php @@ -84,7 +84,6 @@ final class PhabricatorConfigAllController $nav->appendChild($panel); - return $this->buildApplicationPage( $nav, array( diff --git a/src/applications/config/controller/PhabricatorConfigGroupController.php b/src/applications/config/controller/PhabricatorConfigGroupController.php index a41bc4efdb..d1429f6cf5 100644 --- a/src/applications/config/controller/PhabricatorConfigGroupController.php +++ b/src/applications/config/controller/PhabricatorConfigGroupController.php @@ -72,6 +72,7 @@ final class PhabricatorConfigGroupController $engine->process(); $list = new PhabricatorObjectItemListView(); + $list->setStackable(); foreach ($options as $option) { $summary = $engine->getOutput($option, 'summary'); diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php index eb4c9998da..aee0f7a26e 100644 --- a/src/applications/config/controller/PhabricatorConfigIssueListController.php +++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php @@ -48,6 +48,7 @@ final class PhabricatorConfigIssueListController private function buildIssueList(array $issues) { assert_instances_of($issues, 'PhabricatorSetupIssue'); $list = new PhabricatorObjectItemListView(); + $list->setStackable(); foreach ($issues as $issue) { $href = $this->getApplicationURI('/issue/'.$issue->getIssueKey().'/'); diff --git a/src/applications/config/controller/PhabricatorConfigListController.php b/src/applications/config/controller/PhabricatorConfigListController.php index 2513633c32..1561531f42 100644 --- a/src/applications/config/controller/PhabricatorConfigListController.php +++ b/src/applications/config/controller/PhabricatorConfigListController.php @@ -46,6 +46,7 @@ final class PhabricatorConfigListController assert_instances_of($groups, 'PhabricatorApplicationConfigOptions'); $list = new PhabricatorObjectItemListView(); + $list->setStackable(); $groups = msort($groups, 'getName'); foreach ($groups as $group) { $item = id(new PhabricatorObjectItemView()) diff --git a/src/view/layout/PhabricatorObjectItemListView.php b/src/view/layout/PhabricatorObjectItemListView.php index 8b5f933d7a..9e1097f4a1 100644 --- a/src/view/layout/PhabricatorObjectItemListView.php +++ b/src/view/layout/PhabricatorObjectItemListView.php @@ -5,6 +5,7 @@ final class PhabricatorObjectItemListView extends AphrontView { private $header; private $items; private $pager; + private $stackable; private $noDataString; public function setHeader($header) { @@ -27,9 +28,15 @@ final class PhabricatorObjectItemListView extends AphrontView { return $this; } + public function setStackable() { + $this->stackable = true; + return $this; + } + public function render() { require_celerity_resource('phabricator-object-item-list-view-css'); + $classes = array(); $header = null; if (strlen($this->header)) { $header = phutil_render_tag( @@ -55,10 +62,15 @@ final class PhabricatorObjectItemListView extends AphrontView { $pager = $this->renderSingleView($this->pager); } + $classes[] = 'phabricator-object-item-list-view'; + if ($this->stackable) { + $classes[] = 'phabricator-object-list-stackable'; + } + return phutil_render_tag( - 'div', + 'ul', array( - 'class' => 'phabricator-object-item-list-view', + 'class' => implode(' ', $classes), ), $header.$items.$pager); } diff --git a/src/view/layout/PhabricatorObjectItemView.php b/src/view/layout/PhabricatorObjectItemView.php index ae40e59117..b02bf63e0f 100644 --- a/src/view/layout/PhabricatorObjectItemView.php +++ b/src/view/layout/PhabricatorObjectItemView.php @@ -166,7 +166,7 @@ final class PhabricatorObjectItemView extends AphrontView { $header.$attrs.$this->renderChildren()); return phutil_render_tag( - 'div', + 'li', array( 'class' => implode(' ', $classes), ), diff --git a/webroot/rsrc/css/application/config/config-options.css b/webroot/rsrc/css/application/config/config-options.css index f7ba294c92..fb05c43e98 100644 --- a/webroot/rsrc/css/application/config/config-options.css +++ b/webroot/rsrc/css/application/config/config-options.css @@ -38,10 +38,10 @@ } .config-options-current-value { - padding: 0 6px 2px; + padding: 0 10px 10px; white-space: pre-wrap; } .config-options-current-value span { - color: #666666; + color: #777; } diff --git a/webroot/rsrc/css/layout/phabricator-object-item-list-view.css b/webroot/rsrc/css/layout/phabricator-object-item-list-view.css index 25c01eabb6..f336c4b2c2 100644 --- a/webroot/rsrc/css/layout/phabricator-object-item-list-view.css +++ b/webroot/rsrc/css/layout/phabricator-object-item-list-view.css @@ -7,6 +7,10 @@ background: #f4f5f6; } +.phabricator-object-item-list-view.phabricator-object-list-stackable .phabricator-object-item { + margin: -1px 0 0 0; +} + .device-desktop .phabricator-object-item-list-view { padding: 20px; } @@ -14,22 +18,27 @@ .phabricator-object-item { background: #ffffff; border-style: solid; - border-color: #d7d7d7 #e4e3e4 #bcbcbd #d7d7d7; + border-color: #c0c5d1; border-width: 1px 1px 1px 3px; - margin: 3px 0; + margin: 5px 0; overflow: hidden; box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.10); } +.phabricator-object-list-stackable .phabricator-object-item { + border-width: 1px; +} + .device-desktop .phabricator-object-item { margin: 0 0 5px 0; } .phabricator-object-item-name { display: block; - padding: 4px 8px 4px; + padding: 10px 10px 5px; font-weight: bold; + font-size: 14px; } .phabricator-object-item-content { @@ -43,13 +52,13 @@ */ .phabricator-object-item-attributes { - padding: 0px 8px 4px; + padding: 0px 10px 10px; } .phabricator-object-item-attribute { display: inline; - color: #555555; - font-size: 11px; + color: #777; + font-size: 13px; } .phabricator-object-item-attribute-spacer { @@ -66,7 +75,7 @@ .phabricator-object-item-icons { float: right; - padding: 2px 4px 0; + padding: 10px 10px 0; } /* NOTE: The main content is an "overflow: hidden" div which we give a right