jenkins-bot has submitted this change and it was merged.
Change subject: Fix toc
......................................................................
Fix toc
Bug: T105800
Change-Id: I1e7006a8ecbfe7bedfb06d9ea22bc8295b477ebe
---
M MetrolookTemplate.php
M components/common.less
M components/mobile.less
M components/navigation.less
M components/personalMenu.less
M components/tablet.less
6 files changed, 47 insertions(+), 43 deletions(-)
Approvals:
Paladox: Looks good to me, approved
Jack Phoenix: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 87b375b..4af9680 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -435,30 +435,6 @@
}
?>
- <?php
- if ( $this->config->get( 'MetrolookDownArrow' ) ) {
- ?>
- <div class="top-tile-bar-inner-container">
- <div class="topleft">
- <div class="tilebar"
id="bartile">
- <div
id="tilegrouptable">
- <div
id="tilegroup">
- <?php
- if (
$this->config->get( 'MetrolookBartile' ) ) {
-
echo $this->getTiles();
- } else {
-
echo $this->getTiles( 'metrolook-tiles-second' );
- }
- ?>
- </div>
- </div>
- </div>
- </div>
- </div>
- <?php
- }
- ?>
-
<div id="left-navigation">
<?php
if ( $this->config->get(
'MetrolookUploadButton' ) && $user->isAllowed( 'upload' ) ) {
@@ -556,6 +532,30 @@
<?php
}
?>
+
+ <?php
+ if ( $this->config->get( 'MetrolookDownArrow' ) ) {
+ ?>
+ <div class="top-tile-bar-inner-container">
+ <div class="topleft">
+ <div class="tilebar"
id="bartile">
+ <div
id="tilegrouptable">
+ <div
id="tilegroup">
+ <?php
+ if (
$this->config->get( 'MetrolookBartile' ) ) {
+
echo $this->getTiles();
+ } else {
+
echo $this->getTiles( 'metrolook-tiles-second' );
+ }
+ ?>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <?php
+ }
+ ?>
</div>
<div id="mw-panel-right" class="noprint">
diff --git a/components/common.less b/components/common.less
index 9908798..b1ab55a 100644
--- a/components/common.less
+++ b/components/common.less
@@ -111,7 +111,7 @@
color: black;
direction: ltr;
height: auto;
- position: absolute;
+ position: relative;
bottom: 0;
right: 0;
left: 0;
@@ -321,4 +321,4 @@
.spacer {
word-spacing: 4px;
-}
\ No newline at end of file
+}
diff --git a/components/mobile.less b/components/mobile.less
index faf47d5..d1bda8c 100644
--- a/components/mobile.less
+++ b/components/mobile.less
@@ -9,7 +9,7 @@
}
div#mw-head {
- position: absolute;
+ position: fixed;
top: 0;
min-width: 97%;
diff --git a/components/navigation.less b/components/navigation.less
index 25b4338..ad18219 100644
--- a/components/navigation.less
+++ b/components/navigation.less
@@ -23,7 +23,10 @@
/* 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: auto;
+ min-width: 100%;
+ position: fixed;
+ top: 0px;
+ z-index: 1;
}
#mw-head-base {
@@ -34,12 +37,14 @@
background-image: url(images/border.png);
background-position: bottom left;
background-repeat: repeat-x;
+ position: fixed;
}
div#mw-head {
- position: absolute;
+ position: fixed;
top: 0;
min-width: 100%;
+ z-index: 1;
h5 {
margin: 0;
@@ -102,7 +107,7 @@
/* Panel */
div#mw-panel {
font-size: @menu-main-font-size;
- position: absolute;
+ position: fixed;
top: 40px;
bottom: 0px;
height: auto;
@@ -112,6 +117,7 @@
padding-top: 1em;
width: 11em;
left: 0;
+ z-index: 1;
div.portal {
margin: 0 0.6em 0 0.7em;
@@ -177,7 +183,7 @@
/* Panel */
div#mw-panel-custom {
font-size: @menu-main-font-size;
- position: absolute;
+ position: fixed;
top: 40px;
bottom: 0;
height: auto;
@@ -188,6 +194,7 @@
padding-top: 1em;
width: 11em;
left: 0;
+ z-index: 1;
div.portal-custom {
margin: 0 0.6em 0 1.2em;
diff --git a/components/personalMenu.less b/components/personalMenu.less
index 221f207..73986b2 100644
--- a/components/personalMenu.less
+++ b/components/personalMenu.less
@@ -112,4 +112,4 @@
top: 40px;
right: 0px;
width: 200px;
-}
\ No newline at end of file
+}
diff --git a/components/tablet.less b/components/tablet.less
index 6771876..3609034 100644
--- a/components/tablet.less
+++ b/components/tablet.less
@@ -34,7 +34,7 @@
div#mw-panel {
font-size: @menu-main-font-size;
- position: absolute;
+ position: fixed;
top: 40px;
bottom: 0;
height: auto;
@@ -107,7 +107,7 @@
div#mw-panel-custom {
font-size: @menu-main-font-size;
- position: absolute;
+ position: fixed;
top: 40px;
bottom: 0;
height: auto;
@@ -193,7 +193,7 @@
color: black;
direction: ltr;
height: auto;
- position: absolute;
+ position: fixed;
bottom: 0;
right: 0em;
left: 0;
@@ -287,9 +287,8 @@
}
div#mw-head {
- position: absolute;
+ position: fixed;
top: 0;
- min-width: 99%;
h5 {
margin: 0;
@@ -304,7 +303,6 @@
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: 62em;
}
#p-search {
@@ -367,7 +365,7 @@
div#mw-panel {
font-size: @menu-main-font-size;
- position: absolute;
+ position: fixed;
top: 40px;
bottom: 0;
height: auto;
@@ -440,7 +438,7 @@
div#mw-panel-custom {
font-size: @menu-main-font-size;
- position: absolute;
+ position: fixed;
top: 40px;
bottom: 0;
height: auto;
@@ -526,7 +524,7 @@
color: black;
direction: ltr;
height: auto;
- position: absolute;
+ position: fixed;
bottom: 0;
right: 0;
left: 0;
@@ -620,9 +618,8 @@
}
div#mw-head {
- position: absolute;
+ position: fixed;
top: 0;
- min-width: 92.750%;
h5 {
margin: 0;
--
To view, visit https://gerrit.wikimedia.org/r/227170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e7006a8ecbfe7bedfb06d9ea22bc8295b477ebe
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Isarra <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Ricordisamoa <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
