Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/203496
Change subject: Update Metrolook
......................................................................
Update Metrolook
Change-Id: Id3bcf27afb5196930d584e3371bf342a9c04584f
---
M CHANGELOG.md
M Metrolook.php
M MetrolookTemplate.php
M README.md
M SkinMetrolook.php
M components/collapsibleNav.less
M components/common.less
M components/mobile.less
M components/navigation.less
M components/personalMenu.less
M components/search.less
M components/tabs.less
M composer.json
M hooks.txt
M i18n/ast.json
A i18n/cv.json
A i18n/en-gb.json
M i18n/fr.json
M i18n/hi.json
M i18n/it.json
M i18n/ko.json
A i18n/oc.json
A i18n/ps.json
M i18n/qqq.json
A i18n/uk.json
M images/closed-ltr.svg
M images/closed-rtl.svg
M images/downarrow.svg
M images/open.svg
M images/uploadlogo.svg
M js/mediawiki.searchSuggest.custom.js
M js/metrolook.js
M screen-hd.less
A skin.json
A skinStyles/mediawiki.sectionAnchor.less
M variables.less
36 files changed, 896 insertions(+), 453 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/96/203496/1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 954285f..0166678 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,102 +1,11 @@
Changelog
=========
-### 3.0 beta 16
-Big release with new desgn for mobile and minor improvements to desktop desgn.
+### 4.0 alpha 1
-Please see test branch for updates to beta 16 release once it looks like there
arnt many issues and all things have been added to it, it will be released to
the master branch.
+First release of Metrolook to support MediaWiki 1.26.
-Bump required mediawiki version to mediawiki 1.25 wmf 18
+Includes improvements to mobile desgn and desktop desgn.
-
-Mainly new features and desgn are
-
-
-* Mobile desgn (This is a preview of mobile desgn please report bug in issue
section and fix bugs if you know how to thanks. and please also suggest
improvements to the desktop and mobile desgn.)
-
-* Full logo support.
-
-* Cleaned up MetrolookTemplate.php file.
-
-* Cleaned up setting names.
-
-* Settings that were renamed
-
-$logo renamed to $wgMetrolookLogo<br>$SearchBar renamed to
$wgMetrolookSearchBar<br>$DownArrow renamed to $wgMetrolookDownArrow<br>$Line
renamed to $wgMetrolookLine<br>$UploadButton renamed to
$wgMetrolookUploadButton<br>$wgURL1 and $wgImage1 where renamed to
$wgMetrolookURL1 and $wgMetrolookImage1 and there settings were changed. for
url you put in the url to website for image you put in the path to image or url
to image.
-
-* Settings that were removed.
-
- $link and $picture
-
-* New settings that were added
-
-$wgMetrolookBartile
-
-$wgMetrolookTile1<br>$wgMetrolookTile2<br>$wgMetrolookTile3<br>$wgMetrolookTile4<br>$wgMetrolookTile5<br>$wgMetrolookTile6<br>$wgMetrolookTile7<br>$wgMetrolookTile8<br>$wgMetrolookTile9<br>$wgMetrolookTile10
-
-$wgMetrolookSiteName
-
-$wgMetrolookMobile
-
-
-
-Fixes
-
-Fix for ipad.
-
-Fix for desktop view.
-
-Fix for mobile view.
-
-
-
-Note: Please see settings section in README.md for more information on how to
enable and disable it.
-
-* Remove styles and js from the main MetrolookTemplate.php and seperated it
into own files.
-
-* More new things and changes comming soon to this release. /* This will be
removed once this is ready to be published */
-
-
-
-Revision 3 brings these fixes /* This may be removed near to time of release.
*/
-
-* Fixes for ipad desgn.
-
-* Disabled searchbar js for ipad.
-
-* Fixes for mobile desgn.
-
-* Fixes for desktop desgn.
-
-
-### 3.0 beta 15
-
-* Adding copying file for license.
-
-* Adding namemsg for skin name.
-
-* Localisation updates.
-
-* Update license to GPL-2.0+ in Metrolook.php.
-
-
-### 3.0 beta 14
-
-* Added scroll for sidebar. Will automatically show if content goes out of
screen. Note this will only work for people who do not have the search bar in
the sidebar enabled. Reason because width is a problem and maybe in future
releases it will be added to search bar in sidebar.
-
-* Updated collapsiblenav css code.
-
-* Updated i18n and added some more languges.
-
-* Added bullet-circle-icon.png and svg.
-
-* Added bullet-icon.svg.
-
-* Updated Metrolook.php, SkinMetrolook and MetrolookTemplate.php.
-
-* Updated SkinStyles/jquery.ui.
-
-* Added changelog.
-
-* Convert space to tabs.
+Includes skin.json. New extension/skin registration in mediawiki starting from
mediawiki 1.25. Please read the README.md on how to do it. when using
extension.json please remove require_once from localsettings.php for metrolook.
diff --git a/Metrolook.php b/Metrolook.php
index f0d14d4..a7d6d97 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -26,7 +26,7 @@
'name' => 'Metrolook',
'namemsg' => 'skinname-metrolook',
'descriptionmsg' => 'metrolook-desc',
- 'version' => '3.0 beta 16',
+ 'version' => '4.0 alpha 1',
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPL-2.0+',
@@ -156,6 +156,7 @@
'jquery.ui.tabs' => 'skinStyles/jquery.ui/jquery.ui.tabs.css',
'jquery.ui.tooltips' => 'skinStyles/jquery.ui/jquery.ui.tooltips.css',
'mediawiki.notification' => 'skinStyles/mediawiki.notification.less',
+ '+mediawiki.sectionAnchor' => 'skinStyles/mediawiki.sectionAnchor.less',
'mediawiki.special' => 'skinStyles/mediawiki.special.less',
'mediawiki.special.preferences' =>
'skinStyles/mediawiki.special.preferences.less',
'remoteSkinPath' => 'Metrolook',
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 629a881..e790d84 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -318,20 +318,21 @@
<?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' ) ) ?>" ></img></div>
<?php if ( $wgMetrolookSearchBar ): ?>
- <img class="searchbar" src="<?php echo
htmlspecialchars( $this->getSkin()->getSkinStylePath( 'images/Transparent.gif'
) ) ?>" ></img>
+ <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 ): ?>
<?php $this->renderNavigation( array( 'SEARCH'
) ); ?>
-
<?php else: ?>
<?php endif; ?>
</div>
</div>
+
<?php if ( $wgMetrolookSearchBar ): ?>
<div id="mw-panel">
<?php if ( $wgMetrolookLogo ): ?>
diff --git a/README.md b/README.md
index c9d0f71..6bfbfb3 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.25+
+Compatible with MediaWiki 1.26+.
-If you would like compatibility with mediawiki 1.24, 1.23, 1.22 or 1.21 please
visit
+If you would like compatibility with mediawiki 1.25, 1.24, 1.23, 1.22 or 1.21
please visit
+
+1.25
+
+https://github.com/paladox/Metrolook/tree/REL1_25
1.24
-https://github.com/paladox2015/Metrolook/tree/REL1_24
+https://github.com/paladox/Metrolook/tree/REL1_24
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.
@@ -40,9 +44,15 @@
require_once "$IP/skins/Metrolook/Metrolook.php";
```
+MediaWiki 1.25+ (optional)
+
+```php
+wfLoadSkin( 'Metrolook' );
+```
+
## Settings
-1.25 only
+1.26 only
|Setting|Default|To Enable|To Disable|
|-------|-------|---------|----------|
@@ -58,7 +68,6 @@
|`$wgMetrolookTileN`<br>Where `N` is between 5 to 10. | | `$wgMetrolookTile5 =
true;`| `$wgMetrolookTile5 = false;` |
|`$wgMetrolookURLN`, `$wgMetrolookImageN`<br>Where `N` is between 1 to 6. | |
`$wgMetrolookURL1 = link of website;`<br>`$wgMetrolookImage1 = image link;`| |
-
$wgBartile is now used to disable the default tiles or enable them so you can
have the default tiles or set your self one.
$link and $picture were removed in favour of using $wgMetrolookBartile and
$wgMetrolookURL1 and $wgMetrolookImage1
@@ -70,6 +79,14 @@
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 desgn now included in the latest release for MediaWiki 1.24+. Mobile
desgn for MediaWiki 1.23 and 1.22 coming soon. Also to get mobile desgn please
download Metrolook release 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
To customise top bar colour ether add it to theme.css which is in metrolook
skin folder or MediaWiki:Metrolook.css from web browser.
@@ -77,6 +94,9 @@
and all you need to do is edit background-colour and the top bar should change
colour but please remember there is also hover which is when you hover it goes
a different colour.
```css
+
+/* Add your custom theme overrides here */
+
/* Top Bar colour and hover colour start */
@import "mediawiki.mixins";
@@ -123,7 +143,7 @@
background-repeat: repeat-x;
/* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
background-image: url('images/page-fade.png');
- min-width: 67.800em;
+ min-width: 64.7em;
}
}
@@ -160,6 +180,7 @@
div.vectorMenu ul {
border: solid 2px dodgerBlue;
+ border-top: none;
}
@@ -186,22 +207,22 @@
}
}
-/* Top Bar colour and hover colour end */
+/* Top Bar colour and hover colour */
```
## 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
+Mobile desgn for MediaWiki 1.22 and 1.23.
## Version
+
+4.x.x requires MediaWiki 1.26.
3.x.x requires MediaWiki 1.25.
@@ -210,6 +231,8 @@
1.x.x requires MediaWiki 1.23.
0.3.x requires MediaWiki 1.22.
+
+0.2.x requires MediaWiki 1.21.
## Removed things
@@ -220,23 +243,4 @@
<link href='http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:700'
defer="defer" rel='stylesheet' type='text/css'>
<meta name="msapplication-TileImage"
content="http://www.pidgi.net/new/public/images/pidgiwiki.png"/>
<meta name="msapplication-TileColor" content="#BE0027"/>
-```
-
-```html
-<?php if ( $Logoshow ): ?>
- <div id="p-logo" role="banner">
- <a
- style="background-image: url(<?php
- $this->text( 'logopath' )
- ?>);"
- href="<?php
- echo htmlspecialchars(
$this->data['nav_urls']['mainpage']['href'] )
- ?>">
- <?php
- echo Xml::expandAttributes(
Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) )
- ?>
- </a>
- </div>
- <?php else: ?>
-<?php endif; ?>
```
diff --git a/SkinMetrolook.php b/SkinMetrolook.php
index fd804cf..0791da1 100644
--- a/SkinMetrolook.php
+++ b/SkinMetrolook.php
@@ -32,10 +32,10 @@
/**
* @var Config
*/
- private $vectorConfig;
+ private $metrolookConfig;
public function __construct() {
- $this->vectorConfig =
ConfigFactory::getDefaultInstance()->makeConfig( 'metrolook' );
+ $this->metrolookConfig =
ConfigFactory::getDefaultInstance()->makeConfig( 'metrolook' );
}
/**
@@ -67,7 +67,7 @@
parent::setupSkinUserCss( $out );
$styles = array( 'mediawiki.skinning.interface',
'skins.metrolook.styles' );
- wfRunHooks( 'SkinVectorStyleModules', array( $this, &$styles )
);
+ wfRunHooks( 'SkinMetrolookStyleModules', array( $this, &$styles
) );
$out->addModuleStyles( $styles );
}
@@ -75,6 +75,6 @@
* Override to pass our Config instance to it
*/
public function setupTemplate( $classname, $repository = false,
$cache_dir = false ) {
- return new $classname( $this->vectorConfig );
+ return new $classname( $this->metrolookConfig );
}
}
diff --git a/components/collapsibleNav.less b/components/collapsibleNav.less
index 0cb663b..ea7dad6 100644
--- a/components/collapsibleNav.less
+++ b/components/collapsibleNav.less
@@ -9,9 +9,9 @@
h5 {
background-position: left center;
background-repeat: no-repeat;
-/* .background-image-svg('images/arrow-expanded.svg',
'images/arrow-expanded.png'); */
.background-image-svg('images/open.svg',
'images/open.png');
padding: @collapsible-nav-heading-padding;
+ margin-left: -0.5em;
&:hover {
cursor: pointer;
@@ -67,7 +67,6 @@
color: @collapsible-nav-heading-collapsed-color;
background-position: left center;
background-repeat: no-repeat;
-/*
.background-image-svg('images/arrow-collapsed-ltr.svg',
'images/arrow-collapsed-ltr.png'); */
.background-image-svg('images/closed-ltr.svg',
'images/closed-ltr.png');
&:hover {
@@ -100,9 +99,9 @@
h5 {
background-position: left center;
background-repeat: no-repeat;
-/* .background-image-svg('images/arrow-expanded.svg',
'images/arrow-expanded.png'); */
.background-image-svg('images/open.svg',
'images/open.png');
padding: @collapsible-nav-heading-padding;
+ margin-left: -0.5em;
&:hover {
cursor: pointer;
@@ -158,7 +157,6 @@
color: @collapsible-nav-heading-collapsed-color;
background-position: left center;
background-repeat: no-repeat;
-/*
.background-image-svg('images/arrow-collapsed-ltr.svg',
'images/arrow-collapsed-ltr.png'); */
.background-image-svg('images/closed-ltr.svg',
'images/closed-ltr.png');
&:hover {
diff --git a/components/common.less b/components/common.less
index f286deb..43840b7 100644
--- a/components/common.less
+++ b/components/common.less
@@ -65,10 +65,12 @@
.onhoverbg:hover {
background: #9F6F40;
}
+
.topleft {
display: inline;
position: relative;
}
+
.topright .hover {
display: none;
position: absolute;
@@ -77,18 +79,20 @@
height: 200px;
}
-img.editbutton {
- display: none;
-}
-#tilegrouptable {
+img.editbutton {
+ display: none;
+}
+
+#tilegrouptable {
height: 130px;
padding: 0;
- border-spacing: 0;
-}
-#tilegroup {
- padding: 35px;
+ border-spacing: 0;
+}
+
+#tilegroup {
+ padding: 35px;
height: 130px;
-}
+}
/* Content */
.mw-body {
@@ -217,6 +221,7 @@
background-repeat: no-repeat;
background-position: -0px 20px;
}
+
img.downarrow:hover {
position: inherit;
background: #9F6F40;
diff --git a/components/mobile.less b/components/mobile.less
index a4b8916..cd063a8 100644
--- a/components/mobile.less
+++ b/components/mobile.less
@@ -2,24 +2,161 @@
/* different screen sizes */
-@media only screen and (min-device-width: 481px) and (max-device-width:
1024px) and (orientation:landscape) {
+@media only screen and (min-device-width: 481px) and (max-device-width:
1024px) and (orientation:landscape) {
img.searchbar {
display: none;
}
+div#mw-panel {
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
+ padding-top: 1em;
+ width: 9.5em;
+ left: 0;
+
+ div.portal {
+ margin: 0 0.6em 0 0.7em;
+ padding: 0.25em 0;
+ direction: ltr;
+ background-position: top left;
+ background-repeat: no-repeat;
+ .background-image('images/portal-break.png');
+
+ h5 {
+ font-family: 'Segoe UI Light', Segoe UI, sans-serif;
+ font-weight: 100;
+ font-size: 1em;
+ color: #444444;
+ margin: 0;
+ padding: @menu-main-heading-padding;
+ cursor: default;
+ border: none;
+ }
+
+ div.body {
+ margin: @menu-main-body-margin;
+ padding-top: 0;
+
+ ul {
+ list-style-type: none;
+ list-style-image: none;
+ margin: 0;
+ padding: @menu-main-body-padding;
+
+ li {
+ line-height: 1.125em;
+ margin: 0;
+ padding: 0.25em 0;
+ font-size: @menu-main-body-font-size;
+ word-wrap: break-word;
+
+ a {
+ color:
@menu-main-body-link-color;
+ &:visited {
+ color:
@menu-main-body-link-visited-color;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /* First sidebar portlet. Not using :first-of-type for IE<=8 support. */
+ #p-logo + div.portal {
+ background-image: none;
+ margin-top: 0;
+ h5 {
+ display: none;
+ }
+ div.body {
+ margin-left: 0.5em;
+ }
+ }
}
-@media only screen and (min-device-width: 481px) and (max-device-width:
1024px) and (orientation:portrait) {
+div#mw-panel-custom {
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
+ padding-right: 1em;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
-img.searchbar {
- display: none;
+ div.portal-custom {
+ margin: 0 0.6em 0 0.7em;
+ padding: 0.25em 0;
+ direction: ltr;
+ background-position: top left;
+ background-repeat: no-repeat;
+ .background-image('images/portal-break.png');
+
+ h5 {
+ font-family: 'Segoe UI Light', Segoe UI, sans-serif;
+ font-weight: 100;
+ font-size: 1em;
+ color: #444444;
+ padding: 0.25em;
+ padding-top: 0;
+ padding-left: 17px;
+ padding-bottom: 0;
+ margin-bottom:0;
+ cursor: default;
+ border: none;
+ }
+
+ div.body-custom {
+ margin: @menu-main-body-margin;
+ padding-top: 0;
+
+ ul {
+ list-style-type: none;
+ list-style-image: none;
+ margin: 0;
+ padding: @menu-main-body-padding;
+
+ li {
+ line-height: 1.125em;
+ margin: 0;
+ padding: 0.25em 0;
+ font-size: @menu-main-body-font-size;
+ word-wrap: break-word;
+
+ a {
+ color:
@menu-main-body-link-color;
+ &:visited {
+ color:
@menu-main-body-link-visited-color;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /* First sidebar portlet. Not using :first-of-type for IE<=8 support. */
+ #p-logo + div.portal-custom {
+ background-image: none;
+ margin-top: 0;
+ h5 {
+ display: none;
+ }
+ div.body-custom {
+ margin-left: 0.5em;
+ }
+ }
}
-
-}
-
-
-@media only screen and (min-device-width: 481px) and (max-device-width:
1024px) and (orientation:landscape) {
.mw-body {
margin-left: 11em;
@@ -34,7 +171,7 @@
height: auto;
position: absolute;
bottom: 0;
- right: -60px;
+ right: -0.7em;
left: 0;
top: 40px;
overflow: auto;
@@ -122,7 +259,7 @@
div#mw-head {
position: absolute;
top: 0;
- min-width: 106%;
+ min-width: 101%;
h5 {
margin: 0;
@@ -130,9 +267,39 @@
}
}
+#mw-page-base {
+ height: 2.5em;
+ background-color: CF8B54;
+ background-position: bottom left;
+ background-repeat: repeat-x;
+ /* This image is only a fallback (for IE 6-9), so we do not @embed it.
*/
+ background-image: url('images/page-fade.png');
+ min-width: 64.7em;
+}
+
+#p-search {
+ /* @noflip */
+ float: left;
+ margin-right: 0.5em;
+ margin-left: 0.5em;
+
+ h5 {
+ display: none;
+ }
+
+ form,
+ input {
+ margin: 0;
+ margin-top: 0.4em;
+ }
+}
+
}
@media only screen and (min-device-width: 481px) and (max-device-width:
1024px) and (orientation:portrait) {
+img.searchbar {
+ display: none;
+}
#echoNotifications {
float: right;
@@ -140,6 +307,156 @@
position: relative;
margin-right: 30px;
margin-left: 1em;
+}
+
+div#mw-panel {
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
+ padding-top: 1em;
+ width: 9.5em;
+ left: 0;
+
+ div.portal {
+ margin: 0 0.6em 0 0.7em;
+ padding: 0.25em 0;
+ direction: ltr;
+ background-position: top left;
+ background-repeat: no-repeat;
+ .background-image('images/portal-break.png');
+
+ h5 {
+ font-family: 'Segoe UI Light', Segoe UI, sans-serif;
+ font-weight: 100;
+ font-size: 1em;
+ color: #444444;
+ margin: 0;
+ padding: @menu-main-heading-padding;
+ cursor: default;
+ border: none;
+ }
+
+ div.body {
+ margin: @menu-main-body-margin;
+ padding-top: 0;
+
+ ul {
+ list-style-type: none;
+ list-style-image: none;
+ margin: 0;
+ padding: @menu-main-body-padding;
+
+ li {
+ line-height: 1.125em;
+ margin: 0;
+ padding: 0.25em 0;
+ font-size: @menu-main-body-font-size;
+ word-wrap: break-word;
+
+ a {
+ color:
@menu-main-body-link-color;
+ &:visited {
+ color:
@menu-main-body-link-visited-color;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /* First sidebar portlet. Not using :first-of-type for IE<=8 support. */
+ #p-logo + div.portal {
+ background-image: none;
+ margin-top: 0;
+ h5 {
+ display: none;
+ }
+ div.body {
+ margin-left: 0.5em;
+ }
+ }
+}
+
+div#mw-panel-custom {
+ font-size: @menu-main-font-size;
+ position: absolute;
+ top: 40px;
+ bottom: 0;
+ height: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
+ padding-right: 1em;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
+
+ div.portal-custom {
+ margin: 0 0.6em 0 0.7em;
+ padding: 0.25em 0;
+ direction: ltr;
+ background-position: top left;
+ background-repeat: no-repeat;
+ .background-image('images/portal-break.png');
+
+ h5 {
+ font-family: 'Segoe UI Light', Segoe UI, sans-serif;
+ font-weight: 100;
+ font-size: 1em;
+ color: #444444;
+ padding: 0.25em;
+ padding-top: 0;
+ padding-left: 17px;
+ padding-bottom: 0;
+ margin-bottom:0;
+ cursor: default;
+ border: none;
+ }
+
+ div.body-custom {
+ margin: @menu-main-body-margin;
+ padding-top: 0;
+
+ ul {
+ list-style-type: none;
+ list-style-image: none;
+ margin: 0;
+ padding: @menu-main-body-padding;
+
+ li {
+ line-height: 1.125em;
+ margin: 0;
+ padding: 0.25em 0;
+ font-size: @menu-main-body-font-size;
+ word-wrap: break-word;
+
+ a {
+ color:
@menu-main-body-link-color;
+ &:visited {
+ color:
@menu-main-body-link-visited-color;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /* First sidebar portlet. Not using :first-of-type for IE<=8 support. */
+ #p-logo + div.portal-custom {
+ background-image: none;
+ margin-top: 0;
+ h5 {
+ display: none;
+ }
+ div.body-custom {
+ margin-left: 0.5em;
+ }
+ }
}
.mw-body {
@@ -155,7 +472,7 @@
height: auto;
position: absolute;
bottom: 0;
- right: -60;
+ right: 0;
left: 0;
top: 40px;
overflow: auto;
@@ -256,7 +573,6 @@
float: left;
margin-right: 0.5em;
margin-left: 0.5em;
- margin-top: 0;
padding-right: 4em;
h5 {
@@ -269,7 +585,6 @@
margin-top: 0.4em;
}
}
-
}
@media (max-width: 768px) {
@@ -299,9 +614,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;
}
@@ -313,19 +629,15 @@
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;
- background-color: #CF8B54;
+ margin-right: 0;
+ background-color: #9F6F40;
}
.tilebar {
@@ -351,7 +663,7 @@
padding: 0;
margin: 0 auto;
line-height: 1.5em;
- background: #CF8B54;
+ background-color: #CF8B54;
width: 100%;
text-align: center;
}
@@ -360,8 +672,8 @@
float: right;
top: 0.3em;
position: relative;
- margin-right: -7px;
- margin-left: 0.7em;
+ margin-right: 0;
+ margin-left: -1em;
}
#p-search {
@@ -369,7 +681,6 @@
float: left;
margin-right: 1em;
margin-left: 0.5em;
- margin-top:0;
h5 {
display: none;
@@ -444,7 +755,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 5f7940c..987839c 100644
--- a/components/navigation.less
+++ b/components/navigation.less
@@ -80,6 +80,7 @@
height: auto;
overflow-y: auto;
overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
padding-top: 1em;
width: 11em;
left: 0;
@@ -154,6 +155,7 @@
height: auto;
overflow-y: auto;
overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
padding-top: 1em;
width: 9.5em;
left: 0;
@@ -230,6 +232,7 @@
height: auto;
overflow-y: auto;
overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
padding-right: 1em;
padding-top: 1em;
width: 11em;
@@ -296,85 +299,4 @@
margin-left: 0.5em;
}
}
-}
-
-/* custom */
-
-/* Panel */
-@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) {
-div#mw-panel-custom {
- font-size: @menu-main-font-size;
- position: absolute;
- top: 40px;
- bottom: 0;
- height: auto;
- overflow-y: auto;
- overflow-x: hidden;
- padding-right: 1em;
- padding-top: 1em;
- width: 11em;
- left: 0;
-
- div.portal-custom {
- margin: 0 0.6em 0 0.7em;
- padding: 0.25em 0;
- direction: ltr;
- background-position: top left;
- background-repeat: no-repeat;
- .background-image('images/portal-break.png');
-
- h5 {
- font-family: 'Segoe UI Light', Segoe UI, sans-serif;
- font-weight: 100;
- font-size: 1em;
- color: #444444;
- padding: 0.25em;
- padding-top: 0;
- padding-left: 17px;
- padding-bottom: 0;
- margin-bottom:0;
- cursor: default;
- border: none;
- }
-
- div.body-custom {
- margin: @menu-main-body-margin;
- padding-top: 0;
-
- ul {
- list-style-type: none;
- list-style-image: none;
- margin: 0;
- padding: @menu-main-body-padding;
-
- li {
- line-height: 1.125em;
- margin: 0;
- padding: 0.25em 0;
- font-size: @menu-main-body-font-size;
- word-wrap: break-word;
-
- a {
- color:
@menu-main-body-link-color;
- &:visited {
- color:
@menu-main-body-link-visited-color;
- }
- }
- }
- }
- }
- }
-
- /* First sidebar portlet. Not using :first-of-type for IE<=8 support. */
- #p-logo + div.portal-custom {
- background-image: none;
- margin-top: 0;
- h5 {
- display: none;
- }
- div.body-custom {
- margin-left: 0.5em;
- }
- }
-}
}
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/components/search.less b/components/search.less
index 2e4022d..6a266c9 100644
--- a/components/search.less
+++ b/components/search.less
@@ -2,7 +2,7 @@
#p-search {
/* @noflip */
float: left;
- margin-right: 0.5em;
+ margin-right: 3.5em;
margin-left: 0.5em;
h5 {
diff --git a/components/tabs.less b/components/tabs.less
index 0fac3d2..a8e33e7 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -39,7 +39,7 @@
height: 100%;
margin: 0;
padding: 0;
- background:transparent;
+ background: transparent;
.background-image('images/tab-normal-fade.png');
background-position: bottom left;
background-repeat: repeat-x;
@@ -95,7 +95,7 @@
}
a:hover {
- background:#9F6F40;
+ background: #9F6F40;
}
span {
@@ -125,8 +125,8 @@
direction: ltr;
/* @noflip */
float: left;
- padding-left:5px;
- padding-right:5px;
+ padding-left: 5px;
+ padding-right: 5px;
cursor: pointer;
z-index:10;
}
@@ -234,7 +234,7 @@
text-decoration:none;
}
div.vectorMenu li a:hover {
- background-color:#f3f3f3;
+ background-color: #f3f3f3;
}
/* IGNORED BY IE6 */
div.vectorMenu li > a {
@@ -244,7 +244,6 @@
div.vectorMenu li.selected a,
div.vectorMenu li.selected a:visited {
color: #333;
-// color: #fff;
text-decoration: none;
}
diff --git a/composer.json b/composer.json
index 41c2333..31bba0e 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
"name" : "immewnity"
},
{
- "name" : "paladox2015"
+ "name" : "Paladox"
},
{
"name" : "Craig Davison"
@@ -30,17 +30,12 @@
"irc" : "irc://irc.freenode.org/mediawiki"
},
"require" : {
- "php" : ">=5.3.2",
+ "php" : ">=5.3.3",
"composer/installers": ">1.0.12"
},
"autoload" : {
"files": [
"Metrolook.php"
]
- },
- "extra" : {
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
}
}
diff --git a/hooks.txt b/hooks.txt
index 9adeadd..f226ef3 100644
--- a/hooks.txt
+++ b/hooks.txt
@@ -1,6 +1,6 @@
Hooks provided by the Metrolook skin.
-'SkinVectorStyleModules': Called when defining the list of module styles to be
+'SkinMetrolookStyleModules': Called when defining the list of module styles to
be
loaded by the Vector skin.
$skin: SkinMetrolook object
&$styles: Array of module names whose style will be loaded for the skin
\ No newline at end of file
diff --git a/i18n/ast.json b/i18n/ast.json
index 73ab336..2bcdfe9 100644
--- a/i18n/ast.json
+++ b/i18n/ast.json
@@ -6,4 +6,4 @@
},
"metrolook-desc": "Aspeutu Metrolook pa MediaWiki",
"metrolook-guest": "Invitáu"
-}
\ No newline at end of file
+}
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/en-gb.json b/i18n/en-gb.json
new file mode 100644
index 0000000..e6b6cec
--- /dev/null
+++ b/i18n/en-gb.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Caliburn"
+ ]
+ },
+ "metrolook-desc": "Metrolook skin for MediaWiki",
+ "metrolook-guest": "Guest"
+}
diff --git a/i18n/fr.json b/i18n/fr.json
index 39ca9b5..709dd79 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -7,4 +7,4 @@
},
"metrolook-desc": "Skin Metrolook pour MediaWiki",
"metrolook-guest": "Invité"
-}
\ No newline at end of file
+}
diff --git a/i18n/hi.json b/i18n/hi.json
index 8aae1bb..df2accb 100644
--- a/i18n/hi.json
+++ b/i18n/hi.json
@@ -6,4 +6,4 @@
},
"metrolook-desc": "मीडियाविकि के लिए मेट्रोलुक त्वचा",
"metrolook-guest": "अतिथि"
-}
\ No newline at end of file
+}
diff --git a/i18n/it.json b/i18n/it.json
index 60909da..bf6f403 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -6,4 +6,4 @@
},
"metrolook-desc": "Skin Metrolook per MediaWiki",
"metrolook-guest": "Ospite"
-}
\ No newline at end of file
+}
diff --git a/i18n/ko.json b/i18n/ko.json
index 61a637a..433c58f 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -4,6 +4,7 @@
"아라"
]
},
+ "skinname-metrolook": "메트로룩",
"metrolook-desc": "미디어위키를 위한 메트로룩 스킨",
"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/i18n/uk.json b/i18n/uk.json
new file mode 100644
index 0000000..a62b1f2
--- /dev/null
+++ b/i18n/uk.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Ата"
+ ]
+ },
+ "metrolook-desc": "Тема оформлення MediaWiki Metrolook",
+ "metrolook-guest": "Гість"
+}
diff --git a/images/closed-ltr.svg b/images/closed-ltr.svg
index 58b647f..604d2fb 100644
--- a/images/closed-ltr.svg
+++ b/images/closed-ltr.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
id="svg3902"
version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
width="16"
height="16"
sodipodi:docname="closed-ltr.svg">
@@ -43,28 +43,27 @@
id="namedview3904"
showgrid="false"
inkscape:zoom="14.75"
- inkscape:cx="8"
- inkscape:cy="8"
+ inkscape:cx="-3.8983051"
+ inkscape:cy="13.169251"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
- inkscape:current-layer="g3940" />
+ inkscape:current-layer="svg3902" />
<g
id="g3940">
- <path
- style="fill:#777777"
- d="M 6.2972556,13.21162 8.9686936,10.423239 6.2570741,7.7116195 C
4.3223605,5.776906 3.9867319,5 5.0856361,5 5.9327359,5 7.8368497,6.2640451
9.317,7.8089892 l 2.691182,2.8089888 -2.8088096,2.691011 C 5.398278,16.950669
2.7985841,16.863446 6.2972556,13.21162 z"
- id="path3946"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#6e6e6e"
- d="M 6.2972556,13.21162 8.9686936,10.423239 6.2570741,7.7116195 C
4.3030466,5.7575921 3.9793315,5 5.0984132,5 6.7956112,5 11,9.0181278
11,10.640137 11,12.091406 6.6234717,16 4.9984576,16 4.1454639,16
4.6371555,14.944391 6.2972556,13.21162 z"
- id="path3944"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#656565"
- d="M 6.825686,13.685549 C 9.539201,10.797144 9.5331108,10.237502
6.7536337,7.0644512 4.9542966,5.0103285 5.1541118,5.0852642 7.7577249,7.4410108
L 11.008182,10.382022 8.317,13.191011 C 6.8368497,14.735955 5.4065673,16
5.1385948,16 4.8706222,16 5.6298133,14.958497 6.825686,13.685549 z"
- id="path3942"
- inkscape:connector-curvature="0" />
+ <g
+ id="g6344"
+ transform="matrix(0,-1.0678303,1,0,-1.0513636,17.902182)">
+ <path
+ style="fill:#6e6e6e;fill-opacity:1"
+ d="M 4.3978226,11.436911 1.875,8.8036522 l 0,-1.2959742 0,-1.295974
2.6141067,2.5044731 2.6141066,2.5044739 2.542143,-2.542144 2.5421437,-2.5421434
0,1.4439202 0,1.4439202 -2.6334272,2.522984 -2.6334275,2.522983
-2.5228227,-2.63326 z"
+ id="path6350"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#6e6e6e"
+ d="M 3.9134194,10.955202 1.875,8.785404 l 0,-1.28685 0,-1.28685
2.6141067,2.5044731 2.6141066,2.5044739 2.542143,-2.542144 2.5421437,-2.5421434
0,1.4558988 0,1.4558988 -2.169798,2.0384198 C 7.278991,13.659466
6.4369175,13.641342 3.9134194,10.955202 Z"
+ id="path6348"
+ inkscape:connector-curvature="0" />
+ </g>
</g>
</svg>
diff --git a/images/closed-rtl.svg b/images/closed-rtl.svg
index 9aa51a2..d65850b 100644
--- a/images/closed-rtl.svg
+++ b/images/closed-rtl.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
id="svg3912"
version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
width="16"
height="16"
sodipodi:docname="closed-rtl.svg">
@@ -23,6 +23,7 @@
<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>
@@ -42,28 +43,27 @@
id="namedview3914"
showgrid="false"
inkscape:zoom="14.75"
- inkscape:cx="8"
+ inkscape:cx="-3.8983051"
inkscape:cy="8"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
- inkscape:current-layer="g3964" />
+ inkscape:current-layer="svg3912" />
<g
id="g3964">
- <path
- style="fill:#777777"
- d="M 6.683,13.191011 3.9918176,10.382022 6.8006276,7.6910108 C
10.601722,4.0493314 13.201416,4.1365543 9.7027444,7.7883805 L
7.0313064,10.576761 9.7429259,13.28838 C 11.677639,15.223094 12.013268,16
10.914364,16 10.067264,16 8.1631503,14.735955 6.683,13.191011 z"
- id="path3970"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#6e6e6e"
- d="M 7.174314,13.685549 C 4.429903,10.764257 4.4492346,9.8660453
7.3144512,7.174314 10.772044,3.9260741 13.029094,4.4254515 9.7429259,7.7116195
L 7.0313064,10.423239 9.7027444,13.21162 C 11.598188,15.190036 11.934754,16
10.861405,16 10.029378,16 8.3701867,14.958497 7.174314,13.685549 z"
- id="path3968"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#656565"
- d="M 7.683,13.191011 4.9918176,10.382022 8.2422751,7.4410108 C
10.845888,5.0852642 11.045703,5.0103285 9.2463663,7.0644512 6.4668892,10.237502
6.460799,10.797144 9.174314,13.685549 10.370187,14.958497 11.129378,16
10.861405,16 10.593433,16 9.1631503,14.735955 7.683,13.191011 z"
- id="path3966"
- inkscape:connector-curvature="0" />
+ <g
+ transform="matrix(0,1,-1,0,18.712,2.358)"
+ id="g6423">
+ <path
+ style="fill:#6e6e6e;fill-opacity:1"
+ d="M 5.2239464,11.08674 2.53,8.4534812 2.53,7.157507 2.53,5.861533
5.3214223,8.3660061 8.1128446,10.87048 10.827422,8.328336 13.542,5.7861926 l
0,1.4439202 0,1.4439202 -2.812053,2.522984 L 7.9178929,13.72 5.2239464,11.08674
Z"
+ id="path6350"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#6e6e6e"
+ d="M 4.706686,10.605031 2.53,8.435233 l 0,-1.28685 0,-1.28685 L
5.3214223,8.3660061 8.1128446,10.87048 10.827422,8.328336 13.542,5.7861926 l
0,1.4558988 0,1.4558988 -2.316976,2.0384198 C 8.3005453,13.309295
7.4013537,13.291171 4.706686,10.605031 Z"
+ id="path6348"
+ inkscape:connector-curvature="0" />
+ </g>
</g>
</svg>
diff --git a/images/downarrow.svg b/images/downarrow.svg
index ce95300..8536858 100644
--- a/images/downarrow.svg
+++ b/images/downarrow.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
id="svg2995"
version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
width="28"
height="40"
sodipodi:docname="downarrow.svg">
@@ -23,7 +23,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -43,25 +43,25 @@
id="namedview2997"
showgrid="false"
inkscape:zoom="5.9"
- inkscape:cx="3.5254237"
+ inkscape:cx="-26.220339"
inkscape:cy="18.939449"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg2995" />
- <path
- style="fill:#ffffff"
- d="m 10.700319,20.482581 c -3.6090094,-4.722627 -3.5895224,-8.210525
0.02059,-3.684584 l 2.708581,3.395711 2.785257,-3.345392 C 18.170471,14.499278
19,14.062373 19,15.381347 c 0,1.033131 -1.262629,3.394974 -2.805842,5.248538 L
13.388316,24 10.70032,20.482581 z"
- id="path3886"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ffffff"
- d="M 10.184201,19.839131 C 6.9239846,15.488413 7.4658076,12.846501
10.79758,16.848316 l 2.785256,3.345392 2.708581,-3.395711 c 1.951839,-2.44699
2.708582,-2.852373 2.708582,-1.450969 0,2.125368 -4.013626,7.390445
-5.633818,7.390445 -0.555556,0 -1.987447,-1.304254 -3.18198,-2.898342 z"
- id="path3884"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ffffff"
- d="m 10.4506,18.677235 c -2.3531074,-3.260456 -2.4279584,-3.510681
-0.376139,-1.257406 3.169496,3.480687 3.728511,3.488314 6.61368,0.09023
1.271522,-1.497568 2.311858,-2.448289 2.311858,-2.112711 0,0.335576
-1.262629,2.126692 -2.805843,3.980256 L 13.388315,22.747717 10.4506,18.677232 z"
- id="path3882"
- inkscape:connector-curvature="0" />
+ <g
+ id="g6344"
+ transform="matrix(1.0678303,0,0,1,5.9978182,9.929829)"
+ style="fill:#ffffff">
+ <path
+ style="fill:#ffffff;fill-opacity:1"
+ d="M 4.3978226,11.436911 1.875,8.8036522 l 0,-1.2959742 0,-1.295974
2.6141067,2.5044731 2.6141066,2.5044739 2.542143,-2.542144 2.5421437,-2.5421434
0,1.4439202 0,1.4439202 -2.6334272,2.522984 -2.6334275,2.522983
-2.5228227,-2.63326 z"
+ id="path6350"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#ffffff"
+ d="M 3.9134194,10.955202 1.875,8.785404 l 0,-1.28685 0,-1.28685
2.6141067,2.5044731 2.6141066,2.5044739 2.542143,-2.542144 2.5421437,-2.5421434
0,1.4558988 0,1.4558988 -2.169798,2.0384198 C 7.278991,13.659466
6.4369175,13.641342 3.9134194,10.955202 Z"
+ id="path6348"
+ inkscape:connector-curvature="0" />
+ </g>
</svg>
diff --git a/images/open.svg b/images/open.svg
index 9290109..a801256 100644
--- a/images/open.svg
+++ b/images/open.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
id="svg3826"
version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
width="16"
height="16"
sodipodi:docname="open.svg">
@@ -42,29 +42,24 @@
id="namedview3828"
showgrid="false"
inkscape:zoom="14.75"
- inkscape:cx="8"
- inkscape:cy="8"
+ inkscape:cx="-3.8983051"
+ inkscape:cy="1.4177547"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
- inkscape:current-layer="g3880" />
+ inkscape:current-layer="svg3826" />
<g
- id="g3880"
- transform="translate(24.40678,-1.0169492)">
+ id="g6344"
+ transform="matrix(1.0678303,0,0,1,0.52781819,-0.350171)">
<path
- style="fill:#777777"
- d="m -19.173396,11.928186 c -3.613059,-3.7712203 -3.59355,-6.5564567
0.02061,-2.9422983 l 2.711619,2.7116203 2.788381,-2.6714388 c
1.957921,-1.8758076 2.78838,-2.2246953 2.78838,-1.171438 0,0.825
-1.264045,2.7110328 -2.808989,4.1911828 l -2.808989,2.691182 -2.691011,-2.80881
z"
- id="path3886"
+ style="fill:#6e6e6e;fill-opacity:1"
+ d="M 4.3978226,11.436911 1.875,8.8036522 l 0,-1.2959742 0,-1.295974
2.6141067,2.5044731 2.6141066,2.5044739 2.542143,-2.542144 2.5421437,-2.5421434
0,1.4439202 0,1.4439202 -2.6334272,2.522984 -2.6334275,2.522983
-2.5228227,-2.63326 z"
+ id="path6350"
inkscape:connector-curvature="0" />
<path
style="fill:#6e6e6e"
- d="m -19.690093,11.414363 c -3.263874,-3.474235 -2.721443,-5.5839146
0.614067,-2.3882938 l 2.78838,2.6714388 2.711619,-2.7116203 c
1.954028,-1.9540275 2.71162,-2.2777426 2.71162,-1.1586609 0,1.697198
-4.018128,5.9015872 -5.640137,5.9015872 -0.556179,0 -1.989676,-1.041503
-3.185549,-2.314451 z"
- id="path3884"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#656565"
- d="m -19.423396,10.486539 c -2.355747,-2.6036136 -2.430682,-2.8034288
-0.37656,-1.0040917 3.173051,2.7794777 3.732693,2.7855677 6.621098,0.072052
1.272948,-1.1958727 2.314451,-1.9550638 2.314451,-1.6870912 0,0.2679725
-1.264045,1.6982549 -2.808989,3.1784059 l -2.808989,2.691182
-2.941011,-3.250457 z"
- id="path3882"
+ d="M 3.9134194,10.955202 1.875,8.785404 l 0,-1.28685 0,-1.28685
2.6141067,2.5044731 2.6141066,2.5044739 2.542143,-2.542144 2.5421437,-2.5421434
0,1.4558988 0,1.4558988 -2.169798,2.0384198 C 7.278991,13.659466
6.4369175,13.641342 3.9134194,10.955202 Z"
+ id="path6348"
inkscape:connector-curvature="0" />
</g>
</svg>
diff --git a/images/uploadlogo.svg b/images/uploadlogo.svg
index 4c66405..276dbd4 100644
--- a/images/uploadlogo.svg
+++ b/images/uploadlogo.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
id="svg2985"
version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
width="26"
height="40"
sodipodi:docname="uploadlogo.svg">
@@ -23,7 +23,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -43,15 +43,52 @@
id="namedview2987"
showgrid="false"
inkscape:zoom="12.95"
- inkscape:cx="13"
- inkscape:cy="15.667704"
+ inkscape:cx="-0.55212355"
+ inkscape:cy="15.664896"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg2985" />
- <path
- style="fill:#ffffff"
- d="M 3.6736487,29.135119 C -2.1539453,23.423119 -0.82803125,12.236876
6.0923817,8.729178 15.638772,3.8904693 26,9.711877 26,19.914181 26,31.603607
12.064165,37.359203 3.6736487,29.135119 z M 20.511765,26.713457 C
29.839647,17.582256 15.735239,3.5842143 6.2148717,12.524381 c
-3.839359,3.605377 -4.661386,7.32455 -2.572535,11.639162 3.287285,6.790027
11.3006313,8.001291 16.8694283,2.549914 z m -8.424328,-2.535351 c 0,-3.025929
-0.212283,-3.35573 -1.490632,-2.315839 -2.3952343,1.948436 -1.9205663,-2.238832
0.496877,-4.383192 1.917954,-1.701296 2.057064,-1.701296 3.975018,0
2.417444,2.14436 2.892111,6.331628 0.496878,4.383192 -1.278349,-1.039891
-1.490632,-0.71009 -1.490632,2.315839 0,1.940629 -0.44719,3.528416
-0.993755,3.528416 -0.546565,0 -0.993754,-1.587787 -0.993754,-3.528416 z M
9.1061737,14.069924 c 0,-0.535723 1.7887573,-0.974042 3.9750173,-0.974042
2.18626,0 3.975018,0.438319 3.975018,0.974042 0,0.535724 -1.788758,0.974043
-3.975018,0.974043 -2.18626,0 -3.9750173,-0.438319 -3.9750173,-0.974043 z"
- id="path3025"
- inkscape:connector-curvature="0" />
+ <g
+ id="g10564"
+ style="fill:#ffffff">
+ <path
+ sodipodi:nodetypes="ssssssss"
+ inkscape:connector-curvature="0"
+ id="path3025"
+ d="M 3.6736487,29.135119 C -2.1539453,23.423119 -0.1704381,12.512868
6.401262,8.9608382 15.458885,4.0651576 26,9.711877 26,19.914181 26,31.603607
12.064165,37.359203 3.6736487,29.135119 Z M 20.512,26.713457 C
29.839882,17.582256 15.735239,3.5842143 6.2148717,12.524381 2.3755127,16.129758
1.5534857,19.848931 3.6423367,24.163543 6.9296217,30.95357 14.943203,32.164834
20.512,26.713457 Z"
+ style="fill:#ffffff" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path5201"
+ d="m 8.8572622,13.679 q 0.1345238,-0.375 0.5380952,-0.5
0.4035726,-0.125 0.9416666,-0.125 0.538094,0 1.076188,0 0.5381,0 1.076194,0
0.538094,0 1.076188,0 0.538094,0 1.076194,0 0.538094,0 1.076188,0 0.538094,0
0.941666,0.125 0.403572,0.125 0.538094,0.5 0.134528,0.375 0,0.75
-0.134522,0.375 -0.538094,0.5 -0.403572,0.125 -0.941666,0.125 -0.538094,0
-1.076188,0 -0.5381,0 -1.076194,0 -0.538094,0 -1.076188,0 -0.538094,0
-1.076194,0 -0.538094,0 -1.076188,0 -0.538094,0 -0.9416666,-0.125
-0.4035714,-0.125 -0.5380952,-0.5 -0.1345244,-0.375 0,-0.75"
+ style="fill:#ffffff;fill-opacity:1" />
+ <g
+ id="g10550"
+ style="fill:#ffffff">
+ <path
+ style="fill:#ffffff;fill-opacity:1"
+ d="m 12.21674,17.918357 c 0.08325,-0.229882 0.249766,-0.383138
0.499531,-0.459768 0.249765,-0.07663 0.499531,-0.07663 0.749296,0
0.249765,0.07663 0.416274,0.229886 0.499528,0.459768 0.08326,0.229886
0.249768,0.383142 0.499535,0.45977 0.249764,0.07663 0.416274,0.229882
0.499531,0.459764 0.08325,0.229891 0.249761,0.383151 0.499525,0.45978
0.249767,0.07663 0.416277,0.229884 0.49953,0.459771 0.08326,0.229884
0.291396,0.344827 0.624416,0.344827 l 0.49953,0 0,0.45977 -0.0415,0.999216
-0.207515,0.419935 -0.125633,-0.154784 c -0.161157,-0.19855 -0.416273,-0.229886
-0.49953,-0.459778 -0.08325,-0.229882 -0.249763,-0.383136 -0.49953,-0.459763
-0.249764,-0.07663 -0.416272,-0.229884 -0.499525,-0.459768 -0.08326,-0.229886
-0.291396,-0.344828 -0.624416,-0.344828 -0.33302,0 -0.541158,0.114942
-0.624415,0.344828 -0.08325,0.229884 -0.03642,0.43582 0.140495,0.617811 l
0.265377,0.272997 0.04683,-0.04306 0.04684,-0.04306 -0.09366,0.08619 c
-0.06244,0.05746 -0.114476,0.143669 -0.156103,0.258615 l -0.06244,0.172412
0.09366,-0.258622 0.09366,-0.258615 -0.12488,0.344825 c -0.08326,0.229884
-0.124885,0.498085 -0.124885,0.804603 l 0,0.919533 0,0.919545 0,0.919534
0,0.919539 c 0,0.306518 -0.04163,0.574722 -0.12488,0.804612 -0.08326,0.229881
-0.249767,0.383136 -0.499531,0.459763 -0.249765,0.07663 -0.49953,0.07663
-0.749295,0 -0.249766,-0.07663 -0.416276,-0.229882 -0.499531,-0.459763
-0.08326,-0.22989 -0.124882,-0.498094 -0.124882,-0.804612 l 0,-0.919539
0,-0.919534 0,-0.919545 0,-0.919533 c 0,-0.306518 -0.04163,-0.574719
-0.124883,-0.804603 l -0.124883,-0.344895 0.09366,0.258621 0.09366,0.258622
-0.06244,-0.172417 c -0.04163,-0.114942 -0.09366,-0.201147 -0.156104,-0.258616
l -0.09366,-0.0862 0.04682,0.04306 -0.493721,-0.729141 0.805917,0.499214 c
0.176924,-0.181978 0.223758,-0.38791 0.140503,-0.617795 -0.08325,-0.229885
-0.291392,-0.344827 -0.624413,-0.344827 -0.33302,0 -0.541158,0.114942
-0.624413,0.344827 -0.08325,0.229885 -0.249765,0.383142 -0.49953,0.459772
-0.249766,0.07663 -0.416276,0.229881 -0.4995309,0.459765 -0.083255,0.229887
-0.2497652,0.383144 -0.4995304,0.459769 l -0.3746479,0.114946 0,-0.459775
0,-0.919535 0,-0.459769 0.4995305,0 c 0.3330203,0 0.5411577,-0.114942
0.6244127,-0.344826 0.08326,-0.229887 0.249766,-0.383144 0.499531,-0.459772
0.249765,-0.07663 0.416275,-0.229888 0.49953,-0.459772 0.08325,-0.229886
0.249766,-0.383142 0.499531,-0.459769 0.249765,-0.07663 0.416275,-0.229883
0.49953,-0.459767"
+ id="path5245-6"
+ inkscape:connector-curvature="0"
+
sodipodi:nodetypes="cccsscccsccccsscssscccccscccsscccscsscscccsccccscccccssscscccccsscssc"
/>
+ <path
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ d="m 12.091858,17.005706 q 0.249765,-0.229885 0.624413,-0.344827
0.374648,-0.114941 0.749296,0 0.374647,0.114942 0.624413,0.344827
0.249765,0.22989 0.49953,0.459772 0.249765,0.229886 0.499531,0.459774
0.249765,0.229881 0.49953,0.45977 0.249765,0.229876 0.49953,0.459771
0.249766,0.229884 0.499531,0.459765 0.249765,0.229888 0.374644,0.574717 l
0.124886,0.344827 -0.49953,0 q -0.499531,0 -0.624416,-0.344827
-0.12488,-0.344829 -0.49953,-0.459773 -0.374645,-0.114944 -0.499525,-0.459769
-0.124886,-0.344835 -0.499531,-0.459774 -0.37465,-0.114937 -0.499535,-0.459767
-0.124881,-0.344828 -0.499528,-0.459767 -0.374648,-0.114947 -0.749296,0
-0.374648,0.114939 -0.499531,0.459767 -0.124882,0.34483 -0.49953,0.459767
-0.374648,0.114939 -0.499531,0.459774 -0.124882,0.344825 -0.49953,0.459769
-0.374648,0.114944 -0.49953,0.459773 -0.124883,0.344827 -0.6244135,0.344827 l
-0.4995305,0 0.1248826,-0.344827 q 0.1248826,-0.344829 0.3746479,-0.574717
0.2497652,-0.229881 0.4995305,-0.459765 0.249765,-0.229895 0.49953,-0.459771
0.249766,-0.229889 0.499531,-0.45977 0.249765,-0.229888 0.49953,-0.459774
0.249766,-0.229882 0.499531,-0.459772"
+ id="path5235-9"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#ffffff;fill-opacity:1;stroke:none"
+ d="m 10.960404,20.25116 c 0.08325,-0.229886 0.291393,-0.344829
0.624414,-0.344829 0.33302,0 0.541157,0.114943 0.624412,0.344829
0.08325,0.229885 0.356154,0.663455 0.108526,0.737335 l -0.514393,0.15347
0.04682,0.04305 0.04682,0.04306 -0.09366,-0.08619 c -0.06244,-0.05743
-0.135279,-0.08614 -0.218534,-0.08614 l -0.124883,0 0.187324,0 0.187324,0
-0.249765,0 c -0.16651,0 -0.33302,0.07663 -0.499531,0.22989 l -0.49953,0.45977
-0.499531,0.459767 c -0.1665099,0.15326 -0.33302,0.22989 -0.4995301,0.22989
-0.1665102,0 -0.2913928,-0.114943 -0.3746479,-0.344827 l -0.1248826,-0.34483
0.3746479,-0.114942 c 0.2497652,-0.07663 0.4162753,-0.229887
0.4995302,-0.459773 0.083255,-0.229885 0.2497655,-0.383141 0.4995305,-0.459767
0.249765,-0.07663 0.416276,-0.229889 0.499531,-0.459772"
+ id="path5259-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csssccccscccssccsscsscc" />
+ <path
+ style="fill:#ffffff;fill-opacity:1"
+ d="m 13.931105,20.193148 c 0.08325,-0.229883 0.291392,-0.344824
0.624412,-0.344824 0.33302,0 0.541158,0.114941 0.624414,0.344824
0.08325,0.229883 0.249765,0.383141 0.49953,0.459775 0.249764,0.07663
0.416275,0.229884 0.49953,0.459768 0.08326,0.229886 0.249765,0.383141
0.499531,0.459767 l 0.374646,0.114944 -0.124881,0.344825 c -0.08326,0.22989
-0.208139,0.344834 -0.374649,0.344834 -0.16651,0 -0.33302,-0.07663
-0.49953,-0.229886 l -0.49953,-0.459773 -0.499531,-0.459766 c
-0.16651,-0.153258 -0.33302,-0.229887 -0.49953,-0.229887 l -0.249766,0
0.187324,0 0.187325,0 -1.203962,1.195204 c -0.05787,0.05745 0.922976,-1.166473
0.860535,-1.109009 l -0.09366,0.0862 0.04683,-0.04306 0.04683,-0.04306
-0.721907,2.316612 c -0.176916,-0.182034 0.232788,-2.977603 0.316043,-3.207486"
+ id="path5261-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csscsccssscsscccscccccc" />
+ </g>
+ </g>
</svg>
diff --git a/js/mediawiki.searchSuggest.custom.js
b/js/mediawiki.searchSuggest.custom.js
index 2438d28..0134483 100644
--- a/js/mediawiki.searchSuggest.custom.js
+++ b/js/mediawiki.searchSuggest.custom.js
@@ -12,7 +12,8 @@
// element (not the search form, as that would leave
the buttons
// vertically between the input and the suggestions).
$searchRegion = $( '#simpleSearch, #simpleSearchSearch,
#searchInput' ).first(),
- $searchInput = $( '#searchInput' );
+ $searchInput = $( '#searchInput' ),
+ previousSearchText = $searchInput.val();
// Compatibility map
map = {
@@ -50,6 +51,39 @@
};
}
+ /**
+ * Callback that's run when the user changes the search input
text
+ * 'this' is the search input box (jQuery object)
+ * @ignore
+ */
+ function onBeforeUpdate() {
+ var searchText = this.val();
+
+ if ( searchText && searchText !== previousSearchText ) {
+ mw.track( 'mediawiki.searchSuggest',
'mediawiki.searchSuggest.custom', 'skins.metrolook.js', {
+ action: 'session-start'
+ } );
+ }
+ previousSearchText = searchText;
+ }
+
+ /**
+ * Callback that's run when suggestions have been updated
either from the cache or the API
+ * 'this' is the search input box (jQuery object)
+ * @ignore
+ */
+ function onAfterUpdate() {
+ var context = this.data( 'suggestionsContext' );
+
+ mw.track( 'mediawiki.searchSuggest',
'mediawiki.searchSuggest.custom', 'skins.metrolook.js', {
+ action: 'impression-results',
+ numberOfResults:
context.config.suggestions.length,
+ // FIXME: when other types of search become
available change this value accordingly
+ // See the API call below (opensearch = prefix)
+ resultSetType: 'prefix'
+ } );
+ }
+
// The function used to render the suggestions.
function renderFunction( text, context ) {
if ( !resultRenderCache ) {
@@ -67,6 +101,21 @@
.attr( 'title', text )
.addClass(
'mw-searchSuggest-link' )
);
+ }
+
+ // The function used when the user makes a selection
+ function selectFunction( $input ) {
+ var context = $input.data( 'suggestionsContext' ),
+ text = $input.val();
+
+ mw.track( 'mediawiki.searchSuggest',
'mediawiki.searchSuggest.custom', 'skins.metrolook.js', {
+ action: 'click-result',
+ numberOfResults:
context.config.suggestions.length,
+ clickIndex: context.config.suggestions.indexOf(
text ) + 1
+ } );
+
+ // allow the form to be submitted
+ return true;
}
function specialRenderFunction( query, context ) {
@@ -177,8 +226,16 @@
return;
}
- // Special suggestions functionality for skin-provided search
box
+ // Special suggestions functionality and tracking for
skin-provided search box
$searchInput.suggestions( {
+ update: {
+ before: onBeforeUpdate,
+ after: onAfterUpdate
+ },
+ result: {
+ render: renderFunction,
+ select: selectFunction
+ },
special: {
render: specialRenderFunction,
select: function ( $input ) {
@@ -195,4 +252,3 @@
} );
}( mediaWiki, jQuery ) );
-
diff --git a/js/metrolook.js b/js/metrolook.js
index 69c4be7..2556204 100644
--- a/js/metrolook.js
+++ b/js/metrolook.js
@@ -14,116 +14,119 @@
function is_touch_device() {
return !!('ontouchstart' in window);
}
+
$(document).ready(function() {
if(is_touch_device()) {
if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera
Mini/i.test(navigator.userAgent) ) {
- $('#usermenu > div').toggleClass('no-js js');
- $('#usermenu .js div').hide();
- $('#usermenu .js').click(function(e) {
- $('#usermenu .js div').fadeToggle(150);
- $('#usermenu').toggleClass('active');
- e.stopPropagation();
- });
- $(document).click(function() {
- if ($('#usermenu .js div').is(':visible')) {
- $('#usermenu .js div', this).fadeOut(150);
- $('#usermenu').removeClass('active');
+ $( '#usermenu > div' ).toggleClass( 'no-js js' );
+ $( '#usermenu .js div' ).hide();
+ $( '#usermenu .js' ).click(function(e) {
+ $( '#usermenu .js div' ).fadeToggle(150);
+ $( '#usermenu' ).toggleClass( 'active' );
+ e.stopPropagation();
+ });
+
+ $(document).click(function() {
+ if ($( '#usermenu .js div' ).is( ':visible' )) {
+ $( '#usermenu .js div',
this).fadeOut(150);
+ $( '#usermenu' ).removeClass( 'active'
);
+ }
+ });
+ }
}
- });
-}
-}
});
$(function () {
if(is_touch_device()) {
if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera
Mini/i.test(navigator.userAgent) ) {
- $('.actionmenu > div').toggleClass('no-js js');
- $('.actionmenu .js div').hide();
- $('.actionmenu .js').click(function(e) {
- $('.actionmenu .js div').fadeToggle(150);
- $('.clicker').toggleClass('active');
- e.stopPropagation();
- });
- $(document).click(function() {
- if ($('.actionmenu .js div').is(':visible')) {
- $('.actionmenu .js div', this).fadeOut(150);
- $('.clicker').removeClass('active');
+ $( '.actionmenu > div' ).toggleClass('no-js js');
+ $( '.actionmenu .js div' ).hide();
+ $( '.actionmenu .js' ).click(function(e) {
+ $( '.actionmenu .js div' ).fadeToggle(150);
+ $( '.clicker' ).toggleClass( 'active' );
+ e.stopPropagation();
+ });
+
+ $(document).click(function() {
+ if ($( '.actionmenu .js div' ).is( ':visible'
)) {
+ $( '.actionmenu .js div',
this).fadeOut(150);
+ $( '.clicker' ).removeClass( 'active' );
+ }
+ });
+ }
}
- });
-}
-}
});
$(function () {
- $('#hamburgerIcon').click(function(e) {
- $('#mw-panel').fadeToggle(150);
- $('.clicker').toggleClass('active');
- e.stopPropagation();
- });
- $('#hamburgerIcon').click(function() {
- if ($('#mw-panel').is(':visible')) {
- $('#mw-panel', this).fadeOut(150);
- $('.clicker').removeClass('active');
- }
- });
+ $( '#hamburgerIcon' ).click(function(e) {
+ $( '#mw-panel' ).fadeToggle(150);
+ $( '.clicker' ).toggleClass( 'active' );
+ e.stopPropagation();
+ });
+ $( '#hamburgerIcon' ).click(function() {
+ if ($( '#mw-panel' ).is( ':visible' )) {
+ $( '#mw-panel', this).fadeOut(150);
+ $( '.clicker' ).removeClass( 'active' );
+ }
+ });
});
$(function () {
- $('#hamburgerIcon').click(function(e) {
- $('#mw-panel-custom').fadeToggle(150);
- $('.clicker').toggleClass('active');
- e.stopPropagation();
- });
- $('#hamburgerIcon').click(function() {
- if ($('#mw-panel-custom').is(':visible')) {
- $('#mw-panel-custom', this).fadeOut(150);
- $('.clicker').removeClass('active');
- }
- });
+ $( '#hamburgerIcon' ).click(function(e) {
+ $( '#mw-panel-custom' ).fadeToggle(150);
+ $('.clicker').toggleClass('active');
+ e.stopPropagation();
+ });
+ $( '#hamburgerIcon' ).click(function() {
+ if ($( '#mw-panel-custom' ).is( ':visible' )) {
+ $( '#mw-panel-custom', this).fadeOut(150);
+ $( '.clicker' ).removeClass('active');
+ }
+ });
});
$(function () {
-if(is_touch_device()) {
- if( /Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera
Mini/i.test(navigator.userAgent) ) {
- $('#p-search').hide();
- $('img.searchbar').click(function(e) {
- $('#p-search').fadeToggle(150);
- $('.clicker').toggleClass('active');
- e.stopPropagation();
- });
- $('img.searchbar').click(function() {
- if ($('#p-search').is(':visible')) {
- $('#p-search', this).fadeOut(150);
- $('.clicker').removeClass('active');
+ if(is_touch_device()) {
+ if( /Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera
Mini/i.test(navigator.userAgent) ) {
+ $( '#p-search' ).hide();
+ $( 'img.searchbar' ).click(function(e) {
+ $( '#p-search' ).fadeToggle(150);
+ $('.clicker').toggleClass( 'active' );
+ e.stopPropagation();
+ });
+ $( 'img.searchbar').click(function() {
+ if ($( '#p-search' ).is( ':visible' )) {
+ $( '#p-search', this).fadeOut(150);
+ $( '.clicker' ).removeClass( 'active' );
+ }
+ });
+ }
}
- });
-}
-}
});
$(function () {
- $('img.editbutton').click(function(e) {
- $('#left-navigation').fadeToggle(150);
- $('.clicker').toggleClass('active');
- e.stopPropagation();
- });
- $('img.editbutton').click(function() {
- if ($('#left-navigation').is(':visible')) {
- $('#left-navigation', this).fadeOut(150);
- $('.clicker').removeClass('active');
- }
- });
+ $('img.editbutton').click(function(e) {
+ $('#left-navigation').fadeToggle(150);
+ $('.clicker').toggleClass('active');
+ e.stopPropagation();
+ });
+ $('img.editbutton').click(function() {
+ if ($('#left-navigation').is(':visible')) {
+ $('#left-navigation', this).fadeOut(150);
+ $('.clicker').removeClass('active');
+ }
+ });
});
$(function () {
- $('img.downarrow').click(function(e) {
- $( 'img.custom3' ).on( 'click', toggleDiv( 'bartile' ) );
- e.stopPropagation();
- });
- $('img.downarrow').click(function() {
- if ($('#bartile').is(':visible')) {
- $('#bartile', this).fadeOut(150);
- $('.clicker').removeClass('active');
- }
- });
+ $('img.downarrow').click(function(e) {
+ $( 'img.downarrow' ).on( 'click', toggleDiv( 'bartile' ) );
+ e.stopPropagation();
+ });
+ $('img.downarrow').click(function() {
+ if ($('#bartile').is(':visible')) {
+ $('#bartile', this).fadeOut(150);
+ $('.clicker').removeClass('active');
+ }
+ });
});
diff --git a/screen-hd.less b/screen-hd.less
index ded5289..b0ea298 100644
--- a/screen-hd.less
+++ b/screen-hd.less
@@ -16,9 +16,7 @@
#mw-panel {
padding-left: 0.5em;
}
-#p-search {
- margin-right: 3.5em;
-}
+
#left-navigation {
left: 190px;
}
diff --git a/skin.json b/skin.json
new file mode 100644
index 0000000..d879ca2
--- /dev/null
+++ b/skin.json
@@ -0,0 +1,120 @@
+{
+ "name": "Metrolook",
+ "version": "4.0 alpha 1",
+ "author": [
+ "immewnity",
+ "Paladox",
+ "Craig Davison",
+ "lagleki"
+ ],
+ "url": "https://www.mediawiki.org/wiki/Skin:Metrolook";,
+ "descriptionmsg": "metrolook-desc",
+ "namemsg": "skinname-metrolook",
+ "license-name": "GPL-2.0+",
+ "type": "skin",
+ "ConfigRegistry": {
+ "metrolook": "GlobalVarConfig::newInstance"
+ },
+ "ValidSkinNames": {
+ "metrolook": "Metrolook"
+ },
+ "MessagesDirs": {
+ "MetrolookTemplate": [
+ "i18n"
+ ]
+ },
+ "ExtensionMessagesFiles": {
+ "MetrolookTemplate": "Metrolook.i18n.php"
+ },
+ "AutoloadClasses": {
+ "SkinMetrolook": "SkinMetrolook.php",
+ "MetrolookTemplate": "MetrolookTemplate.php"
+ },
+ "ResourceModules": {
+ "skins.metrolook.styles": {
+ "styles": {
+ "screen.less": {
+ "media": "screen"
+ },
+ "screen-hd.less": {
+ "media": "screen and (min-width: 982px)"
+ }
+ }
+ },
+ "skins.metrolook.js": {
+ "scripts": [
+ "js/collapsibleTabs.js",
+ "js/metrolook.js",
+ "js/vector.js",
+ "js/mediawiki.searchSuggest.custom.js",
+ "js/overthrow.js"
+ ],
+ "position": "top",
+ "dependencies": [
+ "jquery.throttle-debounce",
+ "jquery.tabIndex",
+ "mediawiki.searchSuggest"
+ ]
+ },
+ "skins.metrolook.collapsibleNav": {
+ "position": "bottom",
+ "scripts": [
+ "js/collapsibleNav.js"
+ ],
+ "messages": [
+ "vector-collapsiblenav-more"
+ ],
+ "dependencies": [
+ "jquery.client",
+ "jquery.cookie",
+ "jquery.tabIndex"
+ ]
+ }
+ },
+ "ResourceFileModulePaths": {
+ "localBasePath": "",
+ "remoteSkinPath": "Metrolook"
+ },
+ "ResourceModuleSkinStyles": {
+ "metrolook": {
+ "jquery.tipsy": "skinStyles/jquery.tipsy.less",
+ "jquery.ui.core": [
+ "skinStyles/jquery.ui/jquery.ui.core.css",
+ "skinStyles/jquery.ui/jquery.ui.theme.css"
+ ],
+ "jquery.ui.accordion":
"skinStyles/jquery.ui/jquery.ui.accordion.css",
+ "jquery.ui.autocomplete":
"skinStyles/jquery.ui/jquery.ui.autocomplete.css",
+ "jquery.ui.button":
"skinStyles/jquery.ui/jquery.ui.button.css",
+ "jquery.ui.datepicker":
"skinStyles/jquery.ui/jquery.ui.datepicker.css",
+ "jquery.ui.dialog":
"skinStyles/jquery.ui/jquery.ui.dialog.css",
+ "jquery.ui.menu":
"skinStyles/jquery.ui/jquery.ui.menu.css",
+ "jquery.ui.progressbar":
"skinStyles/jquery.ui/jquery.ui.progressbar.css",
+ "jquery.ui.resizable":
"skinStyles/jquery.ui/jquery.ui.resizable.css",
+ "jquery.ui.selectable":
"skinStyles/jquery.ui/jquery.ui.selectable.css",
+ "jquery.ui.slider":
"skinStyles/jquery.ui/jquery.ui.slider.css",
+ "jquery.ui.spinner":
"skinStyles/jquery.ui/jquery.ui.spinner.css",
+ "jquery.ui.tabs":
"skinStyles/jquery.ui/jquery.ui.tabs.css",
+ "jquery.ui.tooltips":
"skinStyles/jquery.ui/jquery.ui.tooltips.css",
+ "mediawiki.notification":
"skinStyles/mediawiki.notification.less",
+ "+mediawiki.sectionAnchor":
"skinStyles/mediawiki.sectionAnchor.less",
+ "mediawiki.special":
"skinStyles/mediawiki.special.less",
+ "mediawiki.special.preferences":
"skinStyles/mediawiki.special.preferences.less"
+ }
+ },
+ "config": {
+ "VectorUseSimpleSearch": true,
+ "VectorUseIconWatch": true,
+ "MetrolookLogo": true,
+ "MetrolookSiteName": true,
+ "MetrolookSearchBar": true,
+ "MetrolookDownArrow": true,
+ "MetrolookLine": true,
+ "MetrolookUploadButton": true,
+ "MetrolookMobile": true,
+ "MetrolookBartile": true,
+ "MetrolookTile1": true,
+ "MetrolookTile2": true,
+ "MetrolookTile3": true,
+ "MetrolookTile4": true
+ }
+}
diff --git a/skinStyles/mediawiki.sectionAnchor.less
b/skinStyles/mediawiki.sectionAnchor.less
new file mode 100644
index 0000000..6a74810
--- /dev/null
+++ b/skinStyles/mediawiki.sectionAnchor.less
@@ -0,0 +1,45 @@
+@media screen {
+ .mw-headline-anchor {
+ margin-left: -16px;
+ width: 16px;
+ }
+
+ .mw-content-ltr .mw-headline-anchor,
+ .mw-content-rtl .mw-content-ltr .mw-headline-anchor {
+ /* @noflip */
+ margin-left: -16px;
+ /* @noflip */
+ margin-right: 0;
+ }
+
+ .mw-content-rtl .mw-headline-anchor,
+ .mw-content-ltr .mw-content-rtl .mw-headline-anchor {
+ /* @noflip */
+ margin-left: 0;
+ /* @noflip */
+ margin-right: -16px;
+ }
+}
+
+@media screen and (min-width: 982px) {
+ .mw-headline-anchor {
+ margin-left: -20px;
+ width: 20px;
+ }
+
+ .mw-content-ltr .mw-headline-anchor,
+ .mw-content-rtl .mw-content-ltr .mw-headline-anchor {
+ /* @noflip */
+ margin-left: -20px;
+ /* @noflip */
+ margin-right: 0;
+ }
+
+ .mw-content-rtl .mw-headline-anchor,
+ .mw-content-ltr .mw-content-rtl .mw-headline-anchor {
+ /* @noflip */
+ margin-left: 0;
+ /* @noflip */
+ margin-right: -20px;
+ }
+}
diff --git a/variables.less b/variables.less
index ee770b5..eff4a63 100644
--- a/variables.less
+++ b/variables.less
@@ -42,5 +42,5 @@
@collapsible-nav-heading-color: #4d4d4d;
@collapsible-nav-heading-collapsed-color: #0645ad;
-@collapsible-nav-heading-padding: 4px 0 3px 1em;
+@collapsible-nav-heading-padding: 4px 0 3px 1.1em;
@collapsible-nav-body-margin: 0 0 0 1.25em;
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/203496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3bcf27afb5196930d584e3371bf342a9c04584f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: test
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![http://www.pidgi.net/new/public/images/pidgiwiki.png"/](http://www.pidgi.net/new/public/images/pidgiwiki.png"/){kind=link}