[MediaWiki-commits] [Gerrit] Push max-width work from beta to stable - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Push max-width work from beta to stable
..
Push max-width work from beta to stable
And eliminated empty modules
Bug: T101344
Change-Id: If6ac8bcad40cbf409fe777da6c75db09c7e29775
---
M includes/Resources.php
M includes/skins/SkinMinervaBeta.php
M resources/mobile.contentOverlays/tutorials.less
M resources/mobile.overlays/Overlay.less
M resources/skins.minerva.base.styles/ui.less
D resources/skins.minerva.beta.styles/main.less
M resources/skins.minerva.content.styles/main.less
D resources/skins.minerva.tablet.beta.styles/common.less
D resources/skins.minerva.tablet.beta.styles/hacks.less
D resources/skins.minerva.tablet.beta.styles/ui.less
M resources/skins.minerva.tablet.styles/common.less
M resources/skins.minerva.tablet.styles/hacks.less
12 files changed, 75 insertions(+), 123 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 5c59211..b2ee74b 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -85,14 +85,6 @@
'resources/skins.minerva.tablet.styles/hacks.less',
),
),
- 'skins.minerva.tablet.beta.styles' =>
$wgMFResourceFileModuleBoilerplate + array(
- 'position' => 'top',
- 'styles' => array(
- 'resources/skins.minerva.tablet.beta.styles/ui.less',
-
'resources/skins.minerva.tablet.beta.styles/common.less',
- 'resources/skins.minerva.tablet.beta.styles/hacks.less',
- ),
- ),
'skins.minerva.icons.images' => $wgMFResourceFileModuleBoilerplate +
array(
'class' => 'ResourceLoaderImageModule',
'prefix' => 'mw-ui',
@@ -195,7 +187,6 @@
'position' => 'top',
'styles' => array(
'resources/skins.minerva.beta.styles/pageactions.less',
- 'resources/skins.minerva.beta.styles/main.less',
),
),
'skins.minerva.beta.images' => $wgMFResourceFileModuleBoilerplate +
array(
diff --git a/includes/skins/SkinMinervaBeta.php
b/includes/skins/SkinMinervaBeta.php
index dc5f65e..befdbb9 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -127,7 +127,6 @@
protected function getSkinStyles() {
$styles = parent::getSkinStyles();
$styles[] = 'skins.minerva.beta.styles';
- $styles[] = 'skins.minerva.tablet.beta.styles';
$styles[] = 'skins.minerva.beta.images';
if ( $this->getTitle()->isMainPage() ) {
$styles[] = 'skins.minerva.mainPage.beta.styles';
diff --git a/resources/mobile.contentOverlays/tutorials.less
b/resources/mobile.contentOverlays/tutorials.less
index 82d8335..7aa1452 100644
--- a/resources/mobile.contentOverlays/tutorials.less
+++ b/resources/mobile.contentOverlays/tutorials.less
@@ -1,6 +1,16 @@
@import "minerva.variables";
@import "minerva.mixins";
+
+@media all and (min-width: @wgMFDeviceWidthTablet) {
+ // 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
+ #mw-mf-page-center .pointer-overlay {
+ max-width: @wgMFDeviceWidthDesktop;
+ }
+}
+
.navigation-drawer {
.pointer-overlay {
right: auto;
diff --git a/resources/mobile.overlays/Overlay.less
b/resources/mobile.overlays/Overlay.less
index c514afb..ad105d3 100644
--- a/resources/mobile.overlays/Overlay.less
+++ b/resources/mobile.overlays/Overlay.less
@@ -374,18 +374,15 @@
}
}
- .alpha,
- .beta {
- .overlay-header {
- .cancel {
- // so that the icon image is aligned with the
content
- left: -@iconGutterWidth;
- }
- // Search input in the header
- input.search {
- // because we're pulling .main-menu-button to
the left too (see above)
- margin-left: -@iconGutterWidth;
- }
+ .overlay-header {
+ .cancel {
+ // so that the icon image is aligned with the content
+ left: -@iconGutterWidth;
+ }
+ // Search input in the header
+ input.search {
+ // because we're pulling .main-menu-button to the left
too (see above)
+ margin-left: -@iconGutterWidth;
}
}
}
diff --git
[MediaWiki-commits] [Gerrit] Push max-width work from beta to stable - change (mediawiki...MobileFrontend)
Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/236226
Change subject: Push max-width work from beta to stable
..
Push max-width work from beta to stable
And eliminated empty modules
Bug: T101344
Change-Id: If6ac8bcad40cbf409fe777da6c75db09c7e29775
---
M includes/Resources.php
M includes/skins/SkinMinervaBeta.php
M resources/mobile.contentOverlays/tutorials.less
M resources/mobile.overlays/Overlay.less
D resources/skins.minerva.beta.styles/main.less
M resources/skins.minerva.content.styles/main.less
D resources/skins.minerva.tablet.beta.styles/common.less
D resources/skins.minerva.tablet.beta.styles/hacks.less
D resources/skins.minerva.tablet.beta.styles/ui.less
M resources/skins.minerva.tablet.styles/common.less
M resources/skins.minerva.tablet.styles/hacks.less
11 files changed, 75 insertions(+), 117 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/26/236226/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 3c0b83f..366b386 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -85,14 +85,6 @@
'resources/skins.minerva.tablet.styles/hacks.less',
),
),
- 'skins.minerva.tablet.beta.styles' =>
$wgMFResourceFileModuleBoilerplate + array(
- 'position' => 'top',
- 'styles' => array(
- 'resources/skins.minerva.tablet.beta.styles/ui.less',
-
'resources/skins.minerva.tablet.beta.styles/common.less',
- 'resources/skins.minerva.tablet.beta.styles/hacks.less',
- ),
- ),
'skins.minerva.icons.images' => $wgMFResourceFileModuleBoilerplate +
array(
'class' => 'ResourceLoaderImageModule',
'prefix' => 'mw-ui',
@@ -197,7 +189,6 @@
'resources/skins.minerva.beta.styles/common.less',
'resources/skins.minerva.beta.styles/pageactions.less',
'resources/skins.minerva.beta.styles/footer.less',
- 'resources/skins.minerva.beta.styles/main.less',
),
),
'skins.minerva.beta.images' => $wgMFResourceFileModuleBoilerplate +
array(
diff --git a/includes/skins/SkinMinervaBeta.php
b/includes/skins/SkinMinervaBeta.php
index c75982f..c0d6701 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -126,7 +126,6 @@
protected function getSkinStyles() {
$styles = parent::getSkinStyles();
$styles[] = 'skins.minerva.beta.styles';
- $styles[] = 'skins.minerva.tablet.beta.styles';
$styles[] = 'skins.minerva.beta.images';
if ( $this->getTitle()->isMainPage() ) {
$styles[] = 'skins.minerva.mainPage.beta.styles';
diff --git a/resources/mobile.contentOverlays/tutorials.less
b/resources/mobile.contentOverlays/tutorials.less
index 82d8335..7aa1452 100644
--- a/resources/mobile.contentOverlays/tutorials.less
+++ b/resources/mobile.contentOverlays/tutorials.less
@@ -1,6 +1,16 @@
@import "minerva.variables";
@import "minerva.mixins";
+
+@media all and (min-width: @wgMFDeviceWidthTablet) {
+ // 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
+ #mw-mf-page-center .pointer-overlay {
+ max-width: @wgMFDeviceWidthDesktop;
+ }
+}
+
.navigation-drawer {
.pointer-overlay {
right: auto;
diff --git a/resources/mobile.overlays/Overlay.less
b/resources/mobile.overlays/Overlay.less
index c514afb..ad105d3 100644
--- a/resources/mobile.overlays/Overlay.less
+++ b/resources/mobile.overlays/Overlay.less
@@ -374,18 +374,15 @@
}
}
- .alpha,
- .beta {
- .overlay-header {
- .cancel {
- // so that the icon image is aligned with the
content
- left: -@iconGutterWidth;
- }
- // Search input in the header
- input.search {
- // because we're pulling .main-menu-button to
the left too (see above)
- margin-left: -@iconGutterWidth;
- }
+ .overlay-header {
+ .cancel {
+ // so that the icon image is aligned with the content
+ left: -@iconGutterWidth;
+ }
+ // Search input in the header
+ input.search {
+ // because we're pulling .main-menu-button to the left
too (see above)
+
