diff --git a/src/vs/workbench/contrib/preferences/browser/media/check-dark.svg b/src/vs/workbench/contrib/preferences/browser/media/check-dark.svg
deleted file mode 100644
index 51674695e1fded7241f946dd47ea0e4fb88d98de..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/preferences/browser/media/check-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/preferences/browser/media/check-light.svg b/src/vs/workbench/contrib/preferences/browser/media/check-light.svg
deleted file mode 100644
index 7b1da6d720863826fc21a616b6db28d53ff1a9fd..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/preferences/browser/media/check-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/preferences/browser/media/clear-dark.svg b/src/vs/workbench/contrib/preferences/browser/media/clear-dark.svg
deleted file mode 100644
index 04d64ab41ca3aaaa15ff1e6514a377b9bc7fedb4..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/preferences/browser/media/clear-dark.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/preferences/browser/media/clear-light.svg b/src/vs/workbench/contrib/preferences/browser/media/clear-light.svg
deleted file mode 100644
index f6a51c856f0001df3e2df2443d58b19f707d27ba..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/preferences/browser/media/clear-light.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/preferences/browser/media/configure-dark.svg b/src/vs/workbench/contrib/preferences/browser/media/configure-dark.svg
deleted file mode 100644
index ace01a5ddf5a7ac5794dd678e1672928af00d4ee..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/preferences/browser/media/configure-dark.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/preferences/browser/media/configure-light.svg b/src/vs/workbench/contrib/preferences/browser/media/configure-light.svg
deleted file mode 100644
index 4194780bbaad66f17daaf265b91f6e3dc6c563ba..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/preferences/browser/media/configure-light.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/preferences/browser/media/edit-dark.svg b/src/vs/workbench/contrib/preferences/browser/media/edit-dark.svg
deleted file mode 100644
index a72757482be754fea48569e2d240a4d7492217cf..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/preferences/browser/media/edit-dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/preferences/browser/media/edit-light.svg b/src/vs/workbench/contrib/preferences/browser/media/edit-light.svg
deleted file mode 100644
index ae71150c0c87361522501cf15acf56da24aee22c..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/preferences/browser/media/edit-light.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/preferences/browser/media/preferences.css b/src/vs/workbench/contrib/preferences/browser/media/preferences.css
index 8e77bf944305072b2cd348d9ebb504a805232442..17fc5e4cecee3feca06fdde56f64bd810dff3538 100644
--- a/src/vs/workbench/contrib/preferences/browser/media/preferences.css
+++ b/src/vs/workbench/contrib/preferences/browser/media/preferences.css
@@ -216,24 +216,18 @@
transform: rotate(-90deg);
}
-.monaco-editor .edit-preferences-widget {
- background: url('edit-light.svg') center center no-repeat;
+.monaco-editor .codicon-edit {
transform: rotate(-90deg);
width:16px;
height: 16px;
cursor: pointer;
}
-.monaco-editor .edit-preferences-widget.hidden {
+.monaco-editor .codicon-edit.hidden {
display: none;
visibility: hidden;
}
-.monaco-editor.hc-black .edit-preferences-widget,
-.monaco-editor.vs-dark .edit-preferences-widget {
- background: url('edit-dark.svg') center center no-repeat;
-}
-
.monaco-editor .dim-configuration {
color: #b1b1b1;
}
diff --git a/src/vs/workbench/contrib/preferences/browser/media/remove-dark.svg b/src/vs/workbench/contrib/preferences/browser/media/remove-dark.svg
deleted file mode 100644
index 75644595d19d13829e09b127eafd0770035af6f5..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/preferences/browser/media/remove-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/preferences/browser/media/remove-light.svg b/src/vs/workbench/contrib/preferences/browser/media/remove-light.svg
deleted file mode 100644
index cf5f28ca35c310c62eee5f8ef06e2f921e203550..0000000000000000000000000000000000000000
--- a/src/vs/workbench/contrib/preferences/browser/media/remove-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
index 3cf2a4b042d0f361b8279e2b2a2af8c274147a86..b0dff5ac885e81cf2d2d00e785c4b88b46436c89 100644
--- a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
+++ b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
@@ -12,6 +12,10 @@
overflow: hidden;
}
+.settings-editor .codicon {
+ color: inherit !important;
+}
+
/* header styling */
.settings-editor > .settings-header {
box-sizing: border-box;
@@ -88,7 +92,6 @@
.settings-editor > .settings-header > .settings-header-controls .settings-tabs-widget > .monaco-action-bar .action-item .action-label {
text-transform: none;
font-size: 13px;
-
padding-bottom: 7px;
padding-top: 7px;
padding-left: 8px;
@@ -166,21 +169,9 @@
transition: opacity .3s;
width: 22px;
height: 22px;
- background-position: center;
- background-repeat: no-repeat;
- background-size: 16px;
-}
-
-.settings-editor > .settings-body .settings-tree-container .setting-toolbar-container > .monaco-toolbar .codicon-more::before {
- content: ' ';
-}
-
-.vs .settings-editor > .settings-body .settings-tree-container .monaco-toolbar .codicon-more {
- background-image: url('configure-light.svg');
-}
-
-.vs-dark .settings-editor > .settings-body .settings-tree-container .monaco-toolbar .codicon-more {
- background-image: url('configure-dark.svg');
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.settings-editor > .settings-body .settings-toc-container {
@@ -436,16 +427,10 @@
margin-right: 9px;
margin-left: 0px;
padding: 0px;
- background-size: 16px !important;
}
-.vs .settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox.checked {
- background: url('check-light.svg') center center no-repeat;
-}
-
-.vs-dark .settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox.checked,
-.hc-black .settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox.checked {
- background: url('check-dark.svg') center center no-repeat;
+.settings-editor > .settings-body > .settings-tree-container .setting-item-bool .setting-value-checkbox.codicon:not(.checked)::before {
+ opacity: 0;
}
.settings-editor > .settings-body > .settings-tree-container .setting-item-contents .setting-item-value {
diff --git a/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css b/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css
index ff5f813a4fc833fe073beb24b045b4ce1c7eff3a..c78c447a370e81f8bbc699db5f608a808ac86aa6 100644
--- a/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css
+++ b/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css
@@ -70,28 +70,15 @@
height: 20px;
padding: 2px;
margin-right: 2px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-list .setting-list-row .monaco-action-bar .setting-listAction-edit {
margin-right: 4px;
}
-.vs .settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-list .setting-list-row .monaco-action-bar .setting-listAction-edit {
- background: url("edit-light.svg") center center no-repeat;
-}
-
-.vs-dark .settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-list .setting-list-row .monaco-action-bar .setting-listAction-edit {
- background: url("edit-dark.svg") center center no-repeat;
-}
-
-.vs .settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-list .setting-list-row .monaco-action-bar .setting-listAction-remove {
- background: url("remove-light.svg") center center no-repeat;
-}
-
-.vs-dark .settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-list .setting-list-row .monaco-action-bar .setting-listAction-remove {
- background: url("remove-dark.svg") center center no-repeat;
-}
-
.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-list .monaco-text-button {
width: initial;
padding: 2px 14px;
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index 0f219de5a0662e76b9881b6a13ae77fc4d241e53..4931271523c5f6e37dab73d6f253b90c117b2823 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -393,6 +393,13 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
toggleMenuTitle
});
toolbar.setActions([], this.settingActions)();
+
+ // change icon from ellipsis to gear
+ let icon = container.querySelector('.codicon-more');
+ if (icon) {
+ (icon).classList.add('codicon-gear');
+ }
+
const button = container.querySelector('.toolbar-toggle-more');
if (button) {
(button).tabIndex = -1;
@@ -1071,7 +1078,7 @@ export class SettingBoolRenderer extends AbstractSettingRenderer implements ITre
const deprecationWarningElement = DOM.append(container, $('.setting-item-deprecation-message'));
const toDispose = new DisposableStore();
- const checkbox = new Checkbox({ actionClassName: 'setting-value-checkbox', isChecked: true, title: '', inputActiveOptionBorder: undefined });
+ const checkbox = new Checkbox({ actionClassName: 'codicon-check setting-value-checkbox', isChecked: true, title: '', inputActiveOptionBorder: undefined });
controlElement.appendChild(checkbox.domNode);
toDispose.add(checkbox);
toDispose.add(checkbox.onChange(() => {
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
index 798a9b005146dfc766ece6c876a044d323117318..b19f4b3384fc05b3c716ddef784cbd2efbdc3bc0 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
@@ -352,7 +352,7 @@ export class ListSettingWidget extends Disposable {
private createDeleteAction(key: string, idx: number): IAction {
return {
- class: 'setting-listAction-remove',
+ class: 'codicon-close',
enabled: true,
id: 'workbench.action.removeListItem',
tooltip: this.getLocalizedStrings().deleteActionTooltip,
@@ -362,7 +362,7 @@ export class ListSettingWidget extends Disposable {
private createEditAction(idx: number): IAction {
return {
- class: 'setting-listAction-edit',
+ class: 'codicon-edit',
enabled: true,
id: 'workbench.action.editListItem',
tooltip: this.getLocalizedStrings().editActionTooltip,