Revert "remove status icons and adopt octicons"

sandy081 · sandy081 · commit 69ec81be9f2a · 2019-06-05T19:16:12.000+02:00
This reverts commit d0e1fe5.
diff --git a/src/vs/base/browser/ui/severityIcon/media/severityIcon.css b/src/vs/base/browser/ui/severityIcon/media/severityIcon.css
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.severity-icon {
+	height: 16px;
+	width: 16px;
+}
+
+.severity-icon.warning {
+	background: url('status-warning.svg') center center no-repeat;
+}
+
+.severity-icon.error {
+	background: url('status-error.svg') center center no-repeat;
+}
+
+.severity-icon.info {
+	background: url('status-info.svg') center center no-repeat;
+}
+
+.vs-dark .severity-icon.warning {
+	background: url('status-warning-inverse.svg') center center no-repeat;
+}
+
+.vs-dark .severity-icon.error {
+	background: url('status-error-inverse.svg') center center no-repeat;
+}
+
+.vs-dark .severity-icon.info {
+	background: url('status-info-inverse.svg') center center no-repeat;
+}
diff --git a/src/vs/base/browser/ui/severityIcon/media/status-error-inverse.svg b/src/vs/base/browser/ui/severityIcon/media/status-error-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16"><circle cx="8" cy="8" r="6" fill="#1E1E1E"/><path d="M8 3C5.238 3 3 5.238 3 8s2.238 5 5 5 5-2.238 5-5-2.238-5-5-5zm3 7l-1 1-2-2-2 2-1-1 2-2.027L5 6l1-1 2 2 2-2 1 1-2 1.973L11 10z" fill="#F48771"/><path fill="#252526" d="M11 6l-1-1-2 2-2-2-1 1 2 1.973L5 10l1 1 2-2 2 2 1-1-2-2.027z"/></svg>
diff --git a/src/vs/base/browser/ui/severityIcon/media/status-error.svg b/src/vs/base/browser/ui/severityIcon/media/status-error.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><circle cx="8" cy="8" r="6" fill="#F6F6F6"/><path d="M8 3C5.238 3 3 5.238 3 8s2.238 5 5 5 5-2.238 5-5-2.238-5-5-5zm3 7l-1 1-2-2-2 2-1-1 2-2.027L5 6l1-1 2 2 2-2 1 1-2 1.973L11 10z" fill="#E51400"/><path fill="#fff" d="M11 6l-1-1-2 2-2-2-1 1 2 1.973L5 10l1 1 2-2 2 2 1-1-2-2.027z"/></svg>
diff --git a/src/vs/base/browser/ui/severityIcon/media/status-info-inverse.svg b/src/vs/base/browser/ui/severityIcon/media/status-info-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><circle cx="8.5" cy="7.5" r="5.5" fill="#1E1E1E"/><path d="M8.5 3C6.015 3 4 5.015 4 7.5S6.015 12 8.5 12 13 9.985 13 7.5 10.985 3 8.5 3zm.5 8H8V6h1v5zm0-6H8V4h1v1z" fill="#1BA1E2"/><path d="M8 6h1v5H8V6zm0-2v1h1V4H8z" fill="#252526"/></svg>
diff --git a/src/vs/base/browser/ui/severityIcon/media/status-info.svg b/src/vs/base/browser/ui/severityIcon/media/status-info.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><circle cx="8.5" cy="7.5" r="5.5" fill="#F6F6F6"/><path d="M8.5 3C6.015 3 4 5.015 4 7.5S6.015 12 8.5 12 13 9.985 13 7.5 10.985 3 8.5 3zm.5 8H8V6h1v5zm0-6H8V4h1v1z" fill="#1BA1E2"/><path d="M8 6h1v5H8V6zm0-2v1h1V4H8z" fill="#fff"/></svg>
diff --git a/src/vs/base/browser/ui/severityIcon/media/status-warning-inverse.svg b/src/vs/base/browser/ui/severityIcon/media/status-warning-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16"><path fill="#1E1E1E" d="M7.5 2L2 12l2 2h9l2-2L9.5 2z"/><path d="M9 3H8l-4.5 9 1 1h8l1-1L9 3zm0 9H8v-1h1v1zm0-2H8V6h1v4z" fill="#fc0"/><path d="M9 10H8V6h1v4zm0 1H8v1h1v-1z"/></svg>
diff --git a/src/vs/base/browser/ui/severityIcon/media/status-warning.svg b/src/vs/base/browser/ui/severityIcon/media/status-warning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><path fill="#F6F6F6" d="M7.5 2L2 12l2 2h9l2-2L9.5 2z"/><path d="M9 3H8l-4.5 9 1 1h8l1-1L9 3zm0 9H8v-1h1v1zm0-2H8V6h1v4z" fill="#fc0"/><path d="M9 10H8V6h1v4zm0 1H8v1h1v-1z"/></svg>
diff --git a/src/vs/base/browser/ui/severityIcon/severityIcon.ts b/src/vs/base/browser/ui/severityIcon/severityIcon.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import 'vs/css!./media/severityIcon';
 import { Disposable } from 'vs/base/common/lifecycle';
 import Severity from 'vs/base/common/severity';
 import * as DOM from 'vs/base/browser/dom';
@@ -25,21 +26,21 @@ export class SeverityIcon extends Disposable {
 	}
 
 	style({ color }: {
-		color?: Color | null
+		color: Color
 	}): void {
-		this.element.style.color = color ? color.toString() : '';
+		this.element.style.color = color.toString();
 	}
 
 	private iconClassNameFor(severity: Severity): string {
 		switch (severity) {
 			case Severity.Ignore:
-				return 'severity-icon octicon octicon-info';
+				return 'octicon octicon-info';
 			case Severity.Info:
-				return 'severity-icon octicon octicon-info';
+				return 'octicon octicon-info';
 			case Severity.Warning:
-				return 'severity-icon octicon octicon-warning';
+				return 'octicon octicon-warning';
 			case Severity.Error:
-				return 'severity-icon octicon octicon-error';
+				return 'octicon octicon-error';
 		}
 		return '';
 	}
diff --git a/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
@@ -199,11 +199,10 @@ export class MarkerNavigationWidget extends PeekViewWidget {
 		} else if (this._severity === MarkerSeverity.Info) {
 			colorId = editorMarkerNavigationInfo;
 		}
-		const severityColor = theme.getColor(colorId);
-		this._headingSeverityIcon.style({ color: severityColor });
+		const frameColor = theme.getColor(colorId);
 		this.style({
-			arrowColor: severityColor,
-			frameColor: severityColor,
+			arrowColor: frameColor,
+			frameColor: frameColor,
 			headerBackgroundColor: this._backgroundColor,
 			primaryHeadingColor: theme.getColor(peekViewTitleForeground),
 			secondaryHeadingColor: theme.getColor(peekViewTitleInfoForeground)
diff --git a/src/vs/editor/contrib/gotoError/media/gotoErrorWidget.css b/src/vs/editor/contrib/gotoError/media/gotoErrorWidget.css
@@ -6,8 +6,9 @@
 /* marker zone */
 
 .monaco-editor .peekview-widget .head .peekview-title .severity-icon {
+	display: inline-block;
+	vertical-align: text-top;
 	margin-right: 4px;
-	font-size: 12px;
 }
 
 .monaco-editor .marker-widget {
diff --git a/src/vs/workbench/contrib/markers/browser/media/markers.css b/src/vs/workbench/contrib/markers/browser/media/markers.css
@@ -158,25 +158,25 @@
 	font-weight: bold;
 }
 
-.markers-panel .monaco-tl-contents .marker-icon-container .severity-icon {
+.markers-panel .monaco-tl-contents .marker-icon-container .octicon {
 	font-size: 12px;
 }
 
-.markers-panel .monaco-tl-contents .actions .action-label.icon.markers-panel-action-quickfix {
+.markers-panel .monaco-tl-contents .actions .action-label.markers-icon.markers-panel-action-quickfix {
 	background: url('lightbulb.svg') center/80% no-repeat;
 	margin-right: 0px;
 }
 
-.markers-panel .monaco-tl-contents .actions .action-label.icon.markers-panel-action-quickfix.autofixable {
+.markers-panel .monaco-tl-contents .actions .action-label.markers-icon.markers-panel-action-quickfix.autofixable {
 	background: url('lightbulb-autofix.svg') center center no-repeat;
 }
 
-.vs-dark .markers-panel .monaco-tl-contents .actions .action-label.icon.markers-panel-action-quickfix {
+.vs-dark .markers-panel .monaco-tl-contents .actions .action-label.markers-icon.markers-panel-action-quickfix {
 	background: url('lightbulb-dark.svg') center/80% no-repeat;
 }
 
-.vs-dark .markers-panel .monaco-tl-contents .actions .action-label.icon.markers-panel-action-quickfix.autofixable,
-.hc-black .markers-panel .monaco-tl-contents .actions .action-label.icon.markers-panel-action-quickfix.autofixable {
+.vs-dark .markers-panel .monaco-tl-contents .actions .action-label.markers-icon.markers-panel-action-quickfix.autofixable,
+.hc-black .markers-panel .monaco-tl-contents .actions .action-label.markers-icon.markers-panel-action-quickfix.autofixable {
 	background: url('lightbulb-autofix-dark.svg') center center no-repeat;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,9 @@`
`6`	`6`	`/* marker zone */`
`7`	`7`
`8`	`8`	`.monaco-editor .peekview-widget .head .peekview-title .severity-icon {`
	`9`	`+ display: inline-block;`
	`10`	`+ vertical-align: text-top;`
`9`	`11`	`margin-right: 4px;`
`10`		`- font-size: 12px;`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`.monaco-editor .marker-widget {`