Paladox has submitted this change and it was merged.
Change subject: Update Metrolook
......................................................................
Update Metrolook
Fix a bug in chrome where left navigation did not show properly. History is now
under action button because ther was no way around the bug for chrome.
Change-Id: I4f986f22362608d3b5e53a4c89fe0a01da340275
---
M Metrolook.php
M components/navigation.less
M screen-hd.less
3 files changed, 13 insertions(+), 2 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/Metrolook.php b/Metrolook.php
index 7b375ff..6d8f357 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -26,7 +26,7 @@
'path' => __FILE__,
'name' => 'Metrolook',
'description' => 'Metrolook skin for MediaWiki.',
- 'version' => '2.3.7',
+ 'version' => '2.3.8',
'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 3ed3c53..848fa46 100644
--- a/components/navigation.less
+++ b/components/navigation.less
@@ -46,6 +46,11 @@
/* Navigation Containers */
#left-navigation {
position: inherit;
+<<<<<<< HEAD
+=======
+ position:absolute;
+ position:initial;
+>>>>>>> Update Metrolook
left: 190px;
top: 0em;
}
@@ -54,8 +59,14 @@
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 2eb8049..d65cb0e 100644
--- a/screen-hd.less
+++ b/screen-hd.less
@@ -17,7 +17,7 @@
padding-left: 0.5em;
}
#p-search {
- margin-right: 1em;
+ margin-right: 8em;
}
#left-navigation {
left: 190px;
--
To view, visit https://gerrit.wikimedia.org/r/162115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f986f22362608d3b5e53a4c89fe0a01da340275
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
