jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Remove main page special casing from alpha
......................................................................
Hygiene: Remove main page special casing from alpha
This experiment isn't going anywhere...
Instead we should wait till templates can have stylesheets
Change-Id: I5c731661ea059f61a4cb6cb5ce0409e37115f68b
---
M includes/Resources.php
M includes/formatters/MobileFormatter.php
M includes/skins/SkinMobileAlpha.php
D less/mainpage/mainpage.less
4 files changed, 1 insertion(+), 54 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 8d68ccd..556f8b5 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -80,15 +80,6 @@
)
),
- // main page
- 'mobile.mainpage.styles' => $wgMFMobileResourceBoilerplate + array(
- 'dependencies' => array( 'mobile.startup' ),
- 'styles' => array(
- 'less/mainpage/mainpage.less',
- ),
- 'group' => 'other',
- ),
-
'mobile.file.scripts' => $wgMFMobileResourceBoilerplate + array(
'dependencies' => array( 'mobile.startup' ),
'scripts' => array(
diff --git a/includes/formatters/MobileFormatter.php
b/includes/formatters/MobileFormatter.php
index d15e5e1..0dad8c6 100644
--- a/includes/formatters/MobileFormatter.php
+++ b/includes/formatters/MobileFormatter.php
@@ -68,9 +68,7 @@
if ( $context->isBetaGroupMember() ) {
$formatter->disableBackToTop();
}
- if ( !$context->isAlphaGroupMember() ) {
- $formatter->setIsMainPage( $isMainPage );
- }
+ $formatter->setIsMainPage( $isMainPage );
if ( $context->getContentTransformations() && !$isFilePage ) {
$formatter->setRemoveMedia( $context->imagesDisabled()
);
}
diff --git a/includes/skins/SkinMobileAlpha.php
b/includes/skins/SkinMobileAlpha.php
index e0343b6..a3392f8 100644
--- a/includes/skins/SkinMobileAlpha.php
+++ b/includes/skins/SkinMobileAlpha.php
@@ -21,11 +21,6 @@
public function getDefaultModules() {
$modules = parent::getDefaultModules();
$modules['alpha'] = array( 'mobile.alpha' );
- // main page special casing
- if ( $this->getTitle()->isMainPage() ) {
- $this->getOutput()->addModuleStyles(
'mobile.mainpage.styles' );
- $modules['mainpage'] = array();
- }
return $modules;
}
diff --git a/less/mainpage/mainpage.less b/less/mainpage/mainpage.less
deleted file mode 100644
index cd6f81b..0000000
--- a/less/mainpage/mainpage.less
+++ /dev/null
@@ -1,37 +0,0 @@
-#mainpage,
-#featured_article {
- line-height: 1.65;
-}
-
-#featured_article, .today {
- .noprint {
- display: none;
- }
-}
-
-body.page-Main_Page {
-
- table {
- tr,
- td {
- display: block !important;
- ul {
- li {
- display: inline;
- }
- }
- }
- .section_heading {
- button {
- display: none !important;
- }
- }
- }
-
- .MainPageBG {
- img {
- float: left;
- margin-right: 20px;
- }
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/87625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c731661ea059f61a4cb6cb5ce0409e37115f68b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
