Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/203773
Change subject: Improvements to Metrolook on MediaWiki 1.24
......................................................................
Improvements to Metrolook on MediaWiki 1.24
Change-Id: Idb07f595133467f88ac41377464cbc58000da44a
---
M CHANGELOG.md
M Metrolook.php
M MetrolookTemplate.php
M README.md
M components/mobile.less
M components/navigation.less
M components/personalMenu.less
M composer.json
A i18n/cv.json
A i18n/oc.json
A i18n/ps.json
M i18n/qqq.json
D images/bullet-circle-icon.svg
D images/bullet-icon.svg
D images/user-icon.png
D images/user-icon.svg
M js/metrolook.js
17 files changed, 138 insertions(+), 293 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/73/203773/1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e28398..1cc6a86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
Changelog
=========
+### 2.5.1
+
+Improve Metrolook.
+
+
### 2.5
Big release with new desgn for mobile and minor improvements to desktop desgn.
diff --git a/Metrolook.php b/Metrolook.php
index 45d3eb2..d33d973 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -26,7 +26,7 @@
'name' => 'Metrolook',
'namemsg' => 'skinname-metrolook',
'descriptionmsg' => 'metrolook-desc',
- 'version' => '2.5',
+ 'version' => '2.5.1',
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPLv2+',
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index dc1635e..60a3349 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -292,7 +292,7 @@
<div style="vertical-align:top;align:left;">
<div class="topleft">
-<div style="align:left;margin-left:auto;margin-right:auto;display:none;"
class="tilebar" id="bartile"><div id="tilegrouptable"><div id="tilegroup">
+<div style="align:left;margin-right:auto;display:none;" class="tilebar"
id="bartile"><div id="tilegrouptable"><div id="tilegroup">
<?php if ( $wgMetrolookBartile ): ?>
<?php if ( $wgMetrolookTile1 ): ?><div style="float:left;padding:5px;"><div
class="tile"><a href="http://www.pidgi.net/wiki/"><img
src="http://images.pidgi.net/pidgiwikitiletop.png" /></a></div></div><?php
else: ?><?php endif; ?><?php if ( $wgMetrolookTile2 ): ?><div
style="float:left;padding:5px;"><div class="tile"><a
href="http://www.pidgi.net/press/"><img
src="http://images.pidgi.net/pidgipresstiletop.png" /></a></div></div><?php
else: ?><?php endif; ?><?php if ( $wgMetrolookTile3 ): ?><div
style="float:left;padding:5px;" id="jcctile"><div class="tile"><a
href="http://www.pidgi.net/jcc/"><img
src="http://images.pidgi.net/jcctiletop.png" /></a></div></div><?php else:
?><?php endif; ?><?php if ( $wgMetrolookTile4 ): ?><div
style="float:left;padding:5px;"><div class="tile"><a
href="http://www.petalburgwoods.com/"><img
src="http://images.pidgi.net/pwntiletop.png" /></a></div></div><?php else:
?><?php endif; ?>
@@ -313,11 +313,11 @@
<?php if ( $wgMetrolookUploadButton ): ?><a
href="<?php echo $this->data['nav_urls']['upload']['href']; ?>"><div
class="onhoverbg"
style="padding-left:0.8em;padding-right:0.8em;float:left;height:40px;font-size:10pt;"><img
class="uploadbutton" src="<?php echo htmlspecialchars(
$this->getSkin()->getSkinStylePath( 'images/Transparent.gif' ) ) ?>" /> <span
style="color:#fff;position:relative;top:3px; "><?php $this->msg('uploadbtn')
?></span></div></a><?php else: ?><?php endif; ?><?php $this->renderNavigation(
array( 'NAMESPACES', 'VARIANTS', 'VIEWS', 'ACTIONS' ) ); ?>
</div>
- <div id="editbutton"><img class="editbutton"
src="<?php echo htmlspecialchars( $this->getSkin()->getSkinStylePath(
'images/Transparent.gif' ) ) ?>" /></div>
<?php if ( $wgMetrolookSearchBar ): ?>
<img class="searchbar" src="<?php echo
htmlspecialchars( $this->getSkin()->getSkinStylePath( 'images/Transparent.gif'
) ) ?>" />
<?php else: ?>
<?php endif; ?>
+ <img class="editbutton" src="<?php echo
htmlspecialchars( $this->getSkin()->getSkinStylePath( 'images/Transparent.gif'
) ) ?>" />
<div id="right-navigation">
<?php if ( $wgMetrolookSearchBar ): ?>
diff --git a/README.md b/README.md
index 0acab05..e30f1c5 100644
--- a/README.md
+++ b/README.md
@@ -6,25 +6,29 @@
The author of the skin is http://www.pidgi.net/wiki/Main_Page
-Compatible with MediaWiki 1.24+
+Compatible with MediaWiki 1.24+.
-If you would like compatibility with mediawiki 1.25, 1.23, 1.22 or 1.21 please
visit
+If you would like compatibility with mediawiki 1.26, 1.25, 1.23, 1.22 or 1.21
please visit
+
+1.26
+
+https://github.com/paladox/Metrolook/tree/master
1.25
-https://github.com/paladox2015/Metrolook/tree/master
+https://github.com/paladox/Metrolook/tree/REL1_25
1.23
-https://github.com/paladox2015/Metrolook/tree/REL1_23
+https://github.com/paladox/Metrolook/tree/REL1_23
1.22
-https://github.com/paladox2015/Metrolook/tree/REL1-22
+https://github.com/paladox/Metrolook/tree/REL1_22
1.21
-https://github.com/paladox2015/Metrolook/tree/REL1_21
+https://github.com/paladox/Metrolook/tree/REL1_21
Please be aware that there are issues in the codes if you see any could you
point it out it would help. and there are things like logos already set sorry i
will put a setting there.
@@ -69,9 +73,13 @@
Note: Image setting should be set like this for example $wgMetrolookImage1 =
file/to/image or can be set like http://example.com/image.png;
+
## Mobile desgn
-Mobile is now out of preview and can be downloaded now.
+Mobile desgn now included in the latest release for MediaWiki 1.21+. Also to
get mobile desgn please download Metrolook release 0.2.0, 0.3.10, 1.4, 2.5 or
3.0 beta 16 or higher please.
+
+And please report feedback in the issues tab. And if you could help fix the
problem and or improve the desgn please open and pull task.
+
## Customizing top bar color
@@ -187,23 +195,27 @@
background-color: dodgerBlue;
}
}
+/* To change bullet icon to a circle */
-/* Top Bar colour and hover colour */
+ul {
+ list-style-type: disc;
+ .list-style-image-svg('images/bullet-circle-icon.png');
+}
+
+/* Top Bar colour and hover colour end */
```
## Known Issues
-* When i recent changes and are in mobile view or on a mobile device bartitle
will show but is harder to click off it.
+* Sometimes clicking of bartitle on mobile, it wont let you click off
sometimes.
-## Support coming soon
+## Comming soon
Note plans may change.
-Coming soon support for
-
-* MediaWiki 1.21
-
## Version
+
+4.x.x requires MediaWiki 1.26.
3.x.x requires MediaWiki 1.25.
@@ -213,6 +225,8 @@
0.3.x requires MediaWiki 1.22.
+0.2.x requires MediaWiki 1.21.
+
## Removed things
diff --git a/components/mobile.less b/components/mobile.less
index bc7f49a..b89eb68 100644
--- a/components/mobile.less
+++ b/components/mobile.less
@@ -9,16 +9,16 @@
}
div#mw-panel {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow-y: auto;
- overflow-x: hidden;
- padding-top: 1em;
- width: 9.5em;
- left: 0;
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ padding-top: 1em;
+ width: 9.5em;
+ left: 0;
div.portal {
margin: 0 0.6em 0 0.7em;
@@ -80,15 +80,16 @@
}
div#mw-panel-custom {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow: hidden;
- padding-top: 1em;
- width: 11em;
- left: 0;
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
div.portal-custom {
margin: 0 0.6em 0 0.7em;
@@ -107,7 +108,7 @@
padding-top: 0;
padding-left: 17px;
padding-bottom: 0;
- margin-bottom:0;
+ margin-bottom: 0;
cursor: default;
border: none;
}
@@ -286,16 +287,16 @@
}
div#mw-panel {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow-y: auto;
- overflow-x: hidden;
- padding-top: 1em;
- width: 9.5em;
- left: 0;
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ padding-top: 1em;
+ width: 10em;
+ left: 0;
div.portal {
margin: 0 0.6em 0 0.7em;
@@ -357,15 +358,16 @@
}
div#mw-panel-custom {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow: hidden;
- padding-top: 1em;
- width: 11em;
- left: 0;
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
div.portal-custom {
margin: 0 0.6em 0 0.7em;
@@ -566,9 +568,10 @@
width: 26px; /* width of your image */
height: 35px; /* height of your image */
background-repeat: no-repeat;
- margin-right: -4.5em;
+ margin-right: 0;
margin-top: 1em;
float: right;
+ margin-left: 0.5em;
}
img.editbutton {
@@ -579,18 +582,14 @@
cursor: pointer;
display: block;
float: right;
- margin: 8px;
- margin-left: 0em;
- margin-top: -0;
+ margin-right: 0;
}
img.editbutton:hover {
cursor: pointer;
display: block;
float: right;
- margin: 8px;
- margin-left: 0em;
- margin-top: -0;
+ margin-right: 0;
background-color: #9F6F40;
}
@@ -617,7 +616,7 @@
padding: 0;
margin: 0 auto;
line-height: 1.5em;
- background: #CF8B54;
+ background-color: #CF8B54;
width: 100%;
text-align: center;
}
@@ -626,8 +625,8 @@
float: right;
top: 0.3em;
position: relative;
- margin-right: -7px;
- margin-left: 0.7em;
+ margin-right: 0;
+ margin-left: -1em;
}
#p-search {
@@ -709,7 +708,7 @@
border-top: solid 2px #CF8B54;
margin-left: 0;
bottom: 40px;
- right: -1.3em;
+ right: -0.3em;
width: 100vw;
}
diff --git a/components/navigation.less b/components/navigation.less
index ebaa689..216daeb 100644
--- a/components/navigation.less
+++ b/components/navigation.less
@@ -74,16 +74,16 @@
/* Panel */
div#mw-panel {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0px;
- height: auto;
- overflow-y: auto;
- overflow-x: hidden;
- padding-top: 1em;
- width: 11em;
- left: 0;
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0px;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
div.portal {
margin: 0 0.6em 0 0.7em;
@@ -148,15 +148,15 @@
/* Panel */
div#mw-panel-custom {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow: hidden;
- padding-top: 1em;
- width: 11em;
- left: 0;
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow: hidden;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
div.portal-custom {
margin: 0 0.6em 0 0.7em;
diff --git a/components/personalMenu.less b/components/personalMenu.less
index 1f3aadd..adc58c5 100644
--- a/components/personalMenu.less
+++ b/components/personalMenu.less
@@ -90,7 +90,7 @@
float: right;
top: 0.3em;
position: relative;
- margin-right: 20px;
+ margin-right: 1em;
}
#echoNotifications ul {
diff --git a/composer.json b/composer.json
index 41c2333..508e3ff 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
"name" : "immewnity"
},
{
- "name" : "paladox2015"
+ "name" : "Paladox"
},
{
"name" : "Craig Davison"
@@ -30,17 +30,11 @@
"irc" : "irc://irc.freenode.org/mediawiki"
},
"require" : {
- "php" : ">=5.3.2",
- "composer/installers": ">1.0.12"
+ "php" : ">=5.3.2"
},
"autoload" : {
"files": [
"Metrolook.php"
]
- },
- "extra" : {
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
}
}
diff --git a/i18n/cv.json b/i18n/cv.json
new file mode 100644
index 0000000..242866c
--- /dev/null
+++ b/i18n/cv.json
@@ -0,0 +1,8 @@
+{
+ "@metadata": {
+ "authors": [
+ "Chuvash2014"
+ ]
+ },
+ "metrolook-guest": "Хăна"
+}
diff --git a/i18n/oc.json b/i18n/oc.json
new file mode 100644
index 0000000..615b0e8
--- /dev/null
+++ b/i18n/oc.json
@@ -0,0 +1,8 @@
+{
+ "@metadata": {
+ "authors": [
+ "Cedric31"
+ ]
+ },
+ "metrolook-guest": "Convidat"
+}
diff --git a/i18n/ps.json b/i18n/ps.json
new file mode 100644
index 0000000..ff25059
--- /dev/null
+++ b/i18n/ps.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Ahmed-Najib-Biabani-Ibrahimkhel"
+ ]
+ },
+ "metrolook-desc": "د مېډياويکي مېټرولوک پوښۍ",
+ "metrolook-guest": "مېلمه"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ad6fc9d..1cbc7b0 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -2,10 +2,11 @@
"@metadata": {
"authors": [
"paladox",
- "Liuxinyu970226"
+ "Liuxinyu970226",
+ "Umherirrender"
]
},
"skinname-metrolook": "{{optional}}",
- "metrolook-desc":
"{{desc|name=Metrolook|url=http://www.mediawiki.org/wiki/Skin:Metrolook}}",
+ "metrolook-desc":
"{{desc|name=Metrolook|url=https://www.mediawiki.org/wiki/Skin:Metrolook}}",
"metrolook-guest": "Used for descbribing you as a guest editing the
wiki.\n{{Identical|Guest}}"
}
diff --git a/images/bullet-circle-icon.svg b/images/bullet-circle-icon.svg
deleted file mode 100644
index aec3a3e..0000000
--- a/images/bullet-circle-icon.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- width="5"
- height="13"
- id="svg2"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="bullet-icon.svg">
- <metadata
- id="metadata10">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs8" />
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1366"
- inkscape:window-height="705"
- id="namedview6"
- showgrid="false"
- inkscape:zoom="18.153846"
- inkscape:cx="-6.0932203"
- inkscape:cy="6.5"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2" />
- <path
- d="m4.820297 5.8103962a2.1173267 2.1173267 0 1 1-4.23465347 0 2.1173267
2.1173267 0 1 1 4.23465347 0z"
- transform="matrix(1.1807342,0,0,1.1807342,-0.69148932,2.0972643)"
- fill="#00528c"
- id="path4"
- style="fill:#784000;fill-opacity:1" />
-</svg>
diff --git a/images/bullet-icon.svg b/images/bullet-icon.svg
deleted file mode 100644
index 596ff38..0000000
--- a/images/bullet-icon.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="5"
- height="13"
- id="svg4859"
- version="1.1"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="New document 8">
- <defs
- id="defs4861" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="18.15"
- inkscape:cx="25.247934"
- inkscape:cy="-1.7052342"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="1366"
- inkscape:window-height="705"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata4864">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <rect
- style="fill:#784000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="rect4875"
- width="5.012712"
- height="5.012712"
- x="0.055"
- y="6.9952879" />
- </g>
-</svg>
diff --git a/images/user-icon.png b/images/user-icon.png
deleted file mode 100644
index f20d49f..0000000
--- a/images/user-icon.png
+++ /dev/null
Binary files differ
diff --git a/images/user-icon.svg b/images/user-icon.svg
deleted file mode 100644
index 839dedd..0000000
--- a/images/user-icon.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- x="0px"
- y="0px"
- viewBox="0 0 612 792"
- enable-background="new 0 0 612 792"
- xml:space="preserve"
- inkscape:version="0.48.5 r10040"
- width="24"
- height="22"
- sodipodi:docname="user-icon.svg"><metadata
- id="metadata6082"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs6080" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1366"
- inkscape:window-height="705"
- id="namedview6078"
- showgrid="false"
- inkscape:zoom="8.7165024"
- inkscape:cx="5.1804601"
- inkscape:cy="20.029586"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" />
-<g
- id="g6066"
- transform="matrix(47.634902,0,0,47.647843,-17387.924,-18829.686)">
- <g
- id="g6068">
- <path
- d="m 380.4,410.3 c -0.3,0.5 0.7,0.47316 -0.7,0.37316 -1.1,0 0.83461,0.60676
-0.26539,0.60676 -4.6,-0.1 -8.95318,0.0734 -13.55318,-0.0266 6.46934,-18.04804
-5.54394,-7.38971 4.31857,-8.15328 1.8,0.7 3.6,1.2 5.4,0 2.5,0 3.2,1.9 3.9,3.8
0.3,1 -0.1,2.4 0.9,3.4 z"
- id="path6070"
- inkscape:connector-curvature="0"
- style="fill:#fdfdfd;fill-opacity:1"
- sodipodi:nodetypes="ccccccccc" />
- <path
- d="m 380.4867,411.24732 c -1.07902,0.1 -0.73938,0.36831 -1.35515,-1.52113
-0.5,-1.9 -1.53155,-6.02619 -3.93155,-5.92619 -0.3,-0.2 -0.5,-0.5 -0.6,-0.8
-0.1,-0.6 -0.1,-1.2 -0.1,-1.8 0,-1.2 -0.4,-2.3 -1.8,-2.3 -1.8,0 -1.7,1.4
-1.6,2.6 0,0.5 0.1,1 0.1,1.5 -0.1,0.3 -0.3,0.6 -0.5,0.9 -4.6,0 -2.79472,8.09457
-5.2,7.4 0,-5.9 0,-11.07336 0,-16.07336 4.4133,0 9.15789,-0.0656 13.5,-0.0867
1.3867,0 1.94681,-0.06 1.5,1.76004 0.23352,4.4 0.33352,9.84732 -0.0133,14.34732
z"
- id="path6072"
- inkscape:connector-curvature="0"
- style="fill:#474747"
- sodipodi:nodetypes="ccccsscccccccc" />
- <path
- d="m 370.6,403.7 c 0,-0.3 0,-0.7 0.1,-1 1.5,-0.4 2.9,-0.3 4.4,-0.1 0,0.4
0.1,0.7 0.1,1.1 -1.5,1.7 -3,1.7 -4.6,0 z"
- id="path6074"
- style="fill:#474747;fill-opacity:1"
- inkscape:connector-curvature="0" />
- <path
- d="m 375.1,402.6 c -1.4,1.1 -2.9,1 -4.4,0.1 -1,-1.7 -1.3,-3.5 0.4,-4.9
0.9,-0.8 2.2,-0.7 3.1,0 1.7,1.2 1.7,3 0.9,4.8 z"
- id="path6076"
- style="fill:#fdfdfd;fill-opacity:1"
- inkscape:connector-curvature="0" />
- </g>
-</g>
-</svg>
\ No newline at end of file
diff --git a/js/metrolook.js b/js/metrolook.js
index 2556204..6561562 100644
--- a/js/metrolook.js
+++ b/js/metrolook.js
@@ -17,7 +17,7 @@
$(document).ready(function() {
if(is_touch_device()) {
- if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera
Mini/i.test(navigator.userAgent) ) {
+ if(
/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|CriOS|Opera
Mini|Mobile|mobile/i.test(navigator.userAgent) ) {
$( '#usermenu > div' ).toggleClass( 'no-js js' );
$( '#usermenu .js div' ).hide();
$( '#usermenu .js' ).click(function(e) {
@@ -38,7 +38,7 @@
$(function () {
if(is_touch_device()) {
- if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera
Mini/i.test(navigator.userAgent) ) {
+ if(
/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|CriOS|Opera
Mini|Mobile|mobile/i.test(navigator.userAgent) ) {
$( '.actionmenu > div' ).toggleClass('no-js js');
$( '.actionmenu .js div' ).hide();
$( '.actionmenu .js' ).click(function(e) {
@@ -87,7 +87,7 @@
$(function () {
if(is_touch_device()) {
- if( /Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera
Mini/i.test(navigator.userAgent) ) {
+ if( /Android|webOS|iPhone|iPod|BlackBerry|IEMobile|CriOS|Opera
Mini|Mobile|mobile/i.test(navigator.userAgent) ) {
$( '#p-search' ).hide();
$( 'img.searchbar' ).click(function(e) {
$( '#p-search' ).fadeToggle(150);
--
To view, visit https://gerrit.wikimedia.org/r/203773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb07f595133467f88ac41377464cbc58000da44a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_24
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits