jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Obtain device width from value in core
......................................................................
Hygiene: Obtain device width from value in core
Depends-On: Iefce83763da0cbd037a7ff889088b0da820220a0
Depends-On: I89c42af2e1f4dd176e32d09b6a3c94cc636b2054
Bug: T124992
Change-Id: I257b3b3453651a3f86f63cbe655d34cf12114b26
---
M extension.json
M includes/MobileFrontend.hooks.php
M includes/skins/SkinMinerva.php
M resources/mobile.browser/browser.js
M resources/mobile.contentOverlays/tutorials.less
M resources/mobile.gallery/gallery.less
M resources/mobile.issues/issues.less
M resources/mobile.mainMenu/mainmenu.less
M resources/mobile.notifications.overlay/NotificationsOverlay.less
M resources/mobile.overlays/Overlay.less
M resources/mobile.pagelist.styles/pagelist.less
M resources/mobile.pagesummary.styles/pagesummary.less
M resources/mobile.special.uploads.styles/uploads.less
M resources/skins.minerva.content.styles/hacks.less
M resources/skins.minerva.special.userlogin.styles/userlogin.less
M resources/skins.minerva.special.watchlist.styles/specialWatchlist.less
M resources/skins.minerva.tablet.styles/common.less
M resources/skins.minerva.tablet.styles/hacks.less
M resources/skins.minerva.talk/talk.less
19 files changed, 20 insertions(+), 21 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 7315c12..57c25f1 100644
--- a/extension.json
+++ b/extension.json
@@ -2002,7 +2002,6 @@
"MFAutodetectMobileView": false,
"MFShowMobileViewToTablets": true,
"MFDeviceWidthMobileSmall": 280,
- "MFDeviceWidthTablet": 720,
"MobileUrlTemplate": "",
"MobileFrontendFormatCookieExpiry": null,
"MFNoindexPages": true,
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 812fd21..9d58acd 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -697,7 +697,7 @@
$mfAppScheme = $config->get( 'MFAppScheme' );
$mfNoIndexPages = $config->get( 'MFNoindexPages' );
$mfMobileUrlTemplate = $context->getMobileUrlTemplate();
- $tabletSize = $config->get( 'MFDeviceWidthTablet' );
+ $lessVars = $config->get( 'ResourceLoaderLESSVars' );
$noJsEditing = $config->get( 'MFAllowNonJavaScriptEditing' );
// show banners using WikidataPageBanner, if installed and all
pre-conditions fulfilled
@@ -755,7 +755,7 @@
$desktopUrl = $title->getFullUrl();
$link = array(
'rel' => 'alternate',
- 'media' => 'only screen and (max-width:
' . $tabletSize . 'px)',
+ 'media' => 'only screen and (max-width:
' . $lessVars['deviceWidthTablet'] . ')',
'href' => $context->getMobileUrl(
$desktopUrl ),
);
} else {
@@ -1069,7 +1069,6 @@
$config = MobileContext::singleton()->getMFConfig();
$lessVars = array_merge( $lessVars,
array(
- 'wgMFDeviceWidthTablet' => "{$config->get(
'MFDeviceWidthTablet' )}px",
'wgMFDeviceWidthMobileSmall' => "{$config->get(
'MFDeviceWidthMobileSmall' )}px",
'wgMFThumbnailTiny' =>
MobilePage::TINY_IMAGE_WIDTH . 'px',
'wgMFThumbnailSmall' =>
MobilePage::SMALL_IMAGE_WIDTH . 'px'
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index a6b6c03..5ecf3ca 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -888,6 +888,7 @@
$user = $this->getUser();
$config = $this->getMFConfig();
$out = $this->getOutput();
+ $lessVars = $config->get( 'ResourceLoaderLESSVars' );
$vars = array(
'wgMFSchemaMobileWebLanguageSwitcherSampleRate' =>
@@ -900,7 +901,7 @@
'wgMFPhotoUploadEndpoint' =>
$config->get( 'MFPhotoUploadEndpoint' ) ?
$config->get( 'MFPhotoUploadEndpoint' ) : '',
'wgPreferredVariant' =>
$title->getPageLanguage()->getPreferredVariant(),
- 'wgMFDeviceWidthTablet' => $config->get(
'MFDeviceWidthTablet' ),
+ 'wgMFDeviceWidthTablet' =>
$lessVars['deviceWidthTablet'],
'wgMFMode' => $this->getMode(),
'wgMFCollapseSectionsByDefault' => $config->get(
'MFCollapseSectionsByDefault' ),
'wgMFTocEnabled' => $this->getOutput()->getProperty(
'MinervaTOC' )
diff --git a/resources/mobile.browser/browser.js
b/resources/mobile.browser/browser.js
index 974a7c1..6fc936b 100644
--- a/resources/mobile.browser/browser.js
+++ b/resources/mobile.browser/browser.js
@@ -109,7 +109,7 @@
* @return {Boolean}
*/
isWideScreen: function () {
- var val = mw.config.get( 'wgMFDeviceWidthTablet' );
+ var val = parseInt( mw.config.get( 'DeviceWidthTablet'
), 10 );
// Check portrait and landscape mode to be consistent
return window.innerWidth >= val || window.innerHeight
>= val;
},
diff --git a/resources/mobile.contentOverlays/tutorials.less
b/resources/mobile.contentOverlays/tutorials.less
index a819634..f759f89 100644
--- a/resources/mobile.contentOverlays/tutorials.less
+++ b/resources/mobile.contentOverlays/tutorials.less
@@ -2,7 +2,7 @@
@import "minerva.mixins";
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
// Take into account padding in width of pointer overlay so that it
// can point to anything in the containing content area and avoid
// padding issues such as https://phabricator.wikimedia.org/F287611
diff --git a/resources/mobile.gallery/gallery.less
b/resources/mobile.gallery/gallery.less
index d4ab1b5..7d5b7a8 100644
--- a/resources/mobile.gallery/gallery.less
+++ b/resources/mobile.gallery/gallery.less
@@ -16,7 +16,7 @@
}
}
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
.image-list {
margin: auto;
}
diff --git a/resources/mobile.issues/issues.less
b/resources/mobile.issues/issues.less
index 1b416f4..795e0a9 100644
--- a/resources/mobile.issues/issues.less
+++ b/resources/mobile.issues/issues.less
@@ -33,7 +33,7 @@
}
}
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
.overlay {
.cleanup {
li {
diff --git a/resources/mobile.mainMenu/mainmenu.less
b/resources/mobile.mainMenu/mainmenu.less
index 02985a8..72b74c5 100644
--- a/resources/mobile.mainMenu/mainmenu.less
+++ b/resources/mobile.mainMenu/mainmenu.less
@@ -190,7 +190,7 @@
}
}
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
@rightDrawerLeftOffset: 100% - @rightDrawerWidth;
.secondary-navigation-enabled {
#mw-mf-page-center {
diff --git a/resources/mobile.notifications.overlay/NotificationsOverlay.less
b/resources/mobile.notifications.overlay/NotificationsOverlay.less
index 86e7822..14dbe8c 100644
--- a/resources/mobile.notifications.overlay/NotificationsOverlay.less
+++ b/resources/mobile.notifications.overlay/NotificationsOverlay.less
@@ -86,7 +86,7 @@
}
}
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
.notifications-overlay {
.mw-echo-notification {
padding: 1.75em @contentPaddingTablet;
diff --git a/resources/mobile.overlays/Overlay.less
b/resources/mobile.overlays/Overlay.less
index 23f82e4..a1ff34a 100644
--- a/resources/mobile.overlays/Overlay.less
+++ b/resources/mobile.overlays/Overlay.less
@@ -372,7 +372,7 @@
}
}
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
.overlay {
.panel {
padding: 12px @contentPaddingTablet;
diff --git a/resources/mobile.pagelist.styles/pagelist.less
b/resources/mobile.pagelist.styles/pagelist.less
index df92725..e19507a 100644
--- a/resources/mobile.pagelist.styles/pagelist.less
+++ b/resources/mobile.pagelist.styles/pagelist.less
@@ -149,7 +149,7 @@
}
// FIXME: combine with a similar pattern in modules/NotificationsOverlay.less
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
// FIXME: this should be one generic class name
.page-summary-list,
.topic-title-list,
diff --git a/resources/mobile.pagesummary.styles/pagesummary.less
b/resources/mobile.pagesummary.styles/pagesummary.less
index e04507e..7676cfe 100644
--- a/resources/mobile.pagesummary.styles/pagesummary.less
+++ b/resources/mobile.pagesummary.styles/pagesummary.less
@@ -60,7 +60,7 @@
}
}
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
.list-header {
padding: .5em @contentPaddingTablet .4em @contentMargin;
}
diff --git a/resources/mobile.special.uploads.styles/uploads.less
b/resources/mobile.special.uploads.styles/uploads.less
index 15e3fc5..62b6f59 100644
--- a/resources/mobile.special.uploads.styles/uploads.less
+++ b/resources/mobile.special.uploads.styles/uploads.less
@@ -11,7 +11,7 @@
}
}
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
.ctaUploadPhoto {
border-bottom: none;
background: none;
diff --git a/resources/skins.minerva.content.styles/hacks.less
b/resources/skins.minerva.content.styles/hacks.less
index 8b59640..5972782 100644
--- a/resources/skins.minerva.content.styles/hacks.less
+++ b/resources/skins.minerva.content.styles/hacks.less
@@ -110,7 +110,7 @@
}
// Hacks to render galleries and multicol tables better on mobile
-@media all and (max-width: @wgMFDeviceWidthTablet) {
+@media all and (max-width: @deviceWidthTablet) {
// Center images that might be less than the screen width.
// Image will appear centered and caption will take up full screen.
diff --git a/resources/skins.minerva.special.userlogin.styles/userlogin.less
b/resources/skins.minerva.special.userlogin.styles/userlogin.less
index 92d26a8..24638ae 100644
--- a/resources/skins.minerva.special.userlogin.styles/userlogin.less
+++ b/resources/skins.minerva.special.userlogin.styles/userlogin.less
@@ -133,7 +133,7 @@
}
// FIXME: Some of these rules should actually be mobile first, only hiding
inputs needs to be wrapped in a media query
-@media all and (max-width: @wgMFDeviceWidthTablet) {
+@media all and (max-width: @deviceWidthTablet) {
@margin: 12px;
#userloginForm {
diff --git
a/resources/skins.minerva.special.watchlist.styles/specialWatchlist.less
b/resources/skins.minerva.special.watchlist.styles/specialWatchlist.less
index e92b504..b7fa6b4 100644
--- a/resources/skins.minerva.special.watchlist.styles/specialWatchlist.less
+++ b/resources/skins.minerva.special.watchlist.styles/specialWatchlist.less
@@ -7,7 +7,7 @@
}
}
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
#bodyContent {
.content-header {
border-bottom: none;
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index 0c11a2d..2bb3f6b 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -6,7 +6,7 @@
@import "minerva.mixins";
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
.content_block {
width: auto;
clear: none;
diff --git a/resources/skins.minerva.tablet.styles/hacks.less
b/resources/skins.minerva.tablet.styles/hacks.less
index 139acae..b335383 100644
--- a/resources/skins.minerva.tablet.styles/hacks.less
+++ b/resources/skins.minerva.tablet.styles/hacks.less
@@ -13,7 +13,7 @@
/* Tablet specific styling */
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
// Float infoboxes to the right of the page
table.infobox {
margin: .5em 0 1em 35px !important;
diff --git a/resources/skins.minerva.talk/talk.less
b/resources/skins.minerva.talk/talk.less
index 741ae2e..7952dc8 100644
--- a/resources/skins.minerva.talk/talk.less
+++ b/resources/skins.minerva.talk/talk.less
@@ -40,7 +40,7 @@
}
}
-@media all and (min-width: @wgMFDeviceWidthTablet) {
+@media all and (min-width: @deviceWidthTablet) {
.content.talk-section {
margin: 0 auto 0 0;
}
--
To view, visit https://gerrit.wikimedia.org/r/260518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I257b3b3453651a3f86f63cbe655d34cf12114b26
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
