From 1bb0a0e8fad47b6921c4cd380c230cf67b1d1de2 Mon Sep 17 00:00:00 2001
From: Jdlrobson <jrobson@wikimedia.org>
Date: Tue, 4 Oct 2022 00:37:13 +0000
Subject: [PATCH] Visual enhancements next: Fix alignments of icons

This reverts commit d1ef0d3aafd2f18433164767ac12906127a02ed7.

Reason for revert: Applying again without the impact on styles in
master.

Bug: T319070
Change-Id: I751168e1dc0f6235fd5ba881dc884941edbf4b77
---
 resources/common/mixins.less                           |  2 ++
 resources/skins.vector.styles/components/MenuTabs.less |  6 +++---
 .../skins.vector.styles/components/StickyHeader.less   |  4 ++++
 .../skins.vector.styles/components/UserLinks.less      | 10 ++++++++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/resources/common/mixins.less b/resources/common/mixins.less
index e4589927..c3eae1eb 100644
--- a/resources/common/mixins.less
+++ b/resources/common/mixins.less
@@ -8,6 +8,8 @@
 	background: url( ../common/images/arrow-down.svg ) 100% 50% no-repeat;
 	width: unit( 16 / @font-size-tabs / @font-size-browser, em );
 	height: unit( 16 / @font-size-tabs / @font-size-browser, em );
+	// https://phabricator.wikimedia.org/T319070#8284272
+	margin-left: -1px;
 }
 
 .mixin-vector-dropdown-menu-item() {
diff --git a/resources/skins.vector.styles/components/MenuTabs.less b/resources/skins.vector.styles/components/MenuTabs.less
index 0cad6b6d..4c66db42 100644
--- a/resources/skins.vector.styles/components/MenuTabs.less
+++ b/resources/skins.vector.styles/components/MenuTabs.less
@@ -93,9 +93,9 @@
 		.mw-list-item {
 			.mw-ui-icon {
 				// Align small icons with the bottom of the tabs.
-				// Height of tab is 41px, and small icon is 36px,
-				// With 1px border, 41 - 36 + 1;
-				margin: 4px 0 0 0;
+				// Height of tab is 38px, and small icon is 32px,
+				// With 2px border, 38 - 32 + 2
+				margin: 8px 0 0 0;
 			}
 		}
 	}
diff --git a/resources/skins.vector.styles/components/StickyHeader.less b/resources/skins.vector.styles/components/StickyHeader.less
index d8e52183..8817b2a7 100644
--- a/resources/skins.vector.styles/components/StickyHeader.less
+++ b/resources/skins.vector.styles/components/StickyHeader.less
@@ -42,6 +42,10 @@
 	&-context-bar {
 		display: flex;
 		align-items: center;
+
+		.vector-feature-visual-enhancement-next-enabled & {
+			column-gap: 8px;
+		}
 	}
 
 	&-start {
diff --git a/resources/skins.vector.styles/components/UserLinks.less b/resources/skins.vector.styles/components/UserLinks.less
index 94c83791..43ee2fda 100644
--- a/resources/skins.vector.styles/components/UserLinks.less
+++ b/resources/skins.vector.styles/components/UserLinks.less
@@ -66,12 +66,18 @@
 /**
  * Horizontal links menu - logged in and logged out.
  */
-// TODO: Remove vector-user-menu-more after I371bb11903d8cdd8f0da89266fcf549050c0da8c has been in prod for a week
-.vector-user-menu-more,
 .vector-user-menu-overflow {
+	.vector-feature-visual-enhancement-next-enabled & {
+		margin-right: 8px;
+	}
+
 	.vector-menu-content-list {
 		display: flex;
 		align-items: center;
+
+		.vector-feature-visual-enhancement-next-enabled & {
+			column-gap: 8px;
+		}
 	}
 
 	// Add margin to links that don't have the .mw-ui-button or related icon classes.