diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 5afef99f1d..24d9470928 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -782,7 +782,7 @@ celerity_register_resource_map(array( ), 'aphront-dialog-view-css' => array( - 'uri' => '/res/7060a2fe/rsrc/css/aphront/dialog-view.css', + 'uri' => '/res/75663cde/rsrc/css/aphront/dialog-view.css', 'type' => 'css', 'requires' => array( @@ -945,7 +945,7 @@ celerity_register_resource_map(array( ), 'conpherence-widget-pane-css' => array( - 'uri' => '/res/40be33e2/rsrc/css/application/conpherence/widget-pane.css', + 'uri' => '/res/5aa0a316/rsrc/css/application/conpherence/widget-pane.css', 'type' => 'css', 'requires' => array( @@ -3973,7 +3973,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - 'bce72de6' => + 'b7428f7c' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -4022,7 +4022,7 @@ celerity_register_resource_map(array( 41 => 'phabricator-property-list-view-css', 42 => 'phabricator-tag-view-css', ), - 'uri' => '/res/pkg/bce72de6/core.pkg.css', + 'uri' => '/res/pkg/b7428f7c/core.pkg.css', 'type' => 'css', ), '98f60e3f' => @@ -4216,16 +4216,16 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => '6b1fccc6', - 'aphront-dialog-view-css' => 'bce72de6', - 'aphront-error-view-css' => 'bce72de6', - 'aphront-form-view-css' => 'bce72de6', - 'aphront-list-filter-view-css' => 'bce72de6', - 'aphront-pager-view-css' => 'bce72de6', - 'aphront-panel-view-css' => 'bce72de6', - 'aphront-table-view-css' => 'bce72de6', - 'aphront-tokenizer-control-css' => 'bce72de6', - 'aphront-tooltip-css' => 'bce72de6', - 'aphront-typeahead-control-css' => 'bce72de6', + 'aphront-dialog-view-css' => 'b7428f7c', + 'aphront-error-view-css' => 'b7428f7c', + 'aphront-form-view-css' => 'b7428f7c', + 'aphront-list-filter-view-css' => 'b7428f7c', + 'aphront-pager-view-css' => 'b7428f7c', + 'aphront-panel-view-css' => 'b7428f7c', + 'aphront-table-view-css' => 'b7428f7c', + 'aphront-tokenizer-control-css' => 'b7428f7c', + 'aphront-tooltip-css' => 'b7428f7c', + 'aphront-typeahead-control-css' => 'b7428f7c', 'differential-changeset-view-css' => 'dd27a69b', 'differential-core-view-css' => 'dd27a69b', 'differential-inline-comment-editor' => '9488bb69', @@ -4239,7 +4239,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => 'dd27a69b', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => 'bce72de6', + 'global-drag-and-drop-css' => 'b7428f7c', 'inline-comment-summary-css' => 'dd27a69b', 'javelin-aphlict' => '98f60e3f', 'javelin-behavior' => 'c1359b5d', @@ -4313,56 +4313,56 @@ celerity_register_resource_map(array( 'javelin-util' => 'c1359b5d', 'javelin-vector' => 'c1359b5d', 'javelin-workflow' => 'c1359b5d', - 'lightbox-attachment-css' => 'bce72de6', + 'lightbox-attachment-css' => 'b7428f7c', 'maniphest-task-summary-css' => '6b1fccc6', 'maniphest-transaction-detail-css' => '6b1fccc6', - 'phabricator-action-list-view-css' => 'bce72de6', - 'phabricator-application-launch-view-css' => 'bce72de6', + 'phabricator-action-list-view-css' => 'b7428f7c', + 'phabricator-application-launch-view-css' => 'b7428f7c', 'phabricator-busy' => '98f60e3f', 'phabricator-content-source-view-css' => 'dd27a69b', - 'phabricator-core-buttons-css' => 'bce72de6', - 'phabricator-core-css' => 'bce72de6', - 'phabricator-crumbs-view-css' => 'bce72de6', - 'phabricator-directory-css' => 'bce72de6', + 'phabricator-core-buttons-css' => 'b7428f7c', + 'phabricator-core-css' => 'b7428f7c', + 'phabricator-crumbs-view-css' => 'b7428f7c', + 'phabricator-directory-css' => 'b7428f7c', 'phabricator-drag-and-drop-file-upload' => '9488bb69', 'phabricator-dropdown-menu' => '98f60e3f', 'phabricator-file-upload' => '98f60e3f', - 'phabricator-filetree-view-css' => 'bce72de6', - 'phabricator-flag-css' => 'bce72de6', - 'phabricator-form-view-css' => 'bce72de6', - 'phabricator-header-view-css' => 'bce72de6', + 'phabricator-filetree-view-css' => 'b7428f7c', + 'phabricator-flag-css' => 'b7428f7c', + 'phabricator-form-view-css' => 'b7428f7c', + 'phabricator-header-view-css' => 'b7428f7c', 'phabricator-hovercard' => '98f60e3f', - 'phabricator-jump-nav' => 'bce72de6', + 'phabricator-jump-nav' => 'b7428f7c', 'phabricator-keyboard-shortcut' => '98f60e3f', 'phabricator-keyboard-shortcut-manager' => '98f60e3f', - 'phabricator-main-menu-view' => 'bce72de6', + 'phabricator-main-menu-view' => 'b7428f7c', 'phabricator-menu-item' => '98f60e3f', - 'phabricator-nav-view-css' => 'bce72de6', + 'phabricator-nav-view-css' => 'b7428f7c', 'phabricator-notification' => '98f60e3f', - 'phabricator-notification-css' => 'bce72de6', - 'phabricator-notification-menu-css' => 'bce72de6', - 'phabricator-object-item-list-view-css' => 'bce72de6', + 'phabricator-notification-css' => 'b7428f7c', + 'phabricator-notification-menu-css' => 'b7428f7c', + 'phabricator-object-item-list-view-css' => 'b7428f7c', 'phabricator-object-selector-css' => 'dd27a69b', 'phabricator-phtize' => '98f60e3f', 'phabricator-prefab' => '98f60e3f', 'phabricator-project-tag-css' => '6b1fccc6', - 'phabricator-property-list-view-css' => 'bce72de6', - 'phabricator-remarkup-css' => 'bce72de6', + 'phabricator-property-list-view-css' => 'b7428f7c', + 'phabricator-remarkup-css' => 'b7428f7c', 'phabricator-shaped-request' => '9488bb69', - 'phabricator-side-menu-view-css' => 'bce72de6', - 'phabricator-standard-page-view' => 'bce72de6', - 'phabricator-tag-view-css' => 'bce72de6', + 'phabricator-side-menu-view-css' => 'b7428f7c', + 'phabricator-standard-page-view' => 'b7428f7c', + 'phabricator-tag-view-css' => 'b7428f7c', 'phabricator-textareautils' => '98f60e3f', 'phabricator-tooltip' => '98f60e3f', - 'phabricator-transaction-view-css' => 'bce72de6', - 'phabricator-zindex-css' => 'bce72de6', - 'phui-form-css' => 'bce72de6', - 'phui-icon-view-css' => 'bce72de6', - 'spacing-css' => 'bce72de6', - 'sprite-apps-large-css' => 'bce72de6', - 'sprite-gradient-css' => 'bce72de6', - 'sprite-icons-css' => 'bce72de6', - 'sprite-menu-css' => 'bce72de6', - 'syntax-highlighting-css' => 'bce72de6', + 'phabricator-transaction-view-css' => 'b7428f7c', + 'phabricator-zindex-css' => 'b7428f7c', + 'phui-form-css' => 'b7428f7c', + 'phui-icon-view-css' => 'b7428f7c', + 'spacing-css' => 'b7428f7c', + 'sprite-apps-large-css' => 'b7428f7c', + 'sprite-gradient-css' => 'b7428f7c', + 'sprite-icons-css' => 'b7428f7c', + 'sprite-menu-css' => 'b7428f7c', + 'syntax-highlighting-css' => 'b7428f7c', ), )); diff --git a/src/applications/conpherence/controller/ConpherenceUpdateController.php b/src/applications/conpherence/controller/ConpherenceUpdateController.php index d1f3eb81aa..9e67975ce6 100644 --- a/src/applications/conpherence/controller/ConpherenceUpdateController.php +++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php @@ -181,18 +181,20 @@ final class ConpherenceUpdateController $user = $request->getUser(); $add_person = $request->getStr('add_person'); - $body = id(new AphrontFormTokenizerControl()) - ->setPlaceholder(pht('Add participants...')) - ->setName('add_person') + $form = id(new AphrontFormLayoutView()) ->setUser($user) - ->setDatasource('/typeahead/common/users/') - ->setLimit(1); + ->setFullWidth(true) + ->appendChild( + id(new AphrontFormTokenizerControl()) + ->setName('add_person') + ->setUser($user) + ->setDatasource('/typeahead/common/users/')); require_celerity_resource('conpherence-update-css'); return id(new AphrontDialogView()) - ->setTitle(pht('Update Conpherence Participants')) + ->setTitle(pht('Add Participants')) ->addHiddenInput('action', 'add_person') - ->appendChild($body); + ->appendChild($form); } private function renderRemovePersonDialogue( @@ -219,7 +221,8 @@ final class ConpherenceUpdateController require_celerity_resource('conpherence-update-css'); return id(new AphrontDialogView()) - ->setTitle(pht('Update Conpherence Participants')) + ->setTitle(pht('Remove Participants')) + ->setHeaderColor(PhabricatorActionHeaderView::HEADER_RED) ->addHiddenInput('action', 'remove_person') ->addHiddenInput('__continue__', true) ->addHiddenInput('remove_person', $remove_person) diff --git a/src/applications/conpherence/view/ConpherencePeopleWidgetView.php b/src/applications/conpherence/view/ConpherencePeopleWidgetView.php index cc5300842a..c18c30788f 100644 --- a/src/applications/conpherence/view/ConpherencePeopleWidgetView.php +++ b/src/applications/conpherence/view/ConpherencePeopleWidgetView.php @@ -29,17 +29,12 @@ final class ConpherencePeopleWidgetView extends ConpherenceWidgetView { 'action' => 'remove_person', ) ), - phutil_tag( - 'span', - array( - 'class' => 'icon' - ), - 'x')); + hsprintf('×')); } $body[] = phutil_tag( 'div', array( - 'class' => 'person-entry' + 'class' => 'person-entry grouped' ), array( phutil_tag( diff --git a/src/view/AphrontDialogView.php b/src/view/AphrontDialogView.php index 514a6c42be..26042ce3bf 100644 --- a/src/view/AphrontDialogView.php +++ b/src/view/AphrontDialogView.php @@ -180,9 +180,12 @@ final class AphrontDialogView extends AphrontView { $content = hsprintf( '%s%s%s', - phutil_tag('div', array('class' => 'aphront-dialog-head'), $header), - phutil_tag('div', array('class' => 'aphront-dialog-body'), $children), - phutil_tag('div', array('class' => 'aphront-dialog-tail'), $buttons)); + phutil_tag('div', + array('class' => 'aphront-dialog-head'), $header), + phutil_tag('div', + array('class' => 'aphront-dialog-body grouped'), $children), + phutil_tag('div', + array('class' => 'aphront-dialog-tail'), $buttons)); if ($this->renderAsForm) { return phabricator_form( diff --git a/webroot/rsrc/css/aphront/dialog-view.css b/webroot/rsrc/css/aphront/dialog-view.css index b43bc4e304..4d39748022 100644 --- a/webroot/rsrc/css/aphront/dialog-view.css +++ b/webroot/rsrc/css/aphront/dialog-view.css @@ -38,7 +38,6 @@ background: #ffffff; padding: 20px 15px; border: none; - overflow: hidden; } .aphront-dialog-tail { diff --git a/webroot/rsrc/css/application/conpherence/widget-pane.css b/webroot/rsrc/css/application/conpherence/widget-pane.css index 9a6541a241..411f82b69a 100644 --- a/webroot/rsrc/css/application/conpherence/widget-pane.css +++ b/webroot/rsrc/css/application/conpherence/widget-pane.css @@ -7,7 +7,7 @@ .loading .widgets-loading-icon { position: fixed; right: 0px; - top: 74px; + top: 76px; bottom: 0px; width: 240px; border-width: 0 0 0 1px; @@ -80,7 +80,7 @@ overflow-y: auto; bottom: 0px; width: 100%; - top: 74px; + top: 76px; } #widgets-settings { @@ -88,7 +88,7 @@ } .device-desktop .conpherence-widget-pane .widgets-body { - top: 106px; + top: 108px; width: 240px; } @@ -343,8 +343,7 @@ } .conpherence-widget-pane .person-entry { - clear: both; - padding: 10px 0px 0px 10px; + padding: 8px 0 0 8px; } .conpherence-widget-pane .person-entry a { @@ -360,7 +359,6 @@ .conpherence-widget-pane .person-entry .pic { float: left; - clear: left; margin: 0 8px 0 0; width: 35px; padding: 0; @@ -368,26 +366,21 @@ .conpherence-widget-pane .person-entry .remove { float: right; - clear: right; - margin: 0; width: 20px; - height: 20px; - text-align: center; - font-size: 22px; - font-weight: bold; - padding: 8px 0 8px 0p + font-size: 18px; + padding: 5px 0 8px 0; } .conpherence-widget-pane .person-entry .remove:hover { text-decoration: none; } -.conpherence-widget-pane .person-entry .remove .icon { +.conpherence-widget-pane .person-entry .remove .close-icon { color: #bfbfbf; } -.conpherence-widget-pane .person-entry .remove:hover .icon { - color: #18559d; +.conpherence-widget-pane .person-entry .remove:hover .close-icon { + color: #000; } /* settings widget */