Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164647
Change subject: Revert "Update Metrolook"
......................................................................
Revert "Update Metrolook"
This reverts commit 9bfdec39419818ae47e7e30ce795c866e2fa47ac.
Change-Id: Ibe9dc812089c330c2b958cfc87349aa691608334
---
M Metrolook.php
M components/navigation.less
M screen-hd.less
3 files changed, 2 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/47/164647/1
diff --git a/Metrolook.php b/Metrolook.php
index 6d8f357..7b375ff 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -26,7 +26,7 @@
'path' => __FILE__,
'name' => 'Metrolook',
'description' => 'Metrolook skin for MediaWiki.',
- 'version' => '2.3.8',
+ 'version' => '2.3.7',
'url' => 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' => array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' => 'GPLv2+',
diff --git a/components/navigation.less b/components/navigation.less
index 848fa46..3ed3c53 100644
--- a/components/navigation.less
+++ b/components/navigation.less
@@ -46,11 +46,6 @@
/* Navigation Containers */
#left-navigation {
position: inherit;
-<<<<<<< HEAD
-=======
- position:absolute;
- position:initial;
->>>>>>> Update Metrolook
left: 190px;
top: 0em;
}
@@ -59,14 +54,8 @@
float: right;
top: 0px;
position: relative;
-<<<<<<< HEAD
margin-right: 20px;
margin-left: 1px;
-=======
- margin-right: 0px;
- margin-left: 1px;
-
->>>>>>> Update Metrolook
}
/* Logo */
diff --git a/screen-hd.less b/screen-hd.less
index d65cb0e..2eb8049 100644
--- a/screen-hd.less
+++ b/screen-hd.less
@@ -17,7 +17,7 @@
padding-left: 0.5em;
}
#p-search {
- margin-right: 8em;
+ margin-right: 1em;
}
#left-navigation {
left: 190px;
--
To view, visit https://gerrit.wikimedia.org/r/164647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe9dc812089c330c2b958cfc87349aa691608334
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
