From 7df2db6ee9fbb542a6312a686905f6db9d10b763 Mon Sep 17 00:00:00 2001 From: Isarra Date: Thu, 2 Aug 2018 22:05:44 +0000 Subject: [PATCH] Make afterContent stuff appear correctly after content in all view modes Mostly affects extensions that add stuff after the content with them hook dealies, such as flaggedrevisions etc. bug: T200729 Change-Id: I5c46af8f4cab20b04930a0e25d380ec040557bb6 --- includes/TimelessTemplate.php | 4 ++-- resources/screen-desktop-mid.less | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/includes/TimelessTemplate.php b/includes/TimelessTemplate.php index f6d9429..b961b3c 100644 --- a/includes/TimelessTemplate.php +++ b/includes/TimelessTemplate.php @@ -75,9 +75,9 @@ class TimelessTemplate extends BaseTemplate { $this->getClear() ) ) - ) + ) . + $this->getAfterContent() ) . - $this->getAfterContent() . Html::rawElement( 'div', [ 'id' => 'mw-site-navigation' ], $this->getLogo( 'p-logo', 'image' ) . $this->getMainNavigation() . diff --git a/resources/screen-desktop-mid.less b/resources/screen-desktop-mid.less index e1c0ade..7b0082a 100644 --- a/resources/screen-desktop-mid.less +++ b/resources/screen-desktop-mid.less @@ -21,7 +21,8 @@ margin-left: -@column-left-size; width: 100%; } -#mw-content { +#mw-content, +#content-bottom-stuff { margin-left: @column-left-size; }