[MediaWiki-commits] [Gerrit] Update mobile - change (mediawiki...Metrolook)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/226716

Change subject: Update mobile
......................................................................

Update mobile

Fixes mobile so it when it is off its off.

Change-Id: I2611c0b33e0888f737aa5b95d52d9f4fb20d5c34
---
M SkinMetrolook.php
M i18n/en.json
M screen.less
A screen.mobile.less
M skin.json
5 files changed, 29 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/16/226716/1

diff --git a/SkinMetrolook.php b/SkinMetrolook.php
index c85af08..202a13b 100644
--- a/SkinMetrolook.php
+++ b/SkinMetrolook.php
@@ -46,7 +46,7 @@
 
                parent::initPage( $out );
 
-               if ( $GLOBALS['wgMetrolookMobile'] ) {
+               if ( $this->metrolookConfig->get( 'MetrolookMobile' ) ) {
                        $out->addMeta( 'viewport', 'width=device-width, 
initial-scale=1' );
                }
 
@@ -70,7 +70,11 @@
        public function setupSkinUserCss( OutputPage $out ) {
                parent::setupSkinUserCss( $out );
 
-               $styles = array( 'mediawiki.skinning.interface', 
'skins.metrolook.styles' );
+               if ( $this->metrolookConfig->get( 'MetrolookMobile' ) ) {
+                       $styles = array( 'mediawiki.skinning.interface', 
'skins.metrolook.styles.responsive' );
+               } else {
+                       $styles = array( 'mediawiki.skinning.interface', 
'skins.metrolook.styles' );
+               }
                Hooks::run( 'SkinMetrolookStyleModules', array( $this, &$styles 
) );
                $out->addModuleStyles( $styles );
        }
diff --git a/i18n/en.json b/i18n/en.json
index 8de4e47..31bb273 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,6 +8,6 @@
        "skinmetrolook-collapsiblenav-preference": "Enable collapsing of items 
in the sidebar in Metrolook skin",
        "metrolook-desc": "Metrolook skin for MediaWiki",
        "metrolook-guest": "Guest",
-       "metrolook-tiles": "* 
http://www.pidgi.net/wiki/|PidgiWiki|http://images.pidgi.net/pidgiwikitiletop.png\n*
 http://www.pidgi.net/press/|PidgiWiki 
Press|http://images.pidgi.net/pidgipresstiletop.png\n* 
http://www.pidgi.net/jcc/|The JCC|http://images.pidgi.net/jcctiletop.png\n* 
http://www.petalburgwoods.com/|Petalburg 
Woods|http://images.pidgi.net/pwntiletop.png";,
+       "metrolook-tiles": "* 
http://www.pidgi.net/wiki/|PidgiWiki|http://images.pidgi.net/pidgiwikitiletop.png\n*
 http://www.pidgi.net/press/|PidgiWiki 
Press|http://images.pidgi.net/pidgipresstiletop.png\n* 
http://www.petalburgwoods.com/|Petalburg 
Woods|http://images.pidgi.net/pwntiletop.png\n* 
http://burstcade.pidgi.net/|Burstcade|http://images.pidgi.net/burstcadetiletop.png";,
        "metrolook-tiles-second": ""
 }
diff --git a/screen.less b/screen.less
index cf81df5..1267db6 100644
--- a/screen.less
+++ b/screen.less
@@ -6,6 +6,4 @@
 @import "components/navigation.less";
 @import "components/footer.less";
 @import "components/externalLinks.less";
-@import "components/tablet.less";
-@import "components/mobile.less";
 @import "theme.less";
diff --git a/screen.mobile.less b/screen.mobile.less
new file mode 100644
index 0000000..cf81df5
--- /dev/null
+++ b/screen.mobile.less
@@ -0,0 +1,11 @@
+/* Metrolook screen styles */
+
+@import "variables.less";
+
+@import "components/common.less";
+@import "components/navigation.less";
+@import "components/footer.less";
+@import "components/externalLinks.less";
+@import "components/tablet.less";
+@import "components/mobile.less";
+@import "theme.less";
diff --git a/skin.json b/skin.json
index 21e7af5..50757cb 100644
--- a/skin.json
+++ b/skin.json
@@ -55,6 +55,17 @@
                                }
                        }
                },
+               "skins.metrolook.styles.responsive": {
+                       "position": "top",
+                       "styles": {
+                               "screen.mobile.less": {
+                                       "media": "screen"
+                               },
+                               "screen-hd.less": {
+                                       "media": "screen and (min-width: 982px)"
+                               }
+                       }
+               },
                "skins.metrolook.js": {
                        "scripts": [
                                "js/collapsibleTabs.js",

-- 
To view, visit https://gerrit.wikimedia.org/r/226716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2611c0b33e0888f737aa5b95d52d9f4fb20d5c34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits