Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166389
Change subject: Update Metrolook
......................................................................
Update Metrolook
* Fixes Bugs
* Renames theme.css to theme.less
`
Change-Id: I7cff4fe248275aa7bae0a7cfab89b3636897792e
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
M components/common.less
M components/navigation.less
M components/search.less
M screen.less
R theme.less
8 files changed, 201 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/89/166389/1
diff --git a/Metrolook.php b/Metrolook.php
index a2a3974..08ba2cc 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' => __FILE__,
'name' => 'Metrolook',
'description' => 'Metrolook skin for MediaWiki.',
- 'version' => '1.3.1',
+ 'version' => '1.3.3',
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPLv2+',
@@ -82,7 +82,6 @@
'styles' => array(
'Metrolook/screen.less' => array( 'media' => 'screen' ),
'Metrolook/screen-hd.less' => array( 'media' => 'screen and
(min-width: 982px)' ),
- 'Metrolook/theme.css' => array( 'media' => 'screen' ),
'Metrolook/special.less',
'Metrolook/special.preferences.less',
),
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index a69ae45..d46f1e8 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -152,7 +152,7 @@
z-index:100;
}
.tilebar {
- position: fixed;
+ position: relative;
left: 0px;
top: 0px;
right: 0px;
@@ -160,10 +160,10 @@
align:right;
color:#fff;
background:#1D1D1D;
- width:100%;
+ width:21474836.47em;
height:400px;
display:block;
- z-index:102;
+ z-index:9999999;
}
.tile:hover {
outline: 3px #4A4A4A solid;
@@ -333,7 +333,7 @@
<div style="vertical-align:top;align:left;">
<div class="topleft">
-<div
style="align:left;margin-left:auto;margin-right:auto;display:none;height:200px;"
class="tilebar" id="bartile"><div style="height:200px;display:table;"><div
style="vertical-align:middle;display:table-cell;padding-left:36px;">
+<div style="align:left;display:none;height:200px;" class="tilebar"
id="bartile"><div style="height:200px;display:table;"><div
style="vertical-align:middle;display:table-cell;padding-left:36px;">
<div style="float:left;padding:5px;"><div class="tile"><?php if ( $link1 ):
?><a href="http://www.pidgi.net/wiki/";><?php else: ?><a href="<?php echo
$GLOBALS['$url1'] ?>"><?php endif; ?><?php if ( $image1 ): ?><img
src="http://images.pidgi.net/pidgiwikitiletop.png"; /><?php else: ?><img
src="<?php echo $GLOBALS['$picture1'] ?>" /><?php endif; ?></a></div></div><div
style="float:left;padding:5px;"><div class="tile"><?php if ( $link2 ): ?><a
href="http://www.pidgi.net/press/";><?php else: ?><a href="<?php echo
$GLOBALS['$url2'] ?>"><?php endif; ?><?php if ( $image2 ): ?><img
src="http://images.pidgi.net/pidgipresstiletop.png"; /><?php else: ?><img
src="<?php echo $GLOBALS['$picture2'] ?>" /><?php endif; ?></a></div></div><div
style="float:left;padding:5px;"><div class="tile"><?php if ( $link3 ): ?><a
href="http://www.pidgi.net/jcc/";><?php else: ?><a href="<?php echo
$GLOBALS['$url3'] ?>"><?php endif; ?><?php if ( $image3 ): ?><img
src="http://images.pidgi.net/jcctiletop.png"; /><?php else: ?><img src="<?php
echo $GLOBALS['$picture3'] ?>" /><?php endif; ?></a></div></div><div
style="float:left;padding:5px;"><div class="tile"><?php if ( $link4 ): ?><a
href="http://www.petalburgwoods.com/";><?php else: ?><a href="<?php echo
$GLOBALS['$url4'] ?>"><?php endif; ?><?php if ( $image4 ): ?><img
src="http://images.pidgi.net/pwntiletop.png"; /><?php else: ?><img src="<?php
echo $GLOBALS['$picture4'] ?>" /><?php endif; ?></a></div></div><div
style="float:left;padding:5px;"><div class="tile"><?php if ( $link5 ): ?><a
href="<?php echo $GLOBALS['$url5'] ?>"><?php else: ?><?php endif; ?><?php if (
$image5 ): ?><img src="<?php echo $GLOBALS['$picture5'] ?>" /><?php else:
?><?php endif; ?></a></div></div><div style="float:left;padding:5px;"><div
class="tile"><?php if ( $link6 ): ?><a href="<?php echo $GLOBALS['$url6']
?>"><?php else: ?><?php endif; ?><?php if ( $image6 ): ?><img src="<?php echo
$GLOBALS['$picture6'] ?>" /><?php else: ?><?php endif; ?></a></div></div>
</div></div></div>
diff --git a/README.md b/README.md
index 6f30b73..a708032 100644
--- a/README.md
+++ b/README.md
@@ -190,6 +190,18 @@
background-image: url('images/page-fade.png');
}
+@media all and (max-width: 1000px) and (min-width: 700px) {
+ #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;
+}
+}
+
div.vectorTabs a:hover {
background-color: blue;
}
@@ -249,6 +261,7 @@
1.x.x requires MediaWiki 1.23.
+0.3.x requires MediaWiki 1.22.
## Removed things
diff --git a/components/common.less b/components/common.less
index 035e16c..bde62f4 100644
--- a/components/common.less
+++ b/components/common.less
@@ -30,7 +30,7 @@
/* Content */
div#content {
- margin-left: 10em;
+ margin-left: 10em;
padding-bottom: 1em;
padding-top:0em;
/* @embed */
@@ -43,8 +43,8 @@
height:auto;
position:absolute;
bottom:0px;
- right: 0px;
- left: 0px;
+ right: 0px;
+ left: 0px;
top:40px;
overflow:auto;
-webkit-overflow-scrolling: touch;
@@ -114,7 +114,7 @@
/* different screen sizes */
@media all and (max-width: 1000px) and (min-width: 700px) {
div#content {
- margin-left: 10em;
+ margin-left: 11em;
padding-bottom: 1em;
padding-top:0em;
/* @embed */
@@ -127,8 +127,8 @@
height:auto;
position:absolute;
bottom:0px;
- right:-60px;
- left:0px;
+ right:-60px;
+ left:0px;
top:40px;
overflow:auto;
-webkit-overflow-scrolling: touch;
diff --git a/components/navigation.less b/components/navigation.less
index aa0548f..b86af64 100644
--- a/components/navigation.less
+++ b/components/navigation.less
@@ -46,7 +46,7 @@
div#mw-head {
position: absolute;
top: 0;
- width: 100%;
+ min-width: 100%;
h5 {
margin: 0;
@@ -54,10 +54,10 @@
}
}
@media all and (max-width: 1000px) and (min-width: 700px) {
- div#mw-head {
- position: absolute;
- top: 0;
- width: 106%;
+div#mw-head {
+ position: absolute;
+ top: 0;
+ min-width: 106%;
h5 {
margin: 0;
@@ -97,11 +97,15 @@
/* Panel */
div#mw-panel {
- font-size: @menu-main-font-size;
- top: 40px;
- padding-top: 1em;
- width: 10em;
- left: 0;
+ position: absolute;
+ font-size: @menu-main-font-size;
+ top: 40px;
+ height: auto;
+ bottom: 0px;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
+ overflow: hidden;
div.portal {
margin: 0 0.6em 0 0.7em;
@@ -162,15 +166,92 @@
}
}
+@media all and (max-width: 1000px) and (min-width: 700px) {
+/* Panel */
+div#mw-panel {
+ position: absolute;
+ font-size: @menu-main-font-size;
+ top: 40px;
+ height: auto;
+ bottom: 0px;
+ padding-top: 1em;
+ width: 9.5em;
+ left: 0;
+ overflow: hidden;
+
+ 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 {
+ background-image: none;
+ margin-top: 0;
+ h5 {
+ display: none;
+ }
+ div.body {
+ margin-left: 0.5em;
+ }
+ }
+ }
+}
+}
+
/* Custom */
/* Panel */
div#mw-panel-custom {
- font-size: @menu-main-font-size;
- top: 40px;
- padding-top: 1em;
- width: 10em;
- left: 0;
+ position: absolute;
+ font-size: @menu-main-font-size;
+ top: 40px;
+ height: auto;
+ bottom: 0px;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
+ overflow: hidden;
div.portal-custom {
margin: 0 0.6em 0 0.7em;
@@ -233,3 +314,81 @@
}
}
}
+
+@media all and (max-width: 1000px) and (min-width: 700px) {
+/* Custom */
+
+/* Panel */
+div#mw-panel-custom {
+ position: absolute;
+ font-size: @menu-main-font-size;
+ top: 40px;
+ height: auto;
+ bottom: 0px;
+ padding-top: 1em;
+ width: 11em;
+ left: 0;
+ overflow: hidden;
+
+ 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 {
+ background-image: none;
+ margin-top: 0;
+ h5 {
+ display: none;
+ }
+ div.body-custom {
+ margin-left: 0.5em;
+ }
+ }
+ }
+}
+}
diff --git a/components/search.less b/components/search.less
index 610d36a..32507fb 100644
--- a/components/search.less
+++ b/components/search.less
@@ -136,7 +136,7 @@
display: block;
width: 156px;
height: 1.75em;
- margin-top: 0.6em;
+ margin-top: 0.65em;
margin-bottom: 0.5em;
position: relative;
min-height: 1px; /* Gotta trigger hasLayout for IE7 */
@@ -146,6 +146,7 @@
.background-image('images/search-fade.png');
background-position: top left;
background-repeat: repeat-x;
+ margin-bottom: 10px;
// Styles for both the search input and the button
input {
diff --git a/screen.less b/screen.less
index 51e96bd..eb5d2a1 100644
--- a/screen.less
+++ b/screen.less
@@ -8,3 +8,4 @@
@import "components/footer.less";
@import 'components/notifications.less';
@import "components/externalLinks.less";
+@import "theme.less";
diff --git a/theme.css b/theme.less
similarity index 100%
rename from theme.css
rename to theme.less
--
To view, visit https://gerrit.wikimedia.org/r/166389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cff4fe248275aa7bae0a7cfab89b3636897792e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_23
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![http://images.pidgi.net/pidgiwikitiletop.png"](http://images.pidgi.net/pidgiwikitiletop.png"){kind=link}
![http://images.pidgi.net/pidgipresstiletop.png"](http://images.pidgi.net/pidgipresstiletop.png"){kind=link}
![http://images.pidgi.net/jcctiletop.png"](http://images.pidgi.net/jcctiletop.png"){kind=link}
![http://images.pidgi.net/pwntiletop.png"](http://images.pidgi.net/pwntiletop.png"){kind=link}