Skip to content

Commit 1f9045f

Browse files
author
Miguel Solorio
committed
Replace Octicons with Codicons
1 parent 8f6eb88 commit 1f9045f

13 files changed

Lines changed: 21 additions & 320 deletions

File tree

‎build/gulpfile.editor.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
8585
`lib.webworker.importscripts.d.ts`
8686
],
8787
redirects: {
88-
'vs/base/browser/ui/octiconLabel/octiconLabel': 'vs/base/browser/ui/octiconLabel/octiconLabel.mock',
88+
'vs/base/browser/ui/codiconLabel/codiconLabel': 'vs/base/browser/ui/codiconLabel/codiconLabel.mock',
8989
},
9090
shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
9191
importIgnorePattern: /(^vs\/css!)|(promise-polyfill\/polyfill)/,

‎build/gulpfile.vscode.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ const vscodeResources = [
6767
'out-build/vs/base/common/performance.js',
6868
'out-build/vs/base/node/languagePacks.js',
6969
'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',
70-
'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
7170
'out-build/vs/base/browser/ui/codiconLabel/codicon/**',
7271
'out-build/vs/workbench/browser/media/*-theme.css',
7372
'out-build/vs/workbench/contrib/debug/**/*.json',
@@ -627,4 +626,3 @@ function getSettingsSearchBuildId(packageJson) {
627626
throw new Error('Could not determine build number: ' + e.toString());
628627
}
629628
}
630-

src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts renamed to src/vs/base/browser/ui/codiconLabel/codiconLabel.mock.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
import { escape } from 'vs/base/common/strings';
77

8-
export function renderOcticons(text: string): string {
8+
export function renderCodicons(text: string): string {
99
return escape(text);
1010
}
1111

12-
export class OcticonLabel {
12+
export class CodiconLabel {
1313

1414
private _container: HTMLElement;
1515

@@ -18,7 +18,7 @@ export class OcticonLabel {
1818
}
1919

2020
set text(text: string) {
21-
this._container.innerHTML = renderOcticons(text || '');
21+
this._container.innerHTML = renderCodicons(text || '');
2222
}
2323

2424
}

‎src/vs/base/browser/ui/octiconLabel/octiconLabel.ts‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/vs/base/browser/ui/octiconLabel/octicons/octicons-animations.css‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/vs/base/browser/ui/octiconLabel/octicons/octicons.css‎

Lines changed: 0 additions & 251 deletions
This file was deleted.

‎src/vs/base/browser/ui/octiconLabel/octicons/octicons.ttf‎

-34.6 KB
Binary file not shown.

‎src/vs/code/electron-browser/issue/issueReporterMain.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { IssueReporterData, IssueReporterStyles, IssueType, ISettingsSearchIssue
3434
import BaseHtml from 'vs/code/electron-browser/issue/issueReporterPage';
3535
import { LoggerChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
3636
import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
37-
import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
37+
import { CodiconLabel } from 'vs/base/browser/ui/codiconLabel/codiconLabel';
3838
import { normalizeGitHubUrl } from 'vs/code/electron-browser/issue/issueReporterUtil';
3939
import { Button } from 'vs/base/browser/ui/button/button';
4040
import { SystemInfo, isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
@@ -647,7 +647,7 @@ export class IssueReporter extends Disposable {
647647
issueState = $('span.issue-state');
648648

649649
const issueIcon = $('span.issue-icon');
650-
const octicon = new OcticonLabel(issueIcon);
650+
const octicon = new CodiconLabel(issueIcon);
651651
octicon.text = issue.state === 'open' ? '$(issue-opened)' : '$(issue-closed)';
652652

653653
const issueStateLabel = $('span.issue-state.label');

‎src/vs/editor/contrib/codelens/codelensWidget.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import 'vs/css!./codelensWidget';
77
import * as dom from 'vs/base/browser/dom';
88
import { coalesce, isFalsyOrEmpty } from 'vs/base/common/arrays';
9-
import { renderOcticons } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
9+
import { renderCodicons } from 'vs/base/browser/ui/codiconLabel/codiconLabel';
1010
import * as editorBrowser from 'vs/editor/browser/editorBrowser';
1111
import { Range } from 'vs/editor/common/core/range';
1212
import { IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
@@ -104,7 +104,7 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
104104
for (let i = 0; i < symbols.length; i++) {
105105
const command = symbols[i].command;
106106
if (command) {
107-
const title = renderOcticons(command.title);
107+
const title = renderCodicons(command.title);
108108
let part: string;
109109
if (command.id) {
110110
part = `<a id=${i}>${title}</a>`;

‎src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@
104104
pointer-events: none;
105105
}
106106

107-
.monaco-workbench .part.statusbar > .items-container > .statusbar-item span.octicon {
107+
.monaco-workbench .part.statusbar > .items-container > .statusbar-item span.codicon {
108108
text-align: center;
109109
font-size: 14px;
110+
color: inherit;
110111
}

0 commit comments

Comments
 (0)