diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 157dd06d13..36ef8aeb23 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -800,7 +800,7 @@ celerity_register_resource_map(array( ), 'aphront-form-view-css' => array( - 'uri' => '/res/d82ea207/rsrc/css/aphront/form-view.css', + 'uri' => '/res/cc40cdff/rsrc/css/aphront/form-view.css', 'type' => 'css', 'requires' => array( @@ -4025,7 +4025,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - 'ed515d33' => + '58f50abd' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -4067,7 +4067,7 @@ celerity_register_resource_map(array( 34 => 'phabricator-object-item-list-view-css', 35 => 'global-drag-and-drop-css', ), - 'uri' => '/res/pkg/ed515d33/core.pkg.css', + 'uri' => '/res/pkg/58f50abd/core.pkg.css', 'type' => 'css', ), '26980a1c' => @@ -4258,16 +4258,16 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => '6b1fccc6', - 'aphront-dialog-view-css' => 'ed515d33', - 'aphront-error-view-css' => 'ed515d33', - 'aphront-form-view-css' => 'ed515d33', - 'aphront-list-filter-view-css' => 'ed515d33', - 'aphront-pager-view-css' => 'ed515d33', - 'aphront-panel-view-css' => 'ed515d33', - 'aphront-table-view-css' => 'ed515d33', - 'aphront-tokenizer-control-css' => 'ed515d33', - 'aphront-tooltip-css' => 'ed515d33', - 'aphront-typeahead-control-css' => 'ed515d33', + 'aphront-dialog-view-css' => '58f50abd', + 'aphront-error-view-css' => '58f50abd', + 'aphront-form-view-css' => '58f50abd', + 'aphront-list-filter-view-css' => '58f50abd', + 'aphront-pager-view-css' => '58f50abd', + 'aphront-panel-view-css' => '58f50abd', + 'aphront-table-view-css' => '58f50abd', + 'aphront-tokenizer-control-css' => '58f50abd', + 'aphront-tooltip-css' => '58f50abd', + 'aphront-typeahead-control-css' => '58f50abd', 'differential-changeset-view-css' => 'dd27a69b', 'differential-core-view-css' => 'dd27a69b', 'differential-inline-comment-editor' => '77e07ff4', @@ -4281,7 +4281,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' => 'ed515d33', + 'global-drag-and-drop-css' => '58f50abd', 'inline-comment-summary-css' => 'dd27a69b', 'javelin-aphlict' => '26980a1c', 'javelin-behavior' => '202a3dd0', @@ -4353,48 +4353,48 @@ celerity_register_resource_map(array( 'javelin-util' => '202a3dd0', 'javelin-vector' => '202a3dd0', 'javelin-workflow' => '202a3dd0', - 'lightbox-attachment-css' => 'ed515d33', + 'lightbox-attachment-css' => '58f50abd', 'maniphest-task-summary-css' => '6b1fccc6', 'maniphest-transaction-detail-css' => '6b1fccc6', 'phabricator-busy' => '26980a1c', 'phabricator-content-source-view-css' => 'dd27a69b', - 'phabricator-core-buttons-css' => 'ed515d33', - 'phabricator-core-css' => 'ed515d33', - 'phabricator-crumbs-view-css' => 'ed515d33', - 'phabricator-directory-css' => 'ed515d33', + 'phabricator-core-buttons-css' => '58f50abd', + 'phabricator-core-css' => '58f50abd', + 'phabricator-crumbs-view-css' => '58f50abd', + 'phabricator-directory-css' => '58f50abd', 'phabricator-drag-and-drop-file-upload' => '77e07ff4', 'phabricator-dropdown-menu' => '26980a1c', 'phabricator-file-upload' => '26980a1c', - 'phabricator-filetree-view-css' => 'ed515d33', - 'phabricator-flag-css' => 'ed515d33', - 'phabricator-form-view-css' => 'ed515d33', - 'phabricator-header-view-css' => 'ed515d33', - 'phabricator-jump-nav' => 'ed515d33', + 'phabricator-filetree-view-css' => '58f50abd', + 'phabricator-flag-css' => '58f50abd', + 'phabricator-form-view-css' => '58f50abd', + 'phabricator-header-view-css' => '58f50abd', + 'phabricator-jump-nav' => '58f50abd', 'phabricator-keyboard-shortcut' => '26980a1c', 'phabricator-keyboard-shortcut-manager' => '26980a1c', - 'phabricator-main-menu-view' => 'ed515d33', + 'phabricator-main-menu-view' => '58f50abd', 'phabricator-menu-item' => '26980a1c', - 'phabricator-nav-view-css' => 'ed515d33', + 'phabricator-nav-view-css' => '58f50abd', 'phabricator-notification' => '26980a1c', - 'phabricator-notification-css' => 'ed515d33', - 'phabricator-notification-menu-css' => 'ed515d33', - 'phabricator-object-item-list-view-css' => 'ed515d33', + 'phabricator-notification-css' => '58f50abd', + 'phabricator-notification-menu-css' => '58f50abd', + 'phabricator-object-item-list-view-css' => '58f50abd', 'phabricator-object-selector-css' => 'dd27a69b', 'phabricator-phtize' => '26980a1c', 'phabricator-prefab' => '26980a1c', 'phabricator-project-tag-css' => '6b1fccc6', - 'phabricator-remarkup-css' => 'ed515d33', + 'phabricator-remarkup-css' => '58f50abd', 'phabricator-shaped-request' => '77e07ff4', - 'phabricator-side-menu-view-css' => 'ed515d33', - 'phabricator-standard-page-view' => 'ed515d33', + 'phabricator-side-menu-view-css' => '58f50abd', + 'phabricator-standard-page-view' => '58f50abd', 'phabricator-textareautils' => '26980a1c', 'phabricator-tooltip' => '26980a1c', - 'phabricator-transaction-view-css' => 'ed515d33', - 'phabricator-zindex-css' => 'ed515d33', - 'sprite-apps-large-css' => 'ed515d33', - 'sprite-gradient-css' => 'ed515d33', - 'sprite-icons-css' => 'ed515d33', - 'sprite-menu-css' => 'ed515d33', - 'syntax-highlighting-css' => 'ed515d33', + 'phabricator-transaction-view-css' => '58f50abd', + 'phabricator-zindex-css' => '58f50abd', + 'sprite-apps-large-css' => '58f50abd', + 'sprite-gradient-css' => '58f50abd', + 'sprite-icons-css' => '58f50abd', + 'sprite-menu-css' => '58f50abd', + 'syntax-highlighting-css' => '58f50abd', ), )); diff --git a/src/applications/conpherence/controller/ConpherenceNewController.php b/src/applications/conpherence/controller/ConpherenceNewController.php index add2b7b18f..83b3c8af7f 100644 --- a/src/applications/conpherence/controller/ConpherenceNewController.php +++ b/src/applications/conpherence/controller/ConpherenceNewController.php @@ -126,6 +126,7 @@ final class ConpherenceNewController extends ConpherenceController { $form = id(new AphrontFormLayoutView()) ->setUser($user) + ->setFullWidth(true) ->appendChild( id(new AphrontFormTokenizerControl()) ->setName('participants') diff --git a/src/view/form/AphrontFormLayoutView.php b/src/view/form/AphrontFormLayoutView.php index 83561491bb..5cc4d1b0a1 100644 --- a/src/view/form/AphrontFormLayoutView.php +++ b/src/view/form/AphrontFormLayoutView.php @@ -9,6 +9,7 @@ final class AphrontFormLayoutView extends AphrontView { private $backgroundShading; private $padded; + private $fullWidth; public function setBackgroundShading($shading) { $this->backgroundShading = $shading; @@ -20,6 +21,11 @@ final class AphrontFormLayoutView extends AphrontView { return $this; } + public function setFullWidth($width) { + $this->fullWidth = $width; + return $this; + } + public function render() { $classes = array('aphront-form-view'); @@ -31,6 +37,10 @@ final class AphrontFormLayoutView extends AphrontView { $classes[] = 'aphront-form-view-padded'; } + if ($this->fullWidth) { + $classes[] = 'aphront-form-full-width'; + } + $classes = implode(' ', $classes); return phutil_tag( diff --git a/webroot/rsrc/css/aphront/form-view.css b/webroot/rsrc/css/aphront/form-view.css index ac92201115..b1f537ce6c 100644 --- a/webroot/rsrc/css/aphront/form-view.css +++ b/webroot/rsrc/css/aphront/form-view.css @@ -25,7 +25,8 @@ text-shadow: 0 1px rgba(255,255,255,1); } -.device-phone .aphront-form-view label.aphront-form-label { +.device-phone .aphront-form-view label.aphront-form-label, +.aphront-form-full-width.aphront-form-view label.aphront-form-label { display: block; float: none; text-align: left; @@ -39,7 +40,8 @@ width: 60%; } -.device-phone .aphront-form-input { +.device-phone .aphront-form-input, +.aphront-form-full-width .aphront-form-input { margin-left: 0%; margin-right: 0%; width: 100%; @@ -53,7 +55,12 @@ padding-top: 4px; } -.device-phone .aphront-form-error { +.aphront-dialog-body .aphront-form-full-width { + margin-top: -10px; +} + +.device-phone .aphront-form-error, +.aphront-form-full-width .aphront-form-error { float: none; width: 100%; } @@ -110,7 +117,8 @@ margin-left: 20%; } -.device-phone .aphront-form-view .aphront-form-caption { +.device-phone .aphront-form-view .aphront-form-caption, +.aphront-form-full-width .aphront-form-view .aphront-form-caption { margin-right: 0%; } @@ -125,7 +133,8 @@ padding: 10px 4px; } -.device .aphront-form-instructions { +.device .aphront-form-instructions, +.aphront-form-full-width .aphront-form-instructions { width: 100%; margin: 0; }