From da6d4eb28051d1ab6fc54242047fff573af18d64 Mon Sep 17 00:00:00 2001
From: Volker E <volker.e@wikimedia.org>
Date: Wed, 14 Nov 2018 17:18:06 -0800
Subject: [PATCH] Remove unnecessary div wrapper on overflow menu

Unordered lists can be absolute positioned down to IE 7.
Outdated selector `.vectorMenu ul` remains for a release cycle
until HTML cache is renewed.

Bug: T209558
Change-Id: Id18ca9a8d705572b1f7e17920ef52b80e9aec373
---
 components/tabs.less        |  8 ++++++--
 includes/VectorTemplate.php | 32 ++++++++++++++------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/components/tabs.less b/components/tabs.less
index 06f4d506..7edd8d16 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -162,15 +162,18 @@
 }
 
 .vectorMenu .menu {
+	list-style: none none;
+	background-color: @body-background-color;
+	clear: both;
 	// Match the width of the dropdown "heading" (the tab)
 	min-width: 100%;
 	position: absolute;
 	top: 2.5em;
 	left: -1px;
-	background-color: @body-background-color;
+	margin: 0;
 	border: 1px solid #a2a9b1;
 	border-top-width: 0;
-	clear: both;
+	padding: 0;
 	box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 );
 	text-align: left;
 	display: none;
@@ -187,6 +190,7 @@
 	display: block;
 }
 
+// FIXME: `.vectorMenu ul` can be removed with purged HTML cache
 .vectorMenu ul {
 	list-style: none none;
 	padding: 0;
diff --git a/includes/VectorTemplate.php b/includes/VectorTemplate.php
index 0859db7e..e0ead467 100644
--- a/includes/VectorTemplate.php
+++ b/includes/VectorTemplate.php
@@ -357,15 +357,13 @@ class VectorTemplate extends BaseTemplate {
 						<h3 id="p-variants-label">
 							<span><?php echo htmlspecialchars( $variantLabel ) ?></span>
 						</h3>
-						<div class="menu">
-							<ul>
-								<?php
-								foreach ( $this->data['variant_urls'] as $key => $item ) {
-									echo $this->makeListItem( $key, $item );
-								}
-								?>
-							</ul>
-						</div>
+						<ul class="menu">
+							<?php
+							foreach ( $this->data['variant_urls'] as $key => $item ) {
+								echo $this->makeListItem( $key, $item );
+							}
+							?>
+						</ul>
 					</div>
 					<?php
 					break;
@@ -401,15 +399,13 @@ class VectorTemplate extends BaseTemplate {
 						<h3 id="p-cactions-label"><span><?php
 							$this->msg( 'vector-more-actions' )
 						?></span></h3>
-						<div class="menu">
-							<ul<?php $this->html( 'userlangattributes' ) ?>>
-								<?php
-								foreach ( $this->data['action_urls'] as $key => $item ) {
-									echo $this->makeListItem( $key, $item );
-								}
-								?>
-							</ul>
-						</div>
+						<ul class="menu"<?php $this->html( 'userlangattributes' ) ?>>
+							<?php
+							foreach ( $this->data['action_urls'] as $key => $item ) {
+								echo $this->makeListItem( $key, $item );
+							}
+							?>
+						</ul>
 					</div>
 					<?php
 					break;