From b2519cb240f8aa1aabf53753c7711f9d9d46333f Mon Sep 17 00:00:00 2001
From: Isarra <zhorishna@gmail.com>
Date: Tue, 20 Aug 2019 19:44:03 +0000
Subject: [PATCH] Fix a bunch of VE alignment issues

Bug: T205149
Change-Id: I7a839fa95b42cfd541da5880ad70a76be607c7d8
---
 resources/extensions/VisualEditor.core.less | 47 ++++++++++-----------
 resources/screen-mobile.less                |  2 +-
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/resources/extensions/VisualEditor.core.less b/resources/extensions/VisualEditor.core.less
index 004c8e6..5c6742c 100644
--- a/resources/extensions/VisualEditor.core.less
+++ b/resources/extensions/VisualEditor.core.less
@@ -1,40 +1,39 @@
 @import '../variables.less';
 
 @media screen {
-	.ve-ui-toolbar,
-	.ve-ui-overlay-global,
-	.ve-ui-overlay-local {
-		font-size: 0.842105em;
-	}
-
-	.ve-init-mw-desktopArticleTarget-toolbar {
-		margin: -0.875em -2.375em 0;
-	}
+	@media ( min-width: @desktop-small-floor ) {
+		.ve-init-mw-desktopArticleTarget-toolbar {
+			margin: -1.125em -@content-padding 0;
+		}
 
-	// Still need a way to make it show up right away (instead of initially disappearin under the page header)
-	.ve-ui-toolbar-floating > .oo-ui-toolbar-bar {
-		top: @fixed-header-height + @color-height;
-	}
+		.ve-ui-toolbar-floating > .oo-ui-toolbar-bar {
+			top: @fixed-header-height + @color-height;
+		}
 
-	// Make the gutter area clickable (T162838)
-	.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface {
-		margin-left: -@content-padding;
-		margin-right: -@content-padding;
-	}
+		// Make the gutter area clickable (T162838)
+		.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface {
+			margin-left: -@content-padding;
+			margin-right: -@content-padding;
+		}
 
-	.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ce-documentNode,
-	.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ui-surface-placeholder {
-		padding-left: @content-padding;
-		padding-right: @content-padding;
+		.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ce-documentNode,
+		.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ui-surface-placeholder {
+			padding-left: @content-padding;
+			padding-right: @content-padding;
+		}
 	}
 
 	@media ( min-width: @desktop-small-floor ) and ( max-width: @desktop-small-width ) {
-		.ve-ui-toolbar {
-			margin-top: -0.5em;
+		.ve-init-mw-desktopArticleTarget-toolbar {
+			margin-top: -0.285em;
 		}
 	}
 
 	@media ( max-width: @mobile-width ) {
+		.ve-init-mw-desktopArticleTarget-toolbar {
+			margin: -0.125em -0.45em 0;
+		}
+
 		.ve-ui-toolbar-floating > .oo-ui-toolbar-bar {
 			top: 0;
 		}
diff --git a/resources/screen-mobile.less b/resources/screen-mobile.less
index 927f0b5..8de8c2e 100644
--- a/resources/screen-mobile.less
+++ b/resources/screen-mobile.less
@@ -275,7 +275,6 @@ div.thumb {
 }
 
 .mw-body {
-	overflow: auto;
 	border: 0;
 
 	/* Keep images from overflowing */
@@ -287,6 +286,7 @@ div.thumb {
 
 #mw-content {
 	padding: @content-padding;
+	border-width: 0;
 }
 
 #mw-content-block {