Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/203483
Change subject: Improvements to Metrolook skin and bump version
......................................................................
Improvements to Metrolook skin and bump version
* Includes skin.json.
* Bump version to 3.0 rc 1.
Change-Id: I261882d0d165146e740ad0e720bfb53233dfb046
---
M .gitreview
M CHANGELOG.md
M Metrolook.php
M MetrolookTemplate.php
M README.md
M components/mobile.less
M components/personalMenu.less
M components/tabs.less
M composer.json
D i18n/oc.json
D i18n/ps.json
M i18n/qqq.json
M js/mediawiki.searchSuggest.custom.js
A skin.json
M theme.less
15 files changed, 179 insertions(+), 173 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/83/203483/1
diff --git a/.gitreview b/.gitreview
index db98503..ae14985 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
host=gerrit.wikimedia.org
port=29418
project=mediawiki/skins/Metrolook.git
-defaultbranch=master
+defaultbranch=REL1_25
defaultrebase=0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72d77fb..3a332d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
=========
+### 3.0 rc 1
+
+Improvement to mobile and desktop desgn.
+
+Includes skin.json. Requires MediaWiki 1.25+. Please read README.md on how to
use new extension registration
+
### 3.0 beta 16
Big release with new desgn for mobile and minor improvements to desktop desgn.
diff --git a/Metrolook.php b/Metrolook.php
index 16c7368..073885e 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' => '3.0 rc 1',
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPL-2.0+',
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 0982aab..e790d84 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -318,11 +318,12 @@
<?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 846bf39..1f1f6ed 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.25+.
-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.26, 1.24, 1.23, 1.22 or 1.21
please visit
+
+1.26
+
+https://github.com/paladox/Metrolook/tree/master
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.
@@ -38,6 +42,12 @@
```php
require_once "$IP/skins/Metrolook/Metrolook.php";
+```
+
+MediaWiki 1.25+ (optional)
+
+```php
+wfLoadSkin( 'Metrolook' );
```
## Settings
@@ -58,13 +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;`| |
-## Mobile desgn
-
-To test out the new mobile desgn please visit
https://github.com/paladox/Metrolook/tree/test
-
-It is in preview meaning there will be bugs and problems. Please report any
bugs or suggestion for the desgn.
-
-
$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
@@ -75,6 +78,14 @@
Note: Tile 5 to 10 is for when you disable bartile.
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
@@ -201,17 +212,17 @@
## 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.
@@ -221,6 +232,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 44ae0c0..cd063a8 100644
--- a/components/mobile.less
+++ b/components/mobile.less
@@ -614,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;
}
@@ -628,18 +629,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;
}
@@ -666,7 +663,7 @@
padding: 0;
margin: 0 auto;
line-height: 1.5em;
- background: #CF8B54;
+ background-color: #CF8B54;
width: 100%;
text-align: center;
}
@@ -675,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 {
@@ -758,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/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/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/i18n/oc.json b/i18n/oc.json
deleted file mode 100644
index 615b0e8..0000000
--- a/i18n/oc.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "@metadata": {
- "authors": [
- "Cedric31"
- ]
- },
- "metrolook-guest": "Convidat"
-}
diff --git a/i18n/ps.json b/i18n/ps.json
deleted file mode 100644
index ff25059..0000000
--- a/i18n/ps.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "@metadata": {
- "authors": [
- "Ahmed-Najib-Biabani-Ibrahimkhel"
- ]
- },
- "metrolook-desc": "د مېډياويکي مېټرولوک پوښۍ",
- "metrolook-guest": "مېلمه"
-}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1cbc7b0..ad6fc9d 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -2,11 +2,10 @@
"@metadata": {
"authors": [
"paladox",
- "Liuxinyu970226",
- "Umherirrender"
+ "Liuxinyu970226"
]
},
"skinname-metrolook": "{{optional}}",
- "metrolook-desc":
"{{desc|name=Metrolook|url=https://www.mediawiki.org/wiki/Skin:Metrolook}}";,
+ "metrolook-desc":
"{{desc|name=Metrolook|url=http://www.mediawiki.org/wiki/Skin:Metrolook}}";,
"metrolook-guest": "Used for descbribing you as a guest editing the
wiki.\n{{Identical|Guest}}"
}
diff --git a/js/mediawiki.searchSuggest.custom.js
b/js/mediawiki.searchSuggest.custom.js
index 2438d28..59eecb2 100644
--- a/js/mediawiki.searchSuggest.custom.js
+++ b/js/mediawiki.searchSuggest.custom.js
@@ -195,4 +195,3 @@
} );
}( mediaWiki, jQuery ) );
-
diff --git a/skin.json b/skin.json
new file mode 100644
index 0000000..eb6c292
--- /dev/null
+++ b/skin.json
@@ -0,0 +1,120 @@
+{
+ "name": "Metrolook",
+ "version": "3.0 rc 1",
+ "author": [
+ "immewnity",
+ "paladox2015",
+ "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/theme.less b/theme.less
index 466848a..02b1351 100644
--- a/theme.less
+++ b/theme.less
@@ -2,112 +2,6 @@
/* Top Bar colour and hover colour start */
-@import "mediawiki.mixins";
-#mw-page-base {
- height: 2.5em;
- background-color: dodgerBlue;
- 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: auto;
-}
-
-@media (max-width:768px) {
-#mw-page-base {
- height: 2.5em;
- background-color: dodgerBlue;
- 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: 24em;
-}
-}
-
-@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) and (orientation : portrait) {
-#mw-page-base {
- height: 2.5em;
- background-color: dodgerBlue;
- 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: 25em;
-}
-}
-
-@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) and (orientation : landscape) {
-#mw-page-base {
- height: 2.5em;
- background-color: dodgerBlue;
- 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;
-}
-}
-
-div.vectorTabs a:hover {
- background-color: blue;
-}
-
-div.onhoverbg:hover {
- background-color: blue;
-}
-
-img.downarrow:hover{
- background-color: blue;
-}
-
-div.vectorMenu:hover h5 a {
- background-color: blue;
-}
-
-div.vectorMenu h5 a {
- display: inline-block;
- width: 24px;
- height: 2em;
- background-color: dodgerBlue;
- .background-image-svg('images/arrow-down-icon.svg',
'images/arrow-down-icon.png');
- background-position: 50% 50%;
- background-repeat: no-repeat;
- .transition(background-position 250ms);
-}
-
-div.vectorMenu:hover {
- background-color: blue;
-}
-
-div.vectorMenu ul {
- border: solid 2px dodgerBlue;
- border-top: none;
-
-}
-
-ul {
- list-style-type: disc;
- .list-style-image-svg('images/bullet-circle-icon.svg',
'images/bullet-circle-icon.png');
-}
-
-@media (max-width: 768px) {
-#hamburgerIcon:hover {
- background-color: blue;
-}
-
-img.editbutton:hover {
- background-color: blue;
-}
-
-div.actionmenu ul {
- border-top: solid 2px dodgerBlue;
-}
-
-#left-navigation {
- background-color: dodgerBlue;
-}
-}
/* Top Bar colour and hover colour */
--
To view, visit https://gerrit.wikimedia.org/r/203483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I261882d0d165146e740ad0e720bfb53233dfb046
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
