Merge "EditPage: Remove separator between cancel and help"

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 3c109f6..a8be3aa 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3670,11 +3670,6 @@ class EditPage {
                $out->addHTML( implode( $this->getEditButtons( $tabindex ), "\n" ) . "\n" );
 
                $cancel = $this->getCancelLink();
-               if ( $cancel !== '' ) {
-                       $cancel .= Html::element( 'span',
-                               [ 'class' => 'mw-editButtons-pipe-separator' ],
-                               $this->context->msg( 'pipe-separator' )->text() );
-               }
 
                $message = $this->context->msg( 'edithelppage' )->inContentLanguage()->text();
                $edithelpurl = Skin::makeInternalOrExternalUrl( $message );

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.less b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
index e4443f6..3202e59 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
@@ -69,13 +69,4 @@
                display: inline-block;
                vertical-align: middle;
        }
-
-       // FIXME: Remove CSS magic together with DOM element in T183672
-       .mw-editButtons-pipe-separator {
-               display: inline-block;
-               padding-top: 0.625em;
-               padding-bottom: 0.546875em;
-               line-height: 1.172em;
-               vertical-align: middle;
-       }
 }