Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/377456 )
Change subject: Put 'Edit description' button in its own div ...................................................................... Put 'Edit description' button in its own div Bug: T175683 Change-Id: Ie77b72b1de980b3b2f1c7fcc8030daa9a4cf4bf0 --- M includes/OOUI/BoardDescriptionWidget.php M modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/56/377456/1 diff --git a/includes/OOUI/BoardDescriptionWidget.php b/includes/OOUI/BoardDescriptionWidget.php index 3f960fc..e80ceb0 100644 --- a/includes/OOUI/BoardDescriptionWidget.php +++ b/includes/OOUI/BoardDescriptionWidget.php @@ -40,7 +40,7 @@ $this->addClasses( [ 'flow-ui-boardDescriptionWidget', 'flow-ui-boardDescriptionWidget-nojs' ] ); if ( $editLink ) { - $this->appendContent( $this->editButton ); + $this->appendContent( $this->wrapInDiv( (string)$this->editButton ) ); } $this->appendContent( $this->contentWrapper ); } @@ -52,7 +52,7 @@ * @param string $classes Classes to add to the div * @return OOUI\Tag New div with content */ - private function wrapInDiv( $content, $classes ) { + private function wrapInDiv( $content, $classes = [] ) { $tag = new \OOUI\Tag( 'div' ); $tag->addClasses( $classes ); $tag->appendContent( new \OOUI\HtmlSnippet( $content ) ); diff --git a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js index ddb83e1..10fb39d 100644 --- a/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js +++ b/modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js @@ -109,7 +109,8 @@ this.error.$element, this.captchaWidget.$element, this.anonWarning.$element, - this.button.$element, + // Ensure inline button is on its own line, and is :first-child, T175683 + $( '<div>' ).append( this.button.$element ), this.$content ), this.editor.$element, -- To view, visit https://gerrit.wikimedia.org/r/377456 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie77b72b1de980b3b2f1c7fcc8030daa9a4cf4bf0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Esanders <esand...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits