From f5598457ce5384c658870eb3bbf8441f8b34b8a6 Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Mon, 5 Feb 2018 13:27:08 -0800 Subject: [PATCH 1/5] Fixes #42895 --- .../issue/issueReporterPage.ts | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts index 8a9bfbb128ba3..bee2756ffd57b 100644 --- a/src/vs/code/electron-browser/issue/issueReporterPage.ts +++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts @@ -87,17 +87,19 @@ export default (): string => `
- -
- - +
+ +
+ + +
+
+ + +
-
- - -
-
Try to reproduce the problem after .
-
If you suspect it's an extension issue, .
+
${escape(localize('disableExtensionsLabel', "Try to reproduce the problem after "))}.
+
${escape(localize('showRunningExtensionsLabel', "If you suspect it's an extension issue, "))}.
From 0c0faf628156333e6e0de1e9dfb72d8c2c53481c Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Mon, 5 Feb 2018 15:19:34 -0800 Subject: [PATCH 2/5] Issue reporter responsive CSS --- .../issue/issueReporterMain.ts | 19 ++- .../issue/issueReporterPage.ts | 52 ++++---- .../issue/media/issueReporter.css | 117 +++++++++++++----- .../issue/electron-main/issueService.ts | 2 + 4 files changed, 136 insertions(+), 54 deletions(-) diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts index 0f84e914e1faa..c0676aa709203 100644 --- a/src/vs/code/electron-browser/issue/issueReporterMain.ts +++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts @@ -249,15 +249,30 @@ export class IssueReporter extends Disposable { document.getElementById('github-submit-btn').addEventListener('click', () => this.createIssue()); - document.getElementById('disableExtensions').addEventListener('click', () => { + const disableExtensions = document.getElementById('disableExtensions'); + disableExtensions.addEventListener('click', () => { ipcRenderer.send('workbenchCommand', 'workbench.extensions.action.disableAll'); ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindow'); }); - document.getElementById('showRunning').addEventListener('click', () => { + disableExtensions.addEventListener('keydown', (e) => { + if (e.keyCode === 13 || e.keyCode === 32) { + ipcRenderer.send('workbenchCommand', 'workbench.extensions.action.disableAll'); + ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindow'); + } + }); + + const showRunning = document.getElementById('showRunning'); + showRunning.addEventListener('click', () => { ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions'); }); + showRunning.addEventListener('keydown', (e) => { + if (e.keyCode === 13 || e.keyCode === 32) { + ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions'); + } + }); + // Cmd+Enter or Mac or Ctrl+Enter on other platforms previews issue and closes window if (platform.isMacintosh) { let prevKeyWasCommand = false; diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts index bee2756ffd57b..14742da3b7362 100644 --- a/src/vs/code/electron-browser/issue/issueReporterPage.ts +++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts @@ -35,9 +35,11 @@ export default (): string => `
${escape(localize('systemInfo', "My System Info"))} - - - +
+ + + +
@@ -47,9 +49,11 @@ export default (): string => `
${escape(localize('processes', "Currently Running Processes"))} - - - +
+ + + +
@@ -59,9 +63,11 @@ export default (): string => `
${escape(localize('workspaceStats', "My Workspace Stats"))} - - - +
+ + + + 
 						
@@ -73,9 +79,11 @@ export default (): string => `
 			

 				

 					${escape(localize('extensions', "My Extensions"))}
-						
-							
-						
+						

+							
+								
+							
+						

 					
 					

 						
@@ -89,17 +97,19 @@ export default (): string => `
 		

 			

 				
-				

-					
-					
-				

-				

-					
-					
+				

+					

+						
+						
+					

+					

+						
+						
+					

 				

 			

-			
${escape(localize('disableExtensionsLabel', "Try to reproduce the problem after "))}.

-			
${escape(localize('showRunningExtensionsLabel', "If you suspect it's an extension issue, "))}.

+			
${escape(localize('disableExtensionsLabel', "Try to reproduce the problem after "))}${escape(localize('disableExtensions', "disabling all extensions and reloading the window"))}.

+			
${escape(localize('showRunningExtensionsLabel', "If you suspect it's an extension issue, "))}${escape(localize('showRunningExtensions', "see all running extensions"))}.

 		

 	

 
diff --git a/src/vs/code/electron-browser/issue/media/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css
index b371ab153e9ce..68d68d5090b2b 100644
--- a/src/vs/code/electron-browser/issue/media/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -34,25 +34,8 @@ td {
 	margin-bottom: 1.5em;
 }
 
-#issue-type-label {
-	width: 12%;
-}
-
-#issue-type {
-	width: calc(88% - 5px);
-}
-
-#issue-title-label {
-	width: 10%;
-	display: inline-block
-}
-
-#issue-title {
-	width: calc(90% - 5px);
-}
-
 #similar-issues {
-	margin-left: 67px;
+	margin-left: 10%;
 	display: block;
 }
 
@@ -183,13 +166,32 @@ button:disabled {
 	margin-bottom: 1em;
 }
 
-.choice {
-	display: inline-block;
-	margin: 0 5px;
+.extensions-form {
+	display: flex;
 }
 
-.choice > label, .choice > input {
+.extensions-form > .form-buttons {
+	display: flex;
+	margin-left: 20px;
+}
+
+.extensions-form > .form-buttons > .choice {
+	margin-right: 30px;
+	position: relative;
+}
+
+.extensions-form > .form-buttons > .choice > label, .extensions-form  > .form-buttons > .choice > input {
 	cursor: pointer;
+	height: 100%;
+	margin-top: 1px;
+}
+
+.extensions-form > .form-buttons > .choice > label {
+	position: absolute;
+	top: 50%;
+	margin-top: -50%;
+	left: 20px;
+	margin-right: 10px;
 }
 
 .system-info {
@@ -212,11 +214,18 @@ summary {
 	margin-top: 1em;
 }
 
-.caption {
+.include-data {
+	display: inline-block;
+	position: relative;
+}
+
+.include-data > .caption {
 	display: inline-block;
 	font-size: 12px;
-	vertical-align: middle;
-	height: 18px;
+	position: absolute;
+	width: 80px;
+	top: 2px;
+	left: 30px;
 }
 
 .sendData {
@@ -245,14 +254,9 @@ input:disabled {
 	margin-top: .5em;
 }
 
-.workbenchCommand {
-	padding: 0;
-	font-size: 12px;
-	background: transparent;
-}
-
 .workbenchCommand:disabled {
 	color: #868e96;
+	cursor: pointer;
 }
 
 .block-extensions .block-info {
@@ -281,4 +285,55 @@ a {
 button {
 	background-color: #007ACC;
 	color: #fff;
+}
+
+#issue-type-label {
+	width: 95px;
+}
+
+#issue-type {
+	width: calc(100% - 100px);
+}
+
+#issue-title-label {
+	width: 80px;
+	display: inline-block;
+}
+
+#issue-title {
+	width: calc(100% - 85px);
+}
+
+
+@media (max-width: 950px) {
+	#issue-type-label {
+		width: 12%;
+	}
+
+	#issue-type {
+		width: calc(88% - 5px);
+	}
+
+	#issue-title-label {
+		width: 10%;
+		display: inline-block
+	}
+
+	#issue-title {
+		width: calc(90% - 5px);
+	}
+}
+
+@media (max-width: 550px) {
+	#issue-title-label, #issue-type-label {
+		display: none !important;
+	}
+
+	#issue-type, #issue-title {
+		width: 100%;
+	}
+
+	#similar-issues {
+		margin-left: 0;
+	}
 }
\ No newline at end of file
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index 63dcd59fad772..f8c861aa32a4e 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -51,6 +51,8 @@ export class IssueService implements IIssueService {
 		this._issueWindow = new BrowserWindow({
 			width: position.width,
 			height: position.height,
+			minWidth: 300,
+			minHeight: 200,
 			x: position.x,
 			y: position.y,
 			title: localize('issueReporter', "Issue Reporter"),

From e5b2ee69fdba6cfc340dd00dc2a89fc2c63e8d15 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane 
Date: Mon, 5 Feb 2018 16:17:48 -0800
Subject: [PATCH 3/5] Move 'no' option over slightly

---
 src/vs/code/electron-browser/issue/media/issueReporter.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/media/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css
index 68d68d5090b2b..f1292efc571f7 100644
--- a/src/vs/code/electron-browser/issue/media/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -176,7 +176,7 @@ button:disabled {
 }
 
 .extensions-form > .form-buttons > .choice {
-	margin-right: 30px;
+	margin-right: 35px;
 	position: relative;
 }
 
@@ -191,7 +191,6 @@ button:disabled {
 	top: 50%;
 	margin-top: -50%;
 	left: 20px;
-	margin-right: 10px;
 }
 
 .system-info {

From 0279168a527628139d9394feaca4dc2c7a42d637 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane 
Date: Mon, 5 Feb 2018 17:15:41 -0800
Subject: [PATCH 4/5] Increase width at which labels are hidden

---
 src/vs/code/electron-browser/issue/media/issueReporter.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/code/electron-browser/issue/media/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css
index f1292efc571f7..e5e13bf685f73 100644
--- a/src/vs/code/electron-browser/issue/media/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -323,7 +323,7 @@ button {
 	}
 }
 
-@media (max-width: 550px) {
+@media (max-width: 620px) {
 	#issue-title-label, #issue-type-label {
 		display: none !important;
 	}

From 19e7eaf49de0acd94ab4fce386e3f8a0e44f2ea6 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane 
Date: Mon, 5 Feb 2018 18:07:24 -0800
Subject: [PATCH 5/5] Increase the initial width of the reporter to 800

---
 src/vs/platform/issue/electron-main/issueService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index f8c861aa32a4e..06355038ac580 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -97,7 +97,7 @@ export class IssueService implements IIssueService {
 		}
 
 		let state = {
-			width: 750,
+			width: 800,
 			height: 900,
 			x: undefined,
 			y: undefined