From c054cbaf56d0a355fc2d93b8a91ed2bbf798d0e4 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 25 May 2018 13:19:48 -0700
Subject: [PATCH] Settings editor - change reset button to text link

---
 .../browser/media/settingsEditor2.css         | 24 +++++--------------
 .../parts/preferences/browser/settingsTree.ts | 13 ++++++----
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
index 6190d09f945..eb7db9e921a 100644
--- a/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
+++ b/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
@@ -206,10 +206,6 @@
 	height: initial;
 }
 
-.settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value {
-	display: flex;
-}
-
 .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .edit-in-settings-button,
 .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .edit-in-settings-button:hover,
 .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .edit-in-settings-button:active {
@@ -243,15 +239,15 @@
 }
 
 .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .setting-reset-button.monaco-button {
-	display: inline-block;
-	background: url("clean.svg") center center no-repeat;
-	width: 16px;
-	height: 16px;
-	margin: auto;
-	margin-left: 3px;
+	text-align: left;
+	display: inline;
 	visibility: hidden;
 }
 
+.settings-editor > .settings-body > .settings-tree-container .setting-item.is-configured .setting-item-value > .setting-reset-button.monaco-button {
+	visibility: visible;
+}
+
 .settings-editor > .settings-body > .settings-tree-container .setting-item .expand-indicator {
 	visibility: hidden;
 	position: absolute;
@@ -265,14 +261,6 @@
 	visibility: visible;
 }
 
-.vs-dark .settings-editor > .settings-body > .settings-tree-container .setting-item .setting-item-value > .setting-reset-button.monaco-button {
-	background: url("clean-dark.svg") center center no-repeat;
-}
-
-.settings-editor > .settings-body > .settings-tree-container .setting-item.is-configured .setting-item-value > .setting-reset-button.monaco-button {
-	visibility: visible;
-}
-
 .settings-editor > .settings-body > .settings-tree-container .all-settings {
 	display: flex;
 }
diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
index adb7c2281cb..02462d73598 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as DOM from 'vs/base/browser/dom';
+import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 import { Button } from 'vs/base/browser/ui/button/button';
 import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
 import { renderOcticons } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
@@ -12,20 +13,19 @@ import { Color } from 'vs/base/common/color';
 import { Emitter, Event } from 'vs/base/common/event';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import * as objects from 'vs/base/common/objects';
+import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAccessibilityProvider, IDataSource, IFilter, IRenderer, ITree } from 'vs/base/parts/tree/browser/tree';
 import { localize } from 'vs/nls';
 import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { WorkbenchTreeController } from 'vs/platform/list/browser/listService';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
+import { editorActiveLinkForeground, registerColor } from 'vs/platform/theme/common/colorRegistry';
 import { attachButtonStyler, attachInputBoxStyler, attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import { ICssStyleCollector, ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { SettingsTarget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
 import { ISearchResult, ISetting, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
 import { DefaultSettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
-import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import URI from 'vs/base/common/uri';
 
 const $ = DOM.$;
 
@@ -429,13 +429,16 @@ export class SettingsRenderer implements IRenderer {
 		this.renderValue(element, isSelected, template);
 
 		const resetButton = new Button(template.valueElement);
-		resetButton.element.title = localize('resetButtonTitle', "Reset");
+		const resetText = localize('resetButtonTitle', "reset");
+		resetButton.label = resetText;
+		resetButton.element.title = resetText;
 		resetButton.element.classList.add('setting-reset-button');
 		resetButton.element.tabIndex = isSelected ? 0 : -1;
 
 		attachButtonStyler(resetButton, this.themeService, {
 			buttonBackground: Color.transparent.toString(),
-			buttonHoverBackground: Color.transparent.toString()
+			buttonHoverBackground: Color.transparent.toString(),
+			buttonForeground: editorActiveLinkForeground
 		});
 
 		template.toDispose.push(resetButton.onDidClick(e => {