Paladox has submitted this change and it was merged.
Change subject: Update Metrolook
......................................................................
Update Metrolook
* Includes some changes and also includes translation updates.
Change-Id: I983e71218cfb17845ace40764bb676b2b284bd4b
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
M components/common.less
M components/navigation.less
M composer.json
M skinStyles/jquery.ui/jquery.ui.core.css
7 files changed, 54 insertions(+), 31 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/Metrolook.php b/Metrolook.php
index 2fcacfc..46fd0e3 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' => __FILE__,
'name' => 'Metrolook',
'descriptionmsg' => 'metrolook-desc',
- 'version' => '3.0 beta 12',
+ 'version' => '3.0 beta 13',
'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 adf5564..1a592e1 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -276,7 +276,7 @@
?>
<div id="jump-to-nav" class="mw-jump">
<?php $this->msg( 'jumpto' ) ?>
- <a href="#mw-navigation"><?php
+ <a href="#mw-head"><?php
$this->msg( 'jumptonavigation' )
?></a><?php
$this->msg( 'comma-separator' )
diff --git a/README.md b/README.md
index 9c12b46..50ca130 100644
--- a/README.md
+++ b/README.md
@@ -192,24 +192,34 @@
/* Top Bar colour and hover colour start */
#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;
+ 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 only screen and (min-device-width : 768px) and (max-device-width :
1024px) {
+@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:65em;
+ 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:65em;
+}
+}
+@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:65em;
}
}
diff --git a/components/common.less b/components/common.less
index b2dd767..9691789 100644
--- a/components/common.less
+++ b/components/common.less
@@ -300,6 +300,7 @@
position: relative;
line-height: @content-line-height;
font-size: @content-font-size;
+ z-index: 0;
}
.hoverbox {
diff --git a/components/navigation.less b/components/navigation.less
index cd23511..7d036a3 100644
--- a/components/navigation.less
+++ b/components/navigation.less
@@ -21,7 +21,19 @@
.vertical-gradient(#CF8B54, #CF8B54, 50%, 100%);
min-width: auto;
}
-@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) {
+@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) and (orientation : portrait) {
+#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');
+ .vertical-gradient(#CF8B54, #CF8B54, 50%, 100%);
+ min-width:65em;
+}
+}
+@media only screen and (min-device-width : 768px) and (max-device-width :
1024px) and (orientation : landscape) {
#mw-page-base {
height: 2.5em;
background-color: #CF8B54;
diff --git a/composer.json b/composer.json
index 94d9b3e..41c2333 100644
--- a/composer.json
+++ b/composer.json
@@ -10,18 +10,18 @@
"homepage" : "https://www.mediawiki.org/wiki/Skin:Metrolook";,
"license" : "GPL-2.0+",
"authors" : [
- {
+ {
"name" : "immewnity"
- },
- {
- "name" : "paladox2015"
- },
- {
- "name": "Craig Davison"
- },
- {
- "name" : "lagleki"
- }
+ },
+ {
+ "name" : "paladox2015"
+ },
+ {
+ "name" : "Craig Davison"
+ },
+ {
+ "name" : "lagleki"
+ }
],
"support" : {
"wiki" : "https://www.mediawiki.org/wiki/Skin:Metrolook";,
diff --git a/skinStyles/jquery.ui/jquery.ui.core.css
b/skinStyles/jquery.ui/jquery.ui.core.css
index 2e088ca..d4f7db3 100644
--- a/skinStyles/jquery.ui/jquery.ui.core.css
+++ b/skinStyles/jquery.ui/jquery.ui.core.css
@@ -14,7 +14,7 @@
.ui-helper-hidden { display: none; }
.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px;
margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height:
1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display:
table; }
+.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display:
table; border-collapse: collapse; }
.ui-helper-clearfix:after { clear: both; }
.ui-helper-clearfix { zoom: 1; }
.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position:
absolute; opacity: 0; filter:Alpha(Opacity=0); }
--
To view, visit https://gerrit.wikimedia.org/r/179621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I983e71218cfb17845ace40764bb676b2b284bd4b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
