jenkins-bot has submitted this change and it was merged.
Change subject: Split content styles into separate modules
......................................................................
Split content styles into separate modules
In the process fix styling of thumbnails (.thumbcaption was not
left-aligned in beta although a text-align: left rule was present).
Change-Id: Ife4b510c1663d6da5691bcc3714908810615aa40
---
M includes/Resources.php
M includes/skins/SkinMinervaBeta.php
R less/content/hacks.less
R less/content/main.less
R less/content/mainNew.less
5 files changed, 22 insertions(+), 15 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index a6bbd4d..b934fd0 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -131,17 +131,32 @@
'less/common/ui.less',
'less/common/pageactions.less',
'less/common/footer.less',
+ 'less/common/common.less',
+ 'less/common/icons.less',
+ 'less/modules/toggle.less',
),
'position' => 'top',
),
'skins.minerva.content.styles' => $wgMFMobileResourceBoilerplate +
array(
'styles' => array(
- 'less/common/common.less',
- 'less/common/icons.less',
- 'less/common/typography.less',
- 'less/modules/toggle.less',
- 'less/common/hacks.less',
+ 'less/content/main.less',
+ 'less/content/hacks.less',
+ ),
+ 'position' => 'top',
+ ),
+
+ 'skins.minerva.chrome.styles.beta' => $wgMFMobileResourceBoilerplate +
array(
+ 'styles' => array(
+ 'less/common/uiNew.less',
+ 'less/common/secondaryPageActions.less',
+ ),
+ 'position' => 'top',
+ ),
+
+ 'skins.minerva.content.styles.beta' => $wgMFMobileResourceBoilerplate +
array(
+ 'styles' => array(
+ 'less/content/mainNew.less',
),
'position' => 'top',
),
@@ -149,15 +164,6 @@
'skins.minerva.drawers.styles' => $wgMFMobileResourceBoilerplate +
array(
'styles' => array(
'less/common/drawer.less',
- ),
- 'position' => 'top',
- ),
-
- 'mobile.styles.beta' => $wgMFMobileResourceBoilerplate + array(
- 'styles' => array(
- 'less/common/uiNew.less',
- 'less/common/typographyNew.less',
- 'less/common/secondaryPageActions.less',
),
'position' => 'top',
),
diff --git a/includes/skins/SkinMinervaBeta.php
b/includes/skins/SkinMinervaBeta.php
index 0ed6b72..e8ae4c5 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -55,7 +55,8 @@
$title = $this->getTitle();
$styles = parent::getSkinStyles();
- $styles[] = 'mobile.styles.beta';
+ $styles[] = 'skins.minerva.chrome.styles.beta';
+ $styles[] = 'skins.minerva.content.styles.beta';
if ( $title->isMainPage() ) {
$styles[] = 'mobile.styles.mainpage';
}
diff --git a/less/common/hacks.less b/less/content/hacks.less
similarity index 100%
rename from less/common/hacks.less
rename to less/content/hacks.less
diff --git a/less/common/typography.less b/less/content/main.less
similarity index 100%
rename from less/common/typography.less
rename to less/content/main.less
diff --git a/less/common/typographyNew.less b/less/content/mainNew.less
similarity index 100%
rename from less/common/typographyNew.less
rename to less/content/mainNew.less
--
To view, visit https://gerrit.wikimedia.org/r/134474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife4b510c1663d6da5691bcc3714908810615aa40
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera <jgon...@wikimedia.org>
Gerrit-Reviewer: Awjrichards <aricha...@wikimedia.org>
Gerrit-Reviewer: JGonera <jgon...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Kaldari <rkald...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
