From eb144a161f7c3722f8b79201ce56aba179896324 Mon Sep 17 00:00:00 2001
From: Hutchy68 <Hutchy68@gmail.com>
Date: Sun, 5 Apr 2020 12:17:39 -0400
Subject: [PATCH] Multiple issues addressed on tracker.

---
 CHANGELOG.md                 |  8 +++++++-
 Pivot.skin.php               | 10 +++++-----
 assets/stylesheets/pivot.css | 22 ++++++++++++++++++++--
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a82fad..7b6e355 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
-## Version 2.2
+## Version 2.2.1
+* [bug] Syntax error in pivot.css Issue #89 
+* [bug] Personal tools menu name not translated into other languages Issue #88
+* [bug] Search autocomplete not available on small screens Issue #85
+* [bug] The links in the menu titles on the left seem to be clickable off they should not be. Issue #68 
+
+## Version 2.2.0
 * [compatibility, deprecated] Fix for deprecated wfSuppressWarnings and wfRestoreWarnings with new Wikimedia\...
 * [b/c break] Version minor bump, MW >= 1.31.0 now required
 * [enhancement] Use of requires MW version in skin.json
diff --git a/Pivot.skin.php b/Pivot.skin.php
index 2103f8e..93b2c5a 100644
--- a/Pivot.skin.php
+++ b/Pivot.skin.php
@@ -116,10 +116,10 @@ class pivotTemplate extends BaseTemplate {
       					<ul class="off-canvas-list">
 						
 								<li class="has-form">
-									<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform" class="mw-search">
+									<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform-offCanvas" class="mw-search">
 										<div class="row collapse">
 											<div class="small-12 columns">
-												<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput-offcanvas" autocomplete="off">
+												<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" class="mw-searchInput" autocomplete="off">
 											</div>
 										</div>
 									</form>
@@ -132,7 +132,7 @@ class pivotTemplate extends BaseTemplate {
 					<aside class="right-off-canvas-menu">
 					  <ul class="off-canvas-list">
 					<?php if ($wgUser->isLoggedIn()): ?>
-						<li id="personal-tools"><label>Personal</label></li>
+						<li id="personal-tools"><label><?php echo wfMessage( 'personaltools' )->text() ?></label></li>
 						<?php foreach ($this->getPersonalTools() as $key => $item) { echo $this->makeListItem($key, $item); } ?>
 							<?php else: ?>
 								<?php if (isset($this->data['personal_urls']['anonlogin'])): ?>
@@ -161,10 +161,10 @@ class pivotTemplate extends BaseTemplate {
 												<img alt="<?php echo $this->text('sitename'); ?>" src="<?php echo $this->text('logopath') ?>" style="max-width: 100%;height: auto;display: inline-block; vertical-align: middle;"></a>		
 											</li>
 											<li class="has-form">
-												<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform" class="mw-search">
+												<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform-sidebar" class="mw-search">
 													<div class="row collapse">
 														<div class="small-12 columns">
-															<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput" autocomplete="off">
+															<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" class="mw-searchInput" autocomplete="off">
 														</div>
 													</div>
 												</form>
diff --git a/assets/stylesheets/pivot.css b/assets/stylesheets/pivot.css
index 05b477b..3e58675 100644
--- a/assets/stylesheets/pivot.css
+++ b/assets/stylesheets/pivot.css
@@ -2,7 +2,7 @@ body { line-height: 1.6em; font-size: 16px; }
 
 p, ul, ol, dl { font-size: 16px; }
 
-h4,h5,h6 {color: 2e2e2e;}
+h4,h5,h6 {color: #2e2e2e;}
 
 #toc ul, .toc ul { font-size: 16px; }
 
@@ -66,6 +66,10 @@ body.action-formedit .row.hide-on-form-edit { display: none;}
 .mw-notification-area {
   margin-top: 2em;
 }
+/* MediaWiki Search Results */
+.mw-search-results {
+	max-width: 100%;
+}
 /* Also adjust z-index of action menu to force it on top */
 #p-cactions #drop1 {
     z-index: 1000;
@@ -218,9 +222,22 @@ ul#drop1.f-dropdown {
     color: #222;
     border-bottom: 1px solid #eee;
 }
-.mw-content-ltr ul {
+.mw-content-ltr ol, .mw-content-rtl .mw-content-ltr ol {
     margin: .5em 0 1em 2em;
 }
+.mw-content-ltr ul, .mw-content-rtl .mw-content-ltr ul {
+    margin: .5em 0 1em 2em;
+}
+.mw-content-ltr ul li > ul,
+.mw-content-rtl .mw-content-ltr ul li > ul  {
+    margin-bottom: .5em;
+    margin-left: 1em;
+}
+.mw-content-ltr ol li > ol,
+.mw-content-rtl .mw-content-ltr ol li > ol  {
+    margin-bottom: .5em;    
+    margin-left: 1em;
+}
 ul.accordion {
 	margin: 0;
 }
@@ -798,6 +815,7 @@ ul.side-nav label {
 	background: #517398;
     color: #fff;
     padding: .25em .5em;
+    pointer-events: none;
 }
 body {
 	background-color: #DCEAEA;