From b1cd5c142f64c600a8d10435f78cce1b07f833d9 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Tue, 22 Jan 2019 16:39:20 -0600
Subject: [PATCH] Fix some styling issues

---
 packages/protocol/src/browser/modules/fs.ts | 40 +++++----------------
 packages/vscode/src/vscode.scss             | 27 ++++++++++++++
 scripts/webpack.general.config.js           |  6 ++--
 3 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/packages/protocol/src/browser/modules/fs.ts b/packages/protocol/src/browser/modules/fs.ts
index bad3e0e8..de71192c 100644
--- a/packages/protocol/src/browser/modules/fs.ts
+++ b/packages/protocol/src/browser/modules/fs.ts
@@ -694,10 +694,7 @@ class Stats implements fs.Stats {
 		this.birthtime = new Date(stats.birthtime);
 	}
 
-	public get dev(): number {
-		return this.stats.dev;
-	}
-
+	public get dev(): number { return this.stats.dev; }
 	public get ino(): number { return this.stats.ino; }
 	public get mode(): number { return this.stats.mode; }
 	public get nlink(): number { return this.stats.nlink; }
@@ -711,34 +708,13 @@ class Stats implements fs.Stats {
 	public get mtimeMs(): number { return this.stats.mtimeMs; }
 	public get ctimeMs(): number { return this.stats.ctimeMs; }
 	public get birthtimeMs(): number { return this.stats.birthtimeMs; }
-
-	public isFile(): boolean {
-		return this.stats._isFile;
-	}
-
-	public isDirectory(): boolean {
-		return this.stats._isDirectory;
-	}
-
-	public isBlockDevice(): boolean {
-		return this.stats._isBlockDevice;
-	}
-
-	public isCharacterDevice(): boolean {
-		return this.stats._isCharacterDevice;
-	}
-
-	public isSymbolicLink(): boolean {
-		return this.stats._isSymbolicLink;
-	}
-
-	public isFIFO(): boolean {
-		return this.stats._isFIFO;
-	}
-
-	public isSocket(): boolean {
-		return this.stats._isSocket;
-	}
+	public isFile(): boolean { return this.stats._isFile; }
+	public isDirectory(): boolean { return this.stats._isDirectory; }
+	public isBlockDevice(): boolean { return this.stats._isBlockDevice; }
+	public isCharacterDevice(): boolean { return this.stats._isCharacterDevice; }
+	public isSymbolicLink(): boolean { return this.stats._isSymbolicLink; }
+	public isFIFO(): boolean { return this.stats._isFIFO; }
+	public isSocket(): boolean { return this.stats._isSocket; }
 
 	public toObject(): object {
 		return JSON.parse(JSON.stringify(this));
diff --git a/packages/vscode/src/vscode.scss b/packages/vscode/src/vscode.scss
index 3a03ccb6..e4f56481 100644
--- a/packages/vscode/src/vscode.scss
+++ b/packages/vscode/src/vscode.scss
@@ -5,6 +5,20 @@
 	margin-bottom: 0;
 }
 
+.monaco-icon-label > .monaco-icon-label-description-container {
+	margin-right: auto;
+}
+
+.monaco-icon-label > .decorations-wrapper {
+	display: flex;
+	flex-direction: row;
+	padding-right: 12px;
+}
+
+.monaco-icon-label::after {
+	margin-left: initial;
+}
+
 // Using @supports to keep the Firefox fixes completely separate from vscode's
 // CSS that is tailored for Chrome.
 @supports (-moz-appearance:none) {
@@ -13,4 +27,17 @@
 		max-width: 100%;
 		width: auto;
 	}
+
+	.monaco-shell .screen-reader-detected-explanation .buttons a,
+	.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink,
+	.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-button {
+		max-width: -moz-fit-content;
+	}
+
+	.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fit,
+	.explorer-viewlet .panel-header .count,
+	.extensions-viewlet > .extensions .extension > .details > .header-container > .header > .version,
+	.debug-viewlet .debug-call-stack .stack-frame .label {
+		min-width: -moz-fit-content;
+	}
 }
diff --git a/scripts/webpack.general.config.js b/scripts/webpack.general.config.js
index 8b99ca74..424f2cc9 100644
--- a/scripts/webpack.general.config.js
+++ b/scripts/webpack.general.config.js
@@ -22,7 +22,7 @@ module.exports = (options = {}) => ({
 				loader: "ignore-loader",
 			}],
 		}, {
-			test: /electron-browser.+\.html$/,
+			test: /electron-browser.+\.html$|code\/electron-browser\/.+\.css/,
 			use: [{
 				loader: "ignore-loader",
 			}],
@@ -35,7 +35,9 @@ module.exports = (options = {}) => ({
 			}],
 			test: /(^.?|\.[^d]|[^.]d|[^.][^d])\.tsx?$/,
 		}, {
-			exclude: /test/,
+			// The CSS in code/electron-browser is supposed to be served in separate
+			// pages so including it interferes with styles in vscode.
+			exclude: /test|code\/electron-browser\/.+\.css/,
 			test: /\.s?css$/,
 			// This is required otherwise it'll fail to resolve CSS in common.
 			include: root,