Jdlrobson has submitted this change and it was merged.
Change subject: Bug 46441: Move legacy css for menu into mobilemenu.css
......................................................................
Bug 46441: Move legacy css for menu into mobilemenu.css
I was reviewing Ic6fd7585d25a051895e1eea26acb2f4934c97120 to suggest
this change but it got merged before I could do so
the jsEnabled method is flawed. It also applies to phones with js enabled
Older phones can not access the menu without going via Special:MobileMenu
page - so putting the fallback css here makes much more sense.
In process fix..
Bug 46441
Change-Id: I4365f914f95a8b4d1f2d9ab2e37614e835cc2fc5
---
M MobileFrontend.php
M less/common/mainmenu.less
M less/specials/mobilemenu.less
M stylesheets/common/ui.css
R stylesheets/specials/images/menu/lowres/home.png
R stylesheets/specials/images/menu/lowres/loginout.png
R stylesheets/specials/images/menu/lowres/main.png
R stylesheets/specials/images/menu/lowres/random.png
R stylesheets/specials/images/menu/lowres/settings.png
M stylesheets/specials/mobilemenu.css
10 files changed, 63 insertions(+), 55 deletions(-)
Approvals:
Jdlrobson: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/MobileFrontend.php b/MobileFrontend.php
index 98014e5..f92a844 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -476,13 +476,20 @@
'dependencies' => array( 'mobile.stable' ),
);
/**
+ * A boilerplate for RL style modules for special pages
+*/
+$wgMFMobileSpecialPageResourceStyleBoilerplate =
$wgMFMobileSpecialPageResourceBoilerplate + array(
+ // ensure special css is always loaded after mobile.styles for
cascading purposes (keep jgonera happy)
+ 'dependencies' => array( 'mobile.styles' ),
+);
+/**
* Special page modules
*
* Note: Use correct names to ensure modules load on pages
* Name must be the name of the special page lowercased prefixed by
'mobile.'
* suffixed by '.styles' or '.scripts'
*/
-$wgResourceModules['mobile.mobilemenu.styles'] =
$wgMFMobileSpecialPageResourceBoilerplate + array(
+$wgResourceModules['mobile.mobilemenu.styles'] =
$wgMFMobileSpecialPageResourceStyleBoilerplate + array(
'styles' => array(
'stylesheets/specials/mobilemenu.css',
),
diff --git a/less/common/mainmenu.less b/less/common/mainmenu.less
index 19d05ed..3b7a918 100644
--- a/less/common/mainmenu.less
+++ b/less/common/mainmenu.less
@@ -50,53 +50,33 @@
}
}
- // low-res icons for old phones that don't support
background-size
&.icon-home a {
- background-image: url(images/menu/lowres/home.png);
+ background-image: /* @embed */url(images/menu/home.png);
}
&.icon-random a {
- background-image: url(images/menu/lowres/random.png);
+ background-image: /* @embed
*/url(images/menu/random.png);
+ }
+
+ &.icon-watchlist a {
+ background-image: /* @embed
*/url(images/menu/watchlist.png);
+ }
+
+ &.icon-uploads a {
+ background-image: /* @embed
*/url(images/menu/uploads.png);
+ }
+
+ &.icon-nearby a {
+ background-image: /* @embed
*/url(images/menu/nearby.png);
}
&.icon-settings a {
- background-image: url(images/menu/lowres/settings.png);
+ background-image: /* @embed
*/url(images/menu/settings.png);
}
&.icon-loginout a {
- background-image: /* @embed
*/url(images/menu/lowres/loginout.png);
+ background-image: /* @embed
*/url(images/menu/loginout.png);
}
- }
-}
-
-// hi-res menu icons
-.jsEnabled #mw-mf-menu-main li {
- &.icon-home a {
- background-image: /* @embed */url(images/menu/home.png);
- }
-
- &.icon-random a {
- background-image: /* @embed */url(images/menu/random.png);
- }
-
- &.icon-watchlist a {
- background-image: /* @embed */url(images/menu/watchlist.png);
- }
-
- &.icon-uploads a {
- background-image: /* @embed */url(images/menu/uploads.png);
- }
-
- &.icon-nearby a {
- background-image: /* @embed */url(images/menu/nearby.png);
- }
-
- &.icon-settings a {
- background-image: /* @embed */url(images/menu/settings.png);
- }
-
- &.icon-loginout a {
- background-image: /* @embed */url(images/menu/loginout.png);
}
}
diff --git a/less/specials/mobilemenu.less b/less/specials/mobilemenu.less
index 9abf47f..6ae8ba8 100644
--- a/less/specials/mobilemenu.less
+++ b/less/specials/mobilemenu.less
@@ -10,3 +10,24 @@
display: none;
}
}
+
+#mw-mf-menu-main {
+ li {
+ // low-res icons for old phones that don't support
background-size
+ &.icon-home a {
+ background-image: url(images/menu/lowres/home.png);
+ }
+
+ &.icon-random a {
+ background-image: url(images/menu/lowres/random.png);
+ }
+
+ &.icon-settings a {
+ background-image: url(images/menu/lowres/settings.png);
+ }
+
+ &.icon-loginout a {
+ background-image: url(images/menu/lowres/loginout.png);
+ }
+ }
+}
diff --git a/stylesheets/common/ui.css b/stylesheets/common/ui.css
index 3191a90..c183661 100644
--- a/stylesheets/common/ui.css
+++ b/stylesheets/common/ui.css
@@ -174,36 +174,24 @@
text-decoration: none;
}
#mw-mf-menu-main li.icon-home a {
- background-image: url(images/menu/lowres/home.png);
-}
-#mw-mf-menu-main li.icon-random a {
- background-image: url(images/menu/lowres/random.png);
-}
-#mw-mf-menu-main li.icon-settings a {
- background-image: url(images/menu/lowres/settings.png);
-}
-#mw-mf-menu-main li.icon-loginout a {
- background-image: /* @embed */ url(images/menu/lowres/loginout.png);
-}
-.jsEnabled #mw-mf-menu-main li.icon-home a {
background-image: /* @embed */ url(images/menu/home.png);
}
-.jsEnabled #mw-mf-menu-main li.icon-random a {
+#mw-mf-menu-main li.icon-random a {
background-image: /* @embed */ url(images/menu/random.png);
}
-.jsEnabled #mw-mf-menu-main li.icon-watchlist a {
+#mw-mf-menu-main li.icon-watchlist a {
background-image: /* @embed */ url(images/menu/watchlist.png);
}
-.jsEnabled #mw-mf-menu-main li.icon-uploads a {
+#mw-mf-menu-main li.icon-uploads a {
background-image: /* @embed */ url(images/menu/uploads.png);
}
-.jsEnabled #mw-mf-menu-main li.icon-nearby a {
+#mw-mf-menu-main li.icon-nearby a {
background-image: /* @embed */ url(images/menu/nearby.png);
}
-.jsEnabled #mw-mf-menu-main li.icon-settings a {
+#mw-mf-menu-main li.icon-settings a {
background-image: /* @embed */ url(images/menu/settings.png);
}
-.jsEnabled #mw-mf-menu-main li.icon-loginout a {
+#mw-mf-menu-main li.icon-loginout a {
background-image: /* @embed */ url(images/menu/loginout.png);
}
@media all and (min-width: 700px) {
diff --git a/stylesheets/common/images/menu/lowres/home.png
b/stylesheets/specials/images/menu/lowres/home.png
similarity index 100%
rename from stylesheets/common/images/menu/lowres/home.png
rename to stylesheets/specials/images/menu/lowres/home.png
Binary files differ
diff --git a/stylesheets/common/images/menu/lowres/loginout.png
b/stylesheets/specials/images/menu/lowres/loginout.png
similarity index 100%
rename from stylesheets/common/images/menu/lowres/loginout.png
rename to stylesheets/specials/images/menu/lowres/loginout.png
Binary files differ
diff --git a/stylesheets/common/images/menu/lowres/main.png
b/stylesheets/specials/images/menu/lowres/main.png
similarity index 100%
rename from stylesheets/common/images/menu/lowres/main.png
rename to stylesheets/specials/images/menu/lowres/main.png
Binary files differ
diff --git a/stylesheets/common/images/menu/lowres/random.png
b/stylesheets/specials/images/menu/lowres/random.png
similarity index 100%
rename from stylesheets/common/images/menu/lowres/random.png
rename to stylesheets/specials/images/menu/lowres/random.png
Binary files differ
diff --git a/stylesheets/common/images/menu/lowres/settings.png
b/stylesheets/specials/images/menu/lowres/settings.png
similarity index 100%
rename from stylesheets/common/images/menu/lowres/settings.png
rename to stylesheets/specials/images/menu/lowres/settings.png
Binary files differ
diff --git a/stylesheets/specials/mobilemenu.css
b/stylesheets/specials/mobilemenu.css
index 795856d..913060c 100644
--- a/stylesheets/specials/mobilemenu.css
+++ b/stylesheets/specials/mobilemenu.css
@@ -6,3 +6,15 @@
.navigationFullScreen #mw-mf-page-center {
display: none;
}
+#mw-mf-menu-main li.icon-home a {
+ background-image: url(images/menu/lowres/home.png);
+}
+#mw-mf-menu-main li.icon-random a {
+ background-image: url(images/menu/lowres/random.png);
+}
+#mw-mf-menu-main li.icon-settings a {
+ background-image: url(images/menu/lowres/settings.png);
+}
+#mw-mf-menu-main li.icon-loginout a {
+ background-image: url(images/menu/lowres/loginout.png);
+}
--
To view, visit https://gerrit.wikimedia.org/r/55836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4365f914f95a8b4d1f2d9ab2e37614e835cc2fc5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[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
