diff --git a/src/vs/base/browser/ui/actionbar/actionbar.css b/src/vs/base/browser/ui/actionbar/actionbar.css
index 25795ddb631df..08b4920ae47eb 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.css
+++ b/src/vs/base/browser/ui/actionbar/actionbar.css
@@ -40,7 +40,7 @@
transform: scale(1.272019649, 1.272019649); /* 1.272019649 = √φ */
}
-.monaco-action-bar .action-item .icon {
+.monaco-action-bar .action-item .codicon {
display: inline-block;
}
@@ -95,4 +95,4 @@
display: flex;
align-items: center;
justify-content: center;
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index 538f7fa0dbe34..38ec0a60a51de 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -311,14 +311,14 @@ export class ActionViewItem extends BaseActionViewItem {
if (this.options.icon) {
this.cssClass = this.getAction().class;
- DOM.addClass(this.label, 'icon');
+ DOM.addClass(this.label, 'codicon');
if (this.cssClass) {
DOM.addClasses(this.label, this.cssClass);
}
this.updateEnabled();
} else {
- DOM.removeClass(this.label, 'icon');
+ DOM.removeClass(this.label, 'codicon');
}
}
diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon-animations.css b/src/vs/base/browser/ui/codiconLabel/codicon/codicon-animations.css
new file mode 100644
index 0000000000000..86c223674ecca
--- /dev/null
+++ b/src/vs/base/browser/ui/codiconLabel/codicon/codicon-animations.css
@@ -0,0 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+@keyframes codicon-spin {
+ 100% {
+ transform:rotate(360deg);
+ }
+}
+
+.codicon-animation-spin {
+ animation: octicon-spin 1.5s linear infinite;
+}
diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css
new file mode 100644
index 0000000000000..689f29ba4c6c8
--- /dev/null
+++ b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css
@@ -0,0 +1,355 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+@font-face {
+ font-family: "codicon";
+ src: url("./codicon.ttf?e042d2dda15ef7b36b910e3edf539f26") format("truetype"),
+url("./codicon.svg?e042d2dda15ef7b36b910e3edf539f26#codicon") format("svg");
+}
+
+.codicon[class*='codicon-'] {
+ font: normal normal normal 16px/1 codicon;
+ display: inline-block;
+ text-decoration: none;
+ text-rendering: auto;
+ text-align: center;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
+
+
+.codicon-add:before { content: "\ea60" }
+.codicon-plus:before { content: "\ea60" }
+.codicon-gist-new:before { content: "\ea60" }
+.codicon-repo-create:before { content: "\ea60" }
+.codicon-lightbulb:before { content: "\ea61" }
+.codicon-light-bulb:before { content: "\ea61" }
+.codicon-repo:before { content: "\ea62" }
+.codicon-repo-delete:before { content: "\ea62" }
+.codicon-gist-fork:before { content: "\ea63" }
+.codicon-repo-forked:before { content: "\ea63" }
+.codicon-git-pull-request:before { content: "\ea64" }
+.codicon-git-pull-request-abandoned:before { content: "\ea64" }
+.codicon-record-keys:before { content: "\ea65" }
+.codicon-keyboard:before { content: "\ea65" }
+.codicon-tag:before { content: "\ea66" }
+.codicon-tag-add:before { content: "\ea66" }
+.codicon-tag-remove:before { content: "\ea66" }
+.codicon-person:before { content: "\ea67" }
+.codicon-person-add:before { content: "\ea67" }
+.codicon-person-follow:before { content: "\ea67" }
+.codicon-person-outline:before { content: "\ea67" }
+.codicon-person-filled:before { content: "\ea67" }
+.codicon-git-branch:before { content: "\ea68" }
+.codicon-git-branch-create:before { content: "\ea68" }
+.codicon-git-branch-delete:before { content: "\ea68" }
+.codicon-source-control:before { content: "\ea68" }
+.codicon-mirror:before { content: "\ea69" }
+.codicon-mirror-public:before { content: "\ea69" }
+.codicon-star:before { content: "\ea6a" }
+.codicon-star-add:before { content: "\ea6a" }
+.codicon-star-delete:before { content: "\ea6a" }
+.codicon-comment:before { content: "\ea6b" }
+.codicon-comment-add:before { content: "\ea6b" }
+.codicon-alert:before { content: "\ea6c" }
+.codicon-warning:before { content: "\ea6c" }
+.codicon-search:before { content: "\ea6d" }
+.codicon-search-save:before { content: "\ea6d" }
+.codicon-log-out:before { content: "\ea6e" }
+.codicon-sign-out:before { content: "\ea6e" }
+.codicon-log-in:before { content: "\ea6f" }
+.codicon-sign-in:before { content: "\ea6f" }
+.codicon-eye:before { content: "\ea70" }
+.codicon-eye-unwatch:before { content: "\ea70" }
+.codicon-eye-watch:before { content: "\ea70" }
+.codicon-circle-filled:before { content: "\ea71" }
+.codicon-primitive-dot:before { content: "\ea71" }
+.codicon-stop:before { content: "\ea72" }
+.codicon-primitive-square:before { content: "\ea72" }
+.codicon-edit:before { content: "\ea73" }
+.codicon-pencil:before { content: "\ea73" }
+.codicon-info:before { content: "\ea74" }
+.codicon-issue-opened:before { content: "\ea74" }
+.codicon-gist-private:before { content: "\ea75" }
+.codicon-git-fork-private:before { content: "\ea75" }
+.codicon-lock:before { content: "\ea75" }
+.codicon-mirror-private:before { content: "\ea75" }
+.codicon-close:before { content: "\ea76" }
+.codicon-remove-close:before { content: "\ea76" }
+.codicon-x:before { content: "\ea76" }
+.codicon-repo-sync:before { content: "\ea77" }
+.codicon-sync:before { content: "\ea77" }
+.codicon-clone:before { content: "\ea78" }
+.codicon-desktop-download:before { content: "\ea78" }
+.codicon-beaker:before { content: "\ea79" }
+.codicon-microscope:before { content: "\ea79" }
+.codicon-vm:before { content: "\ea7a" }
+.codicon-device-desktop:before { content: "\ea7a" }
+.codicon-file:before { content: "\ea7b" }
+.codicon-file-text:before { content: "\ea7b" }
+.codicon-more:before { content: "\ea7c" }
+.codicon-kebab-horizontal:before { content: "\ea7c" }
+.codicon-mail-reply:before { content: "\ea7d" }
+.codicon-reply:before { content: "\ea7d" }
+.codicon-organization:before { content: "\ea7e" }
+.codicon-organization-filled:before { content: "\ea7e" }
+.codicon-organization-outline:before { content: "\ea7e" }
+.codicon-new-file:before { content: "\ea7f" }
+.codicon-file-add:before { content: "\ea7f" }
+.codicon-new-folder:before { content: "\ea80" }
+.codicon-file-directory-create:before { content: "\ea80" }
+.codicon-Vector:before { content: "\f101" }
+.codicon-activate-breakpoints:before { content: "\f102" }
+.codicon-archive:before { content: "\f103" }
+.codicon-array:before { content: "\f104" }
+.codicon-arrow-both:before { content: "\f105" }
+.codicon-arrow-down:before { content: "\f106" }
+.codicon-arrow-left:before { content: "\f107" }
+.codicon-arrow-right:before { content: "\f108" }
+.codicon-arrow-small-down:before { content: "\f109" }
+.codicon-arrow-small-left:before { content: "\f10a" }
+.codicon-arrow-small-right:before { content: "\f10b" }
+.codicon-arrow-small-up:before { content: "\f10c" }
+.codicon-arrow-up:before { content: "\f10d" }
+.codicon-bell:before { content: "\f10e" }
+.codicon-bold:before { content: "\f10f" }
+.codicon-book:before { content: "\f110" }
+.codicon-bookmark:before { content: "\f111" }
+.codicon-boolean:before { content: "\f112" }
+.codicon-breakpoint-conditional-unverified:before { content: "\f113" }
+.codicon-breakpoint-conditional:before { content: "\f114" }
+.codicon-breakpoint-data-unverified:before { content: "\f115" }
+.codicon-breakpoint-data:before { content: "\f116" }
+.codicon-breakpoint-log-unverified:before { content: "\f117" }
+.codicon-breakpoint-log:before { content: "\f118" }
+.codicon-briefcase:before { content: "\f119" }
+.codicon-broadcast:before { content: "\f11a" }
+.codicon-browser:before { content: "\f11b" }
+.codicon-bug:before { content: "\f11c" }
+.codicon-calendar:before { content: "\f11d" }
+.codicon-case-sensitive:before { content: "\f11e" }
+.codicon-check:before { content: "\f11f" }
+.codicon-checklist:before { content: "\f120" }
+.codicon-chevron-down:before { content: "\f121" }
+.codicon-chevron-left:before { content: "\f122" }
+.codicon-chevron-right:before { content: "\f123" }
+.codicon-chevron-up:before { content: "\f124" }
+.codicon-circle-outline:before { content: "\f125" }
+.codicon-circle-slash:before { content: "\f126" }
+.codicon-circuit-board:before { content: "\f127" }
+.codicon-class:before { content: "\f128" }
+.codicon-clear-all:before { content: "\f129" }
+.codicon-clippy:before { content: "\f12a" }
+.codicon-close-all:before { content: "\f12b" }
+.codicon-cloud-download:before { content: "\f12c" }
+.codicon-cloud-upload:before { content: "\f12d" }
+.codicon-code:before { content: "\f12e" }
+.codicon-collapse-all:before { content: "\f12f" }
+.codicon-color-mode:before { content: "\f130" }
+.codicon-color:before { content: "\f131" }
+.codicon-comment-discussion:before { content: "\f132" }
+.codicon-compare-changes:before { content: "\f133" }
+.codicon-console:before { content: "\f134" }
+.codicon-constant:before { content: "\f135" }
+.codicon-continue:before { content: "\f136" }
+.codicon-credit-card:before { content: "\f137" }
+.codicon-current-and-breakpoint:before { content: "\f138" }
+.codicon-current:before { content: "\f139" }
+.codicon-dash:before { content: "\f13a" }
+.codicon-dashboard:before { content: "\f13b" }
+.codicon-database:before { content: "\f13c" }
+.codicon-debug:before { content: "\f13d" }
+.codicon-device-camera-video:before { content: "\f13e" }
+.codicon-device-camera:before { content: "\f13f" }
+.codicon-device-mobile:before { content: "\f140" }
+.codicon-diff-added:before { content: "\f141" }
+.codicon-diff-ignored:before { content: "\f142" }
+.codicon-diff-modified:before { content: "\f143" }
+.codicon-diff-removed:before { content: "\f144" }
+.codicon-diff-renamed:before { content: "\f145" }
+.codicon-diff:before { content: "\f146" }
+.codicon-discard:before { content: "\f147" }
+.codicon-disconnect-:before { content: "\f148" }
+.codicon-editor-layout:before { content: "\f149" }
+.codicon-ellipsis:before { content: "\f14a" }
+.codicon-empty-window:before { content: "\f14b" }
+.codicon-enumerator-member:before { content: "\f14c" }
+.codicon-enumerator:before { content: "\f14d" }
+.codicon-error:before { content: "\f14e" }
+.codicon-event:before { content: "\f14f" }
+.codicon-exclude:before { content: "\f150" }
+.codicon-extensions:before { content: "\f151" }
+.codicon-eye-closed:before { content: "\f152" }
+.codicon-field:before { content: "\f153" }
+.codicon-file-binary:before { content: "\f154" }
+.codicon-file-code:before { content: "\f155" }
+.codicon-file-media:before { content: "\f156" }
+.codicon-file-pdf:before { content: "\f157" }
+.codicon-file-submodule:before { content: "\f158" }
+.codicon-file-symlink-directory:before { content: "\f159" }
+.codicon-file-symlink-file:before { content: "\f15a" }
+.codicon-file-zip:before { content: "\f15b" }
+.codicon-files:before { content: "\f15c" }
+.codicon-filter:before { content: "\f15d" }
+.codicon-flame:before { content: "\f15e" }
+.codicon-fold-down:before { content: "\f15f" }
+.codicon-fold-up:before { content: "\f160" }
+.codicon-fold:before { content: "\f161" }
+.codicon-folder-active:before { content: "\f162" }
+.codicon-folder-opened:before { content: "\f163" }
+.codicon-folder:before { content: "\f164" }
+.codicon-gift:before { content: "\f165" }
+.codicon-gist-secret:before { content: "\f166" }
+.codicon-gist:before { content: "\f167" }
+.codicon-git-commit:before { content: "\f168" }
+.codicon-git-compare:before { content: "\f169" }
+.codicon-git-merge:before { content: "\f16a" }
+.codicon-github-action:before { content: "\f16b" }
+.codicon-github-alt:before { content: "\f16c" }
+.codicon-github:before { content: "\f16d" }
+.codicon-globe:before { content: "\f16e" }
+.codicon-go-to-file:before { content: "\f16f" }
+.codicon-grabber:before { content: "\f170" }
+.codicon-graph:before { content: "\f171" }
+.codicon-gripper:before { content: "\f172" }
+.codicon-heart:before { content: "\f173" }
+.codicon-history:before { content: "\f174" }
+.codicon-home:before { content: "\f175" }
+.codicon-horizontal-rule:before { content: "\f176" }
+.codicon-hubot:before { content: "\f177" }
+.codicon-inbox:before { content: "\f178" }
+.codicon-interface:before { content: "\f179" }
+.codicon-issue-closed:before { content: "\f17a" }
+.codicon-issue-reopened:before { content: "\f17b" }
+.codicon-issues:before { content: "\f17c" }
+.codicon-italic:before { content: "\f17d" }
+.codicon-jersey:before { content: "\f17e" }
+.codicon-json:before { content: "\f17f" }
+.codicon-kebab-vertical:before { content: "\f180" }
+.codicon-key:before { content: "\f181" }
+.codicon-keyword:before { content: "\f182" }
+.codicon-law:before { content: "\f183" }
+.codicon-lightbulb-autofix:before { content: "\f184" }
+.codicon-link-external:before { content: "\f185" }
+.codicon-link:before { content: "\f186" }
+.codicon-list-ordered:before { content: "\f187" }
+.codicon-list-unordered:before { content: "\f188" }
+.codicon-live-share:before { content: "\f189" }
+.codicon-loading:before { content: "\f18a" }
+.codicon-location:before { content: "\f18b" }
+.codicon-mail-read:before { content: "\f18c" }
+.codicon-mail:before { content: "\f18d" }
+.codicon-markdown:before { content: "\f18e" }
+.codicon-megaphone:before { content: "\f18f" }
+.codicon-mention:before { content: "\f190" }
+.codicon-method:before { content: "\f191" }
+.codicon-milestone:before { content: "\f192" }
+.codicon-misc:before { content: "\f193" }
+.codicon-mortar-board:before { content: "\f194" }
+.codicon-move:before { content: "\f195" }
+.codicon-multiple-windows:before { content: "\f196" }
+.codicon-mute:before { content: "\f197" }
+.codicon-namespace:before { content: "\f198" }
+.codicon-no-newline:before { content: "\f199" }
+.codicon-note:before { content: "\f19a" }
+.codicon-numeric:before { content: "\f19b" }
+.codicon-octoface:before { content: "\f19c" }
+.codicon-open-preview:before { content: "\f19d" }
+.codicon-operator:before { content: "\f19e" }
+.codicon-package:before { content: "\f19f" }
+.codicon-paintcan:before { content: "\f1a0" }
+.codicon-parameter:before { content: "\f1a1" }
+.codicon-pause:before { content: "\f1a2" }
+.codicon-pin:before { content: "\f1a3" }
+.codicon-play:before { content: "\f1a4" }
+.codicon-plug:before { content: "\f1a5" }
+.codicon-preserve-case:before { content: "\f1a6" }
+.codicon-preview:before { content: "\f1a7" }
+.codicon-project:before { content: "\f1a8" }
+.codicon-property:before { content: "\f1a9" }
+.codicon-pulse:before { content: "\f1aa" }
+.codicon-question:before { content: "\f1ab" }
+.codicon-quote:before { content: "\f1ac" }
+.codicon-radio-tower:before { content: "\f1ad" }
+.codicon-reactions:before { content: "\f1ae" }
+.codicon-references:before { content: "\f1af" }
+.codicon-refresh:before { content: "\f1b0" }
+.codicon-regex:before { content: "\f1b1" }
+.codicon-remote:before { content: "\f1b2" }
+.codicon-remove:before { content: "\f1b3" }
+.codicon-replace-all:before { content: "\f1b4" }
+.codicon-replace:before { content: "\f1b5" }
+.codicon-repo-clone:before { content: "\f1b6" }
+.codicon-repo-force-push:before { content: "\f1b7" }
+.codicon-repo-pull:before { content: "\f1b8" }
+.codicon-repo-push:before { content: "\f1b9" }
+.codicon-report:before { content: "\f1ba" }
+.codicon-request-changes:before { content: "\f1bb" }
+.codicon-restart:before { content: "\f1bc" }
+.codicon-rocket:before { content: "\f1bd" }
+.codicon-root-folder-opened:before { content: "\f1be" }
+.codicon-root-folder:before { content: "\f1bf" }
+.codicon-rss:before { content: "\f1c0" }
+.codicon-ruby:before { content: "\f1c1" }
+.codicon-ruler:before { content: "\f1c2" }
+.codicon-save-all:before { content: "\f1c3" }
+.codicon-save-as:before { content: "\f1c4" }
+.codicon-save:before { content: "\f1c5" }
+.codicon-screen-full:before { content: "\f1c6" }
+.codicon-screen-normal:before { content: "\f1c7" }
+.codicon-search-stop:before { content: "\f1c8" }
+.codicon-selection:before { content: "\f1c9" }
+.codicon-server:before { content: "\f1ca" }
+.codicon-settings:before { content: "\f1cb" }
+.codicon-shield:before { content: "\f1cc" }
+.codicon-smiley:before { content: "\f1cd" }
+.codicon-snippet:before { content: "\f1ce" }
+.codicon-sort-precedence:before { content: "\f1cf" }
+.codicon-split-horizontal:before { content: "\f1d0" }
+.codicon-split-vertical:before { content: "\f1d1" }
+.codicon-squirrel:before { content: "\f1d2" }
+.codicon-star-empty:before { content: "\f1d3" }
+.codicon-star-full:before { content: "\f1d4" }
+.codicon-star-half:before { content: "\f1d5" }
+.codicon-start:before { content: "\f1d6" }
+.codicon-step-into:before { content: "\f1d7" }
+.codicon-step-out:before { content: "\f1d8" }
+.codicon-step-over:before { content: "\f1d9" }
+.codicon-string:before { content: "\f1da" }
+.codicon-structure:before { content: "\f1db" }
+.codicon-tasklist:before { content: "\f1dc" }
+.codicon-telescope:before { content: "\f1dd" }
+.codicon-text-size:before { content: "\f1de" }
+.codicon-three-bars:before { content: "\f1df" }
+.codicon-thumbsdown:before { content: "\f1e0" }
+.codicon-thumbsup:before { content: "\f1e1" }
+.codicon-tools:before { content: "\f1e2" }
+.codicon-trash:before { content: "\f1e3" }
+.codicon-triangle-down:before { content: "\f1e4" }
+.codicon-triangle-left:before { content: "\f1e5" }
+.codicon-triangle-right:before { content: "\f1e6" }
+.codicon-triangle-up:before { content: "\f1e7" }
+.codicon-twitter:before { content: "\f1e8" }
+.codicon-unfold:before { content: "\f1e9" }
+.codicon-unlock:before { content: "\f1ea" }
+.codicon-unmute:before { content: "\f1eb" }
+.codicon-unverified:before { content: "\f1ec" }
+.codicon-variable:before { content: "\f1ed" }
+.codicon-verified:before { content: "\f1ee" }
+.codicon-versions:before { content: "\f1ef" }
+.codicon-vm-active:before { content: "\f1f0" }
+.codicon-vm-outline:before { content: "\f1f1" }
+.codicon-vm-running:before { content: "\f1f2" }
+.codicon-watch:before { content: "\f1f3" }
+.codicon-whitespace:before { content: "\f1f4" }
+.codicon-whole-word:before { content: "\f1f5" }
+.codicon-window:before { content: "\f1f6" }
+.codicon-word-wrap:before { content: "\f1f7" }
+.codicon-zoom-in:before { content: "\f1f8" }
+.codicon-zoom-out:before { content: "\f1f9" }
diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf
new file mode 100644
index 0000000000000..688b9ffd0bd65
Binary files /dev/null and b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf differ
diff --git a/src/vs/base/browser/ui/codiconLabel/codiconLabel.mock.ts b/src/vs/base/browser/ui/codiconLabel/codiconLabel.mock.ts
new file mode 100644
index 0000000000000..37862376c2cc1
--- /dev/null
+++ b/src/vs/base/browser/ui/codiconLabel/codiconLabel.mock.ts
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { escape } from 'vs/base/common/strings';
+
+export function renderCodicons(text: string): string {
+ return escape(text);
+}
+
+export class CodiconLabel {
+
+ private _container: HTMLElement;
+
+ constructor(container: HTMLElement) {
+ this._container = container;
+ }
+
+ set text(text: string) {
+ this._container.innerHTML = renderCodicons(text || '');
+ }
+
+}
diff --git a/src/vs/base/browser/ui/codiconLabel/codiconLabel.ts b/src/vs/base/browser/ui/codiconLabel/codiconLabel.ts
new file mode 100644
index 0000000000000..42d38948e8858
--- /dev/null
+++ b/src/vs/base/browser/ui/codiconLabel/codiconLabel.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'vs/css!./codicon/codicon';
+import 'vs/css!./codicon/codicon-animations';
+import { escape } from 'vs/base/common/strings';
+
+function expand(text: string): string {
+ return text.replace(/\$\(((.+?)(~(.*?))?)\)/g, (_match, _g1, name, _g3, animation) => {
+ return ``;
+ });
+}
+
+export function renderCodicons(label: string): string {
+ return expand(escape(label));
+}
+
+export class CodiconLabel {
+
+ constructor(
+ private readonly _container: HTMLElement
+ ) { }
+
+ set text(text: string) {
+ this._container.innerHTML = renderCodicons(text || '');
+ }
+
+ set title(title: string) {
+ this._container.title = title;
+ }
+}
diff --git a/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts b/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts
index 63c805b423734..e7dcf431b0d38 100644
--- a/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts
+++ b/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as objects from 'vs/base/common/objects';
-import { renderOcticons } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
+import { renderCodicons } from 'vs/base/browser/ui/codiconLabel/codiconLabel';
import { escape } from 'vs/base/common/strings';
export interface IHighlight {
@@ -65,13 +65,13 @@ export class HighlightedLabel {
if (pos < highlight.start) {
htmlContent += '';
const substring = this.text.substring(pos, highlight.start);
- htmlContent += this.supportOcticons ? renderOcticons(substring) : escape(substring);
+ htmlContent += this.supportOcticons ? renderCodicons(substring) : escape(substring);
htmlContent += '';
pos = highlight.end;
}
htmlContent += '';
const substring = this.text.substring(highlight.start, highlight.end);
- htmlContent += this.supportOcticons ? renderOcticons(substring) : escape(substring);
+ htmlContent += this.supportOcticons ? renderCodicons(substring) : escape(substring);
htmlContent += '';
pos = highlight.end;
}
@@ -79,7 +79,7 @@ export class HighlightedLabel {
if (pos < this.text.length) {
htmlContent += '';
const substring = this.text.substring(pos);
- htmlContent += this.supportOcticons ? renderOcticons(substring) : escape(substring);
+ htmlContent += this.supportOcticons ? renderCodicons(substring) : escape(substring);
htmlContent += '';
}
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.css b/src/vs/base/browser/ui/inputbox/inputBox.css
index ae4cd429a0754..939d0cb5f0181 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.css
+++ b/src/vs/base/browser/ui/inputbox/inputBox.css
@@ -123,7 +123,7 @@
margin-left: 2px;
}
-.monaco-inputbox .monaco-action-bar .action-item .icon {
+.monaco-inputbox .monaco-action-bar .action-item .codicon {
background-repeat: no-repeat;
width: 16px;
height: 16px;
diff --git a/src/vs/base/parts/tree/browser/collapse-all-dark.svg b/src/vs/base/parts/tree/browser/collapse-all-dark.svg
deleted file mode 100644
index 4862c55dbeba7..0000000000000
--- a/src/vs/base/parts/tree/browser/collapse-all-dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/base/parts/tree/browser/collapse-all-hc.svg b/src/vs/base/parts/tree/browser/collapse-all-hc.svg
deleted file mode 100644
index 05f920b29b685..0000000000000
--- a/src/vs/base/parts/tree/browser/collapse-all-hc.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/base/parts/tree/browser/collapse-all-light.svg b/src/vs/base/parts/tree/browser/collapse-all-light.svg
deleted file mode 100644
index 6359b42e623fb..0000000000000
--- a/src/vs/base/parts/tree/browser/collapse-all-light.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/base/parts/tree/browser/tree.css b/src/vs/base/parts/tree/browser/tree.css
index 2a3cb47ddbb4c..6eb5f9b7aff40 100644
--- a/src/vs/base/parts/tree/browser/tree.css
+++ b/src/vs/base/parts/tree/browser/tree.css
@@ -110,15 +110,3 @@
.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children.loading > .content:before {
background-image: url('loading-hc.svg');
}
-
-.monaco-tree-action.collapse-all {
- background: url('collapse-all-light.svg') center center no-repeat;
-}
-
-.vs-dark .monaco-tree-action.collapse-all {
- background: url('collapse-all-dark.svg') center center no-repeat;
-}
-
-.hc-black .monaco-tree-action.collapse-all {
- background: url('collapse-all-hc.svg') center center no-repeat;
-}
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index f5fc75c932415..b6ec6f9e6f9e9 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -187,6 +187,8 @@ export const activeContrastBorder = registerColor('contrastActiveBorder', { ligh
export const selectionBackground = registerColor('selection.background', { light: null, dark: null, hc: null }, nls.localize('selectionBackground', "The background color of text selections in the workbench (e.g. for input fields or text areas). Note that this does not apply to selections within the editor."));
+export const iconForeground = registerColor('icon.foreground', { light: '#424242', dark: '#C5C5C5', hc: '#FFFFFF' }, nls.localize('iconForeground', "The default color for icons in the workbench."));
+
// ------ text colors
export const textSeparatorForeground = registerColor('textSeparator.foreground', { light: '#0000002e', dark: '#ffffff2e', hc: Color.black }, nls.localize('textSeparatorForeground', "Color for text separators."));
diff --git a/src/vs/workbench/browser/parts/panel/media/chevron-down-dark.svg b/src/vs/workbench/browser/parts/panel/media/chevron-down-dark.svg
deleted file mode 100644
index a1df6a8d44ae5..0000000000000
--- a/src/vs/workbench/browser/parts/panel/media/chevron-down-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/panel/media/chevron-down-hc.svg b/src/vs/workbench/browser/parts/panel/media/chevron-down-hc.svg
deleted file mode 100644
index 4f2ec14692729..0000000000000
--- a/src/vs/workbench/browser/parts/panel/media/chevron-down-hc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/panel/media/chevron-down-light.svg b/src/vs/workbench/browser/parts/panel/media/chevron-down-light.svg
deleted file mode 100644
index e60e357f573d5..0000000000000
--- a/src/vs/workbench/browser/parts/panel/media/chevron-down-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/panel/media/chevron-up-dark.svg b/src/vs/workbench/browser/parts/panel/media/chevron-up-dark.svg
deleted file mode 100644
index 5b9da8932e19e..0000000000000
--- a/src/vs/workbench/browser/parts/panel/media/chevron-up-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/panel/media/chevron-up-hc.svg b/src/vs/workbench/browser/parts/panel/media/chevron-up-hc.svg
deleted file mode 100644
index 13bad53736428..0000000000000
--- a/src/vs/workbench/browser/parts/panel/media/chevron-up-hc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/panel/media/chevron-up-light.svg b/src/vs/workbench/browser/parts/panel/media/chevron-up-light.svg
deleted file mode 100644
index 5498cda5bc447..0000000000000
--- a/src/vs/workbench/browser/parts/panel/media/chevron-up-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/panel/media/close-dark.svg b/src/vs/workbench/browser/parts/panel/media/close-dark.svg
deleted file mode 100644
index e0475f7b85a31..0000000000000
--- a/src/vs/workbench/browser/parts/panel/media/close-dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/panel/media/close-hc.svg b/src/vs/workbench/browser/parts/panel/media/close-hc.svg
deleted file mode 100644
index 64618b61760cc..0000000000000
--- a/src/vs/workbench/browser/parts/panel/media/close-hc.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/panel/media/close-light.svg b/src/vs/workbench/browser/parts/panel/media/close-light.svg
deleted file mode 100644
index 3bd44674699c3..0000000000000
--- a/src/vs/workbench/browser/parts/panel/media/close-light.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/workbench/browser/parts/panel/media/panelpart.css b/src/vs/workbench/browser/parts/panel/media/panelpart.css
index 9dc9bb2000fd7..0f4232c4e447f 100644
--- a/src/vs/workbench/browser/parts/panel/media/panelpart.css
+++ b/src/vs/workbench/browser/parts/panel/media/panelpart.css
@@ -124,20 +124,6 @@
margin-right: 10px;
}
-/* Close */
-.monaco-workbench .hide-panel-action {
- background: url('close-light.svg') center center no-repeat;
-}
-
-.vs-dark .monaco-workbench .hide-panel-action {
- background: url('close-dark.svg') center center no-repeat;
-}
-
-.hc-black .monaco-workbench .hide-panel-action {
- background: url('close-hc.svg') center center no-repeat;
-}
-
-
/* Up */
.monaco-workbench .maximize-panel-action {
background-image: url('chevron-up-light.svg');
diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts
index 904f8a364ba34..c8419eed7e709 100644
--- a/src/vs/workbench/browser/parts/panel/panelActions.ts
+++ b/src/vs/workbench/browser/parts/panel/panelActions.ts
@@ -28,7 +28,7 @@ export class ClosePanelAction extends Action {
name: string,
@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService
) {
- super(id, name, 'hide-panel-action');
+ super(id, name, 'codicon-close');
}
run(): Promise {
@@ -141,11 +141,11 @@ export class ToggleMaximizedPanelAction extends Action {
@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
@IEditorGroupsService editorGroupsService: IEditorGroupsService
) {
- super(id, label, layoutService.isPanelMaximized() ? 'minimize-panel-action' : 'maximize-panel-action');
+ super(id, label, layoutService.isPanelMaximized() ? 'codicon-chevron-down' : 'codicon-chevron-up');
this.toDispose.add(editorGroupsService.onDidLayout(() => {
const maximized = this.layoutService.isPanelMaximized();
- this.class = maximized ? 'minimize-panel-action' : 'maximize-panel-action';
+ this.class = maximized ? 'codicon-chevron-down' : 'codicon-chevron-up';
this.label = maximized ? ToggleMaximizedPanelAction.RESTORE_LABEL : ToggleMaximizedPanelAction.MAXIMIZE_LABEL;
}));
}
diff --git a/src/vs/workbench/browser/style.ts b/src/vs/workbench/browser/style.ts
index dbb318045f528..deaaf4953edd3 100644
--- a/src/vs/workbench/browser/style.ts
+++ b/src/vs/workbench/browser/style.ts
@@ -6,11 +6,17 @@
import 'vs/css!./media/style';
import { registerThemingParticipant, ITheme, ICssStyleCollector, HIGH_CONTRAST } from 'vs/platform/theme/common/themeService';
-import { foreground, selectionBackground, focusBorder, scrollbarShadow, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, listHighlightForeground, inputPlaceholderForeground } from 'vs/platform/theme/common/colorRegistry';
+import { iconForeground, foreground, selectionBackground, focusBorder, scrollbarShadow, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, listHighlightForeground, inputPlaceholderForeground } from 'vs/platform/theme/common/colorRegistry';
import { WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme';
registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+ // Icon defaults
+ const iconForegroundColor = theme.getColor(iconForeground);
+ if (iconForegroundColor) {
+ collector.addRule(`.monaco-workbench .codicon { color: ${iconForegroundColor}; }`);
+ }
+
// Foreground
const windowForeground = theme.getColor(foreground);
if (windowForeground) {
@@ -136,4 +142,5 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
}
`);
}
+
});
diff --git a/src/vs/workbench/contrib/debug/browser/media/clear-dark.svg b/src/vs/workbench/contrib/debug/browser/media/clear-dark.svg
deleted file mode 100644
index 04d64ab41ca3a..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/clear-dark.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/clear-hc.svg b/src/vs/workbench/contrib/debug/browser/media/clear-hc.svg
deleted file mode 100644
index 44a41edd3b3f6..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/clear-hc.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/clear-light.svg b/src/vs/workbench/contrib/debug/browser/media/clear-light.svg
deleted file mode 100644
index f6a51c856f000..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/clear-light.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/repl.css b/src/vs/workbench/contrib/debug/browser/media/repl.css
index 9d92c972d481f..e7befa209520e 100644
--- a/src/vs/workbench/contrib/debug/browser/media/repl.css
+++ b/src/vs/workbench/contrib/debug/browser/media/repl.css
@@ -88,19 +88,6 @@
font-size: 9px;
}
-/* Actions */
-.debug-action.clear-repl {
- background: url('clear-light.svg') center center no-repeat;
-}
-
-.vs-dark .debug-action.clear-repl {
- background: url('clear-dark.svg') center center no-repeat;
-}
-
-.hc-black .debug-action.clear-repl {
- background: url('clear-hc.svg') center center no-repeat;
-}
-
/* Output coloring and styling */
.repl .repl-tree .output.expression > .ignore {
font-style: italic;
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index ba438198881b1..ec21ca71f2cab 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -1008,7 +1008,7 @@ export class ClearReplAction extends Action {
constructor(id: string, label: string,
@IPanelService private readonly panelService: IPanelService
) {
- super(id, label, 'debug-action clear-repl');
+ super(id, label, 'debug-action codicon-clear-all');
}
run(): Promise {
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css b/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
index 79d7e01a69c58..ed1ba80ba46fd 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
@@ -78,7 +78,7 @@
margin: 0.15em;
}
-.monaco-action-bar .action-item .action-label.system-disable.icon {
+.monaco-action-bar .action-item .action-label.system-disable.codicon {
opacity: 1;
height: 18px;
width: 10px;
diff --git a/src/vs/workbench/contrib/markers/browser/markersPanel.ts b/src/vs/workbench/contrib/markers/browser/markersPanel.ts
index bbc4392c7f74a..01ef11a2cd460 100644
--- a/src/vs/workbench/contrib/markers/browser/markersPanel.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersPanel.ts
@@ -117,7 +117,7 @@ export class MarkersPanel extends Panel implements IMarkerFilterController {
this.rangeHighlightDecorations = this._register(this.instantiationService.createInstance(RangeHighlightDecorations));
// actions
- this.collapseAllAction = this._register(new Action('vs.tree.collapse', localize('collapseAll', "Collapse All"), 'monaco-tree-action collapse-all', true, async () => this.collapseAll()));
+ this.collapseAllAction = this._register(new Action('vs.tree.collapse', localize('collapseAll', "Collapse All"), 'monaco-tree-action codicon-collapse-all', true, async () => this.collapseAll()));
this.filterAction = this._register(this.instantiationService.createInstance(MarkersFilterAction, { filterText: this.panelState['filter'] || '', filterHistory: this.panelState['filterHistory'] || [], useFilesExclude: !!this.panelState['useFilesExclude'] }));
}
diff --git a/src/vs/workbench/contrib/markers/browser/markersPanelActions.ts b/src/vs/workbench/contrib/markers/browser/markersPanelActions.ts
index c45dee82e5dbd..1bc91c2d7cf0b 100644
--- a/src/vs/workbench/contrib/markers/browser/markersPanelActions.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersPanelActions.ts
@@ -213,7 +213,7 @@ export class MarkersFilterActionViewItem extends BaseActionViewItem {
private createFilesExcludeCheckbox(container: HTMLElement): void {
const filesExcludeFilter = this._register(new Checkbox({
- actionClassName: 'markers-panel-filter-filesExclude',
+ actionClassName: 'codicon codicon-exclude',
title: this.action.useFilesExclude ? Messages.MARKERS_PANEL_ACTION_TOOLTIP_DO_NOT_USE_FILES_EXCLUDE : Messages.MARKERS_PANEL_ACTION_TOOLTIP_USE_FILES_EXCLUDE,
isChecked: this.action.useFilesExclude
}));
diff --git a/src/vs/workbench/contrib/markers/browser/media/exclude-settings-dark.svg b/src/vs/workbench/contrib/markers/browser/media/exclude-settings-dark.svg
deleted file mode 100644
index 0b1694dc2f18f..0000000000000
--- a/src/vs/workbench/contrib/markers/browser/media/exclude-settings-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/markers/browser/media/exclude-settings-hc.svg b/src/vs/workbench/contrib/markers/browser/media/exclude-settings-hc.svg
deleted file mode 100644
index ba88235419aeb..0000000000000
--- a/src/vs/workbench/contrib/markers/browser/media/exclude-settings-hc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/markers/browser/media/exclude-settings-light.svg b/src/vs/workbench/contrib/markers/browser/media/exclude-settings-light.svg
deleted file mode 100644
index 114ec3f0fec6c..0000000000000
--- a/src/vs/workbench/contrib/markers/browser/media/exclude-settings-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/markers/browser/media/markers.css b/src/vs/workbench/contrib/markers/browser/media/markers.css
index 42321b8dba4a4..c8e9644312637 100644
--- a/src/vs/workbench/contrib/markers/browser/media/markers.css
+++ b/src/vs/workbench/contrib/markers/browser/media/markers.css
@@ -56,19 +56,6 @@
display: none;
}
-.vs .markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-filesExclude {
- background: url('exclude-settings-light.svg') center center no-repeat;
-}
-
-.vs-dark .markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-filesExclude,
-.hc-black .markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-filesExclude {
- background: url('exclude-settings-dark.svg') center center no-repeat;
-}
-
-.hc-black .markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-filesExclude {
- background: url('exclude-settings-hc.svg') center center no-repeat;
-}
-
.markers-panel .markers-panel-container {
height: 100%;
}
diff --git a/src/vs/workbench/contrib/output/browser/media/clear-dark.svg b/src/vs/workbench/contrib/output/browser/media/clear-dark.svg
deleted file mode 100644
index 04d64ab41ca3a..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/clear-dark.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/output/browser/media/clear-hc.svg b/src/vs/workbench/contrib/output/browser/media/clear-hc.svg
deleted file mode 100644
index 44a41edd3b3f6..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/clear-hc.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/output/browser/media/clear-light.svg b/src/vs/workbench/contrib/output/browser/media/clear-light.svg
deleted file mode 100644
index f6a51c856f000..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/clear-light.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/output/browser/media/locked-dark.svg b/src/vs/workbench/contrib/output/browser/media/locked-dark.svg
deleted file mode 100644
index ebdc1c0078a18..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/locked-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/output/browser/media/locked-hc.svg b/src/vs/workbench/contrib/output/browser/media/locked-hc.svg
deleted file mode 100644
index 350dc4177107e..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/locked-hc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/output/browser/media/locked-light.svg b/src/vs/workbench/contrib/output/browser/media/locked-light.svg
deleted file mode 100644
index 03b0351368829..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/locked-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/output/browser/media/open-file-dark.svg b/src/vs/workbench/contrib/output/browser/media/open-file-dark.svg
deleted file mode 100644
index ed302ae139840..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/open-file-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/output/browser/media/open-file-hc.svg b/src/vs/workbench/contrib/output/browser/media/open-file-hc.svg
deleted file mode 100644
index bba63494e6fb2..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/open-file-hc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/output/browser/media/open-file-light.svg b/src/vs/workbench/contrib/output/browser/media/open-file-light.svg
deleted file mode 100644
index 392a840c5ef6f..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/open-file-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/output/browser/media/output.css b/src/vs/workbench/contrib/output/browser/media/output.css
deleted file mode 100644
index 0f19102cc38b0..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/output.css
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.monaco-workbench .output-action.clear-output {
- background: url('clear-light.svg') center center no-repeat;
-}
-
-.vs-dark .monaco-workbench .output-action.clear-output {
- background: url('clear-dark.svg') center center no-repeat;
-}
-
-.hc-black .monaco-workbench .output-action.clear-output {
- background: url('clear-hc.svg') center center no-repeat;
-}
-
-.monaco-workbench .output-action.output-scroll-lock {
- background: url('locked-light.svg') center center no-repeat;
-}
-
-.vs-dark .monaco-workbench .output-action.output-scroll-lock {
- background: url('locked-dark.svg') center center no-repeat;
-}
-
-.hc-black .monaco-workbench .output-action.output-scroll-lock {
- background: url('locked-hc.svg') center center no-repeat;
-}
-
-.monaco-workbench .output-action.output-scroll-unlock {
- background: url('unlocked-light.svg') center center no-repeat;
-}
-
-.vs-dark .monaco-workbench .output-action.output-scroll-unlock {
- background: url('unlocked-dark.svg') center center no-repeat;
-}
-
-.hc-black .monaco-workbench .output-action.output-scroll-unlock {
- background: url('unlocked-hc.svg') center center no-repeat;
-}
-
-.monaco-workbench .output-action.open-log-file {
- background: url('open-file-light.svg') center center no-repeat;
-}
-
-.vs-dark .monaco-workbench .output-action.open-log-file {
- background: url('open-file-dark.svg') center center no-repeat;
-}
-
-.hc-black .monaco-workbench .output-action.open-log-file {
- background: url('open-file-hc.svg') center center no-repeat;
-}
diff --git a/src/vs/workbench/contrib/output/browser/media/unlocked-dark.svg b/src/vs/workbench/contrib/output/browser/media/unlocked-dark.svg
deleted file mode 100644
index 3b7947f9752f6..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/unlocked-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/output/browser/media/unlocked-hc.svg b/src/vs/workbench/contrib/output/browser/media/unlocked-hc.svg
deleted file mode 100644
index 100cfc1385a7f..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/unlocked-hc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/output/browser/media/unlocked-light.svg b/src/vs/workbench/contrib/output/browser/media/unlocked-light.svg
deleted file mode 100644
index 0c3cb4b93b0b6..0000000000000
--- a/src/vs/workbench/contrib/output/browser/media/unlocked-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/output/browser/outputActions.ts b/src/vs/workbench/contrib/output/browser/outputActions.ts
index 561891fc62e04..3760d018bf562 100644
--- a/src/vs/workbench/contrib/output/browser/outputActions.ts
+++ b/src/vs/workbench/contrib/output/browser/outputActions.ts
@@ -45,7 +45,7 @@ export class ClearOutputAction extends Action {
id: string, label: string,
@IOutputService private readonly outputService: IOutputService
) {
- super(id, label, 'output-action clear-output');
+ super(id, label, 'output-action codicon-clear-all');
}
public run(): Promise {
@@ -67,7 +67,7 @@ export class ToggleOrSetOutputScrollLockAction extends Action {
public static readonly LABEL = nls.localize({ key: 'toggleOutputScrollLock', comment: ['Turn on / off automatic output scrolling'] }, "Toggle Output Scroll Lock");
constructor(id: string, label: string, @IOutputService private readonly outputService: IOutputService) {
- super(id, label, 'output-action output-scroll-unlock');
+ super(id, label, 'output-action codicon-unlock');
this._register(this.outputService.onActiveOutputChannel(channel => {
const activeChannel = this.outputService.getActiveChannel();
if (activeChannel) {
@@ -94,10 +94,10 @@ export class ToggleOrSetOutputScrollLockAction extends Action {
private setClassAndLabel(locked: boolean) {
if (locked) {
- this.class = 'output-action output-scroll-lock';
+ this.class = 'output-action codicon-lock';
this.label = nls.localize('outputScrollOn', "Turn Auto Scrolling On");
} else {
- this.class = 'output-action output-scroll-unlock';
+ this.class = 'output-action codicon-unlock';
this.label = nls.localize('outputScrollOff', "Turn Auto Scrolling Off");
}
}
@@ -185,7 +185,7 @@ export class OpenLogOutputFile extends Action {
@IEditorService private readonly editorService: IEditorService,
@IInstantiationService private readonly instantiationService: IInstantiationService
) {
- super(OpenLogOutputFile.ID, OpenLogOutputFile.LABEL, 'output-action open-log-file');
+ super(OpenLogOutputFile.ID, OpenLogOutputFile.LABEL, 'output-action codicon-go-to-file');
this._register(this.outputService.onActiveOutputChannel(this.update, this));
this.update();
}
diff --git a/src/vs/workbench/contrib/output/browser/outputPanel.ts b/src/vs/workbench/contrib/output/browser/outputPanel.ts
index f1c0b211d3281..9f58f043851d5 100644
--- a/src/vs/workbench/contrib/output/browser/outputPanel.ts
+++ b/src/vs/workbench/contrib/output/browser/outputPanel.ts
@@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import 'vs/css!./media/output';
import * as nls from 'vs/nls';
import { Action, IAction } from 'vs/base/common/actions';
import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
diff --git a/src/vs/workbench/contrib/search/browser/media/searchview.css b/src/vs/workbench/contrib/search/browser/media/searchview.css
index f530bce968ae0..decc617396219 100644
--- a/src/vs/workbench/contrib/search/browser/media/searchview.css
+++ b/src/vs/workbench/contrib/search/browser/media/searchview.css
@@ -86,7 +86,7 @@
height: 25px;
}
-.search-view .search-widget .replace-container .monaco-action-bar .action-item .icon {
+.search-view .search-widget .replace-container .monaco-action-bar .action-item .codicon {
background-repeat: no-repeat;
width: 20px;
height: 25px;
diff --git a/src/vs/workbench/contrib/terminal/browser/media/kill-dark.svg b/src/vs/workbench/contrib/terminal/browser/media/kill-dark.svg
deleted file mode 100644
index 9831c96a166d8..0000000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/kill-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/terminal/browser/media/kill-hc.svg b/src/vs/workbench/contrib/terminal/browser/media/kill-hc.svg
deleted file mode 100644
index 656f3bd7a42a5..0000000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/kill-hc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/terminal/browser/media/kill-light.svg b/src/vs/workbench/contrib/terminal/browser/media/kill-light.svg
deleted file mode 100644
index d5ac851860b29..0000000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/kill-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/terminal/browser/media/new-dark.svg b/src/vs/workbench/contrib/terminal/browser/media/new-dark.svg
deleted file mode 100644
index 4d9389336b93e..0000000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/new-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/terminal/browser/media/new-hc.svg b/src/vs/workbench/contrib/terminal/browser/media/new-hc.svg
deleted file mode 100644
index fb50c6c28499b..0000000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/new-hc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/terminal/browser/media/new-light.svg b/src/vs/workbench/contrib/terminal/browser/media/new-light.svg
deleted file mode 100644
index 01a9de7d5abc4..0000000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/new-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/terminal/browser/media/split-editor-horizontal-dark.svg b/src/vs/workbench/contrib/terminal/browser/media/split-editor-horizontal-dark.svg
deleted file mode 100644
index 8c22a7c5bfeda..0000000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/split-editor-horizontal-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/terminal/browser/media/split-editor-horizontal-hc.svg b/src/vs/workbench/contrib/terminal/browser/media/split-editor-horizontal-hc.svg
deleted file mode 100644
index 82c19d0c8fc26..0000000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/split-editor-horizontal-hc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/terminal/browser/media/split-editor-horizontal-light.svg b/src/vs/workbench/contrib/terminal/browser/media/split-editor-horizontal-light.svg
deleted file mode 100644
index 2d53ab6d3c25f..0000000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/split-editor-horizontal-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/terminal/browser/media/split-editor-vertical-dark.svg b/src/vs/workbench/contrib/terminal/browser/media/split-editor-vertical-dark.svg
deleted file mode 100644
index 419c21be4f62d..0000000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/split-editor-vertical-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/terminal/browser/media/split-editor-vertical-hc.svg b/src/vs/workbench/contrib/terminal/browser/media/split-editor-vertical-hc.svg
deleted file mode 100644
index 7565fd3c16818..0000000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/split-editor-vertical-hc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/terminal/browser/media/split-editor-vertical-light.svg b/src/vs/workbench/contrib/terminal/browser/media/split-editor-vertical-light.svg
deleted file mode 100644
index 7e95763b463e3..0000000000000
--- a/src/vs/workbench/contrib/terminal/browser/media/split-editor-vertical-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/terminal/browser/media/terminal.css b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
index be6edf706dce4..d50dd4b92539b 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/terminal.css
+++ b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
@@ -144,24 +144,6 @@
opacity: 0 !important;
}
-/* Light theme */
-.monaco-workbench .terminal-action.kill { background: url('kill-light.svg') center center no-repeat; }
-.monaco-workbench .terminal-action.new { background: url('new-light.svg') center center no-repeat; }
-.monaco-workbench .terminal-action.split { background: url('split-editor-horizontal-light.svg') center center no-repeat; }
-.monaco-workbench .panel.right .terminal-action.split { background: url('split-editor-vertical-light.svg') center center no-repeat; }
-
-/* Dark theme */
-.vs-dark .monaco-workbench .terminal-action.kill, .hc-black .monaco-workbench .terminal-action.kill { background: url('kill-dark.svg') center center no-repeat; }
-.vs-dark .monaco-workbench .terminal-action.new, .hc-black .monaco-workbench .terminal-action.new { background: url('new-dark.svg') center center no-repeat; }
-.vs-dark .monaco-workbench .terminal-action.split, .hc-black .monaco-workbench .terminal-action.split { background: url('split-editor-horizontal-dark.svg') center center no-repeat; }
-.vs-dark .monaco-workbench .panel.right .terminal-action.split, .hc-black .monaco-workbench .panel.right .terminal-action.split { background: url('split-editor-vertical-dark.svg') center center no-repeat; }
-
-/* HC theme */
-.hc-black .monaco-workbench .terminal-action.kill, .hc-black .monaco-workbench .terminal-action.kill { background: url('kill-hc.svg') center center no-repeat; }
-.hc-black .monaco-workbench .terminal-action.new, .hc-black .monaco-workbench .terminal-action.new { background: url('new-hc.svg') center center no-repeat; }
-.hc-black .monaco-workbench .terminal-action.split, .hc-black .monaco-workbench .terminal-action.split { background: url('split-editor-horizontal-hc.svg') center center no-repeat; }
-.hc-black .monaco-workbench .panel.right .terminal-action.split, .hc-black .monaco-workbench .panel.right .terminal-action.split { background: url('split-editor-vertical-hc.svg') center center no-repeat; }
-
.vs-dark .monaco-workbench.mac .panel.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events),
.hc-black .monaco-workbench.mac .panel.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events) {
cursor: -webkit-image-set(url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAL0lEQVQoz2NgCD3x//9/BhBYBWdhgFVAiVW4JBFKGIa4AqD0//9D3pt4I4tAdAMAHTQ/j5Zom30AAAAASUVORK5CYII=') 1x, url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAAz0lEQVRIx2NgYGBY/R8I/vx5eelX3n82IJ9FxGf6tksvf/8FiTMQAcAGQMDvSwu09abffY8QYSAScNk45G198eX//yev73/4///701eh//kZSARckrNBRvz//+8+6ZohwCzjGNjdgQxkAg7B9WADeBjIBqtJCbhRA0YNoIkBSNmaPEMoNmA0FkYNoFKhapJ6FGyAH3nauaSmPfwI0v/3OukVi0CIZ+F25KrtYcx/CTIy0e+rC7R1Z4KMICVTQQ14feVXIbR695u14+Ir4gwAAD49E54wc1kWAAAAAElFTkSuQmCC') 2x) 5 8, text;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
index 6357326ade2a1..5c6c751e72017 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
@@ -105,7 +105,7 @@ export class KillTerminalAction extends Action {
id: string, label: string,
@ITerminalService private readonly terminalService: ITerminalService
) {
- super(id, label, 'terminal-action kill');
+ super(id, label, 'terminal-action codicon-trash');
}
public run(event?: any): Promise {
@@ -336,7 +336,7 @@ export class CreateNewTerminalAction extends Action {
@ICommandService private readonly commandService: ICommandService,
@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService
) {
- super(id, label, 'terminal-action new');
+ super(id, label, 'terminal-action codicon-add');
}
public run(event?: any): Promise {
@@ -412,7 +412,7 @@ export class SplitTerminalAction extends Action {
@ICommandService private readonly commandService: ICommandService,
@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService
) {
- super(id, label, 'terminal-action split');
+ super(id, label, 'terminal-action codicon-split-horizontal');
}
public run(event?: any): Promise {
diff --git a/test/automation/src/keybindings.ts b/test/automation/src/keybindings.ts
index 9544b5992dbd8..70be12b237899 100644
--- a/test/automation/src/keybindings.ts
+++ b/test/automation/src/keybindings.ts
@@ -24,7 +24,7 @@ export class KeybindingsEditor {
await this.code.waitAndClick('.keybindings-list-container .monaco-list-row.keybinding-item');
await this.code.waitForElement('.keybindings-list-container .monaco-list-row.keybinding-item.focused.selected');
- await this.code.waitAndClick('.keybindings-list-container .monaco-list-row.keybinding-item .action-item .icon.add');
+ await this.code.waitAndClick('.keybindings-list-container .monaco-list-row.keybinding-item .action-item .codicon.add');
await this.code.waitForActiveElement('.defineKeybindingWidget .monaco-inputbox input');
await this.code.dispatchKeybinding(keybinding);