From dff22a07121d40e2e5294cf860cfea9622a9d751 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 14 May 2021 09:23:12 -0700
Subject: [PATCH] Fix double border on vertical splits

Fixes #123372
---
 .../contrib/terminal/browser/media/terminal.css   | 15 ++++++++++++---
 .../contrib/terminal/browser/terminalView.ts      |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/media/terminal.css b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
index dafce425e7c..00f31fc01a0 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/terminal.css
+++ b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
@@ -78,12 +78,21 @@
 	overflow: hidden;
 }
 
-/* border-color is set by theme key terminal.border */
-.monaco-workbench .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:first-child) {
+.monaco-workbench .pane-body.integrated-terminal .split-view-view:first-child .tabs-container {
+	border-right-width: 1px;
+	border-right-style: solid;
+}
+.monaco-workbench .pane-body.integrated-terminal .split-view-view:last-child .tabs-container {
 	border-left-width: 1px;
 	border-left-style: solid;
 }
-.monaco-workbench .pane-body.integrated-terminal .monaco-split-view2.vertical .split-view-view:not(:first-child) {
+
+/* border-color is set by theme key terminal.border */
+.monaco-workbench .pane-body.integrated-terminal .terminal-group .monaco-split-view2.horizontal .split-view-view:not(:first-child) {
+	border-left-width: 1px;
+	border-left-style: solid;
+}
+.monaco-workbench .pane-body.integrated-terminal .terminal-group .monaco-split-view2.vertical .split-view-view:not(:first-child) {
 	border-top-width: 1px;
 	border-top-style: solid;
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index 35849caac37..6bcd9c5aa5e 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -294,6 +294,7 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
 	const borderColor = theme.getColor(TERMINAL_BORDER_COLOR);
 	if (borderColor) {
 		collector.addRule(`.monaco-workbench .pane-body.integrated-terminal .split-view-view:not(:first-child) { border-color: ${borderColor.toString()}; }`);
+		collector.addRule(`.monaco-workbench .pane-body.integrated-terminal .tabs-container { border-color: ${borderColor.toString()}; }`);
 	}
 });