Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adopt icon font in explorer #81350

Merged
merged 12 commits into from
Sep 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@
"msjsdiag.debugger-for-chrome": "workspace"
},
"files.insertFinalNewline": true
}
}
3 changes: 3 additions & 0 deletions src/vs/base/browser/ui/splitview/panelview.css
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@
background-position: center center;
background-repeat: no-repeat;
margin-right: 0;
display: flex;
align-items: center;
justify-content: center;
}

/* Bold font style does not go well with CJK fonts */
Expand Down
5 changes: 0 additions & 5 deletions src/vs/base/browser/ui/toolbar/ellipsis-dark.svg

This file was deleted.

5 changes: 0 additions & 5 deletions src/vs/base/browser/ui/toolbar/ellipsis-hc.svg

This file was deleted.

5 changes: 0 additions & 5 deletions src/vs/base/browser/ui/toolbar/ellipsis-light.svg

This file was deleted.

12 changes: 0 additions & 12 deletions src/vs/base/browser/ui/toolbar/toolbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,3 @@
display: inline-block;
padding: 0;
}

.vs .monaco-toolbar .action-label.toolbar-toggle-more {
background-image: url('ellipsis-light.svg');
}

.vs-dark .monaco-toolbar .action-label.toolbar-toggle-more {
background-image: url('ellipsis-dark.svg');
}

.hc-black .monaco-toolbar .action-label.toolbar-toggle-more {
background-image: url('ellipsis-hc.svg');
}
2 changes: 1 addition & 1 deletion src/vs/base/browser/ui/toolbar/toolbar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export class ToolBar extends Disposable {
this.options.actionViewItemProvider,
this.actionRunner,
this.options.getKeyBinding,
'toolbar-toggle-more',
'codicon-more',
this.options.anchorAlignmentProvider
);
this.toggleMenuActionViewItem.value.setActionContext(this.actionBar.context);
Expand Down
2 changes: 1 addition & 1 deletion src/vs/base/browser/ui/tree/treeDefaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ export class CollapseAllAction<TInput, T, TFilterData = void> extends Action {

return Promise.resolve();
}
}
}
2 changes: 1 addition & 1 deletion src/vs/workbench/browser/actions/layoutActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export class ToggleEditorLayoutAction extends Action {
) {
super(id, label);

this.class = 'flip-editor-layout';
this.class = 'codicon-editor-layout';
this.updateEnablement();

this.registerListeners();
Expand Down
21 changes: 0 additions & 21 deletions src/vs/workbench/browser/actions/media/actions.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,3 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

.vs .monaco-workbench .flip-editor-layout {
background-image: url('layout-light.svg');
}

.vs-dark .monaco-workbench .flip-editor-layout {
background-image: url('layout-dark.svg');
}

.hc-black .monaco-workbench .flip-editor-layout {
background-image: url('layout-hc.svg');
}

.vs .action-remove-from-recently-opened {
background: url("remove-light.svg") center center no-repeat;
}

.vs-dark .action-remove-from-recently-opened,
.hc-black .action-remove-from-recently-opened {
background: url("remove-dark.svg") center center no-repeat;
}
3 changes: 0 additions & 3 deletions src/vs/workbench/browser/actions/media/layout-dark.svg

This file was deleted.

3 changes: 0 additions & 3 deletions src/vs/workbench/browser/actions/media/layout-hc.svg

This file was deleted.

3 changes: 0 additions & 3 deletions src/vs/workbench/browser/actions/media/layout-light.svg

This file was deleted.

3 changes: 0 additions & 3 deletions src/vs/workbench/browser/actions/media/remove-dark.svg

This file was deleted.

3 changes: 0 additions & 3 deletions src/vs/workbench/browser/actions/media/remove-light.svg

This file was deleted.

6 changes: 3 additions & 3 deletions src/vs/workbench/browser/parts/editor/editorActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ export class CloseEditorAction extends Action {
label: string,
@ICommandService private readonly commandService: ICommandService
) {
super(id, label, 'close-editor-action');
super(id, label, 'codicon-close');
}

run(context?: IEditorCommandsContext): Promise<any> {
Expand All @@ -485,7 +485,7 @@ export class CloseOneEditorAction extends Action {
label: string,
@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService
) {
super(id, label, 'close-editor-action');
super(id, label, 'codicon-close');
}

run(context?: IEditorCommandsContext): Promise<any> {
Expand Down Expand Up @@ -669,7 +669,7 @@ export class CloseAllEditorsAction extends BaseCloseAllAction {
@ITextFileService textFileService: ITextFileService,
@IEditorGroupsService editorGroupService: IEditorGroupsService
) {
super(id, label, 'action-close-all-files', textFileService, editorGroupService);
super(id, label, 'codicon-close-all', textFileService, editorGroupService);
}

protected doCloseAll(): Promise<any> {
Expand Down
3 changes: 0 additions & 3 deletions src/vs/workbench/browser/parts/editor/media/close-dark.svg

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions src/vs/workbench/browser/parts/editor/media/close-hc.svg

This file was deleted.

3 changes: 0 additions & 3 deletions src/vs/workbench/browser/parts/editor/media/close-light.svg

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,6 @@
background-repeat: no-repeat;
}

.vs .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group {
background-image: url('close-light.svg');
}

.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group,
.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group {
background-image: url('close-dark.svg');
}

/* Editor */

.monaco-workbench .part.editor > .content .editor-group-container.empty > .editor-container {
Expand Down
12 changes: 0 additions & 12 deletions src/vs/workbench/browser/parts/editor/media/editorstatus.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,3 @@
margin-right: 5px;
max-width: fit-content;
}

.vs .monaco-workbench .screen-reader-detected-explanation .cancel {
background: url('close-light.svg') center center no-repeat;
}

.vs-dark .monaco-workbench .screen-reader-detected-explanation .cancel {
background: url('close-dark.svg') center center no-repeat;
}

.hc-black .monaco-workbench .screen-reader-detected-explanation .cancel {
background: url('close-hc.svg') center center no-repeat;
}
36 changes: 6 additions & 30 deletions src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,12 @@
opacity: 1;
}

/* change close icon to dirty state icon */
.monaco-workbench .part.editor > .content .editor-group-container.active > .title .tabs-container > .tab.dirty > .tab-close .action-label:not(:hover)::before,
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty > .tab-close .action-label:not(:hover)::before {
content: "\ea71"; /* use `circle-filled` icon unicode */
}

.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active > .tab-close .action-label, /* show dimmed for inactive group */
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active:hover > .tab-close .action-label, /* show dimmed for inactive group */
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty > .tab-close .action-label, /* show dimmed for inactive group */
Expand All @@ -216,27 +222,6 @@
margin-right: 0.5em;
}

.vs .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action {
background: url('close-dirty-light.svg') center center no-repeat;
}

.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action,
.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action {
background: url('close-dirty-dark.svg') center center no-repeat;
}

.vs .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action:hover {
background: url('close-light.svg') center center no-repeat;
}

.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action:hover {
background: url('close-dark.svg') center center no-repeat;
}

.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action:hover {
background: url('close-hc.svg') center center no-repeat;
}

/* No Tab Close Button */

.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off {
Expand All @@ -254,15 +239,6 @@
padding-right: 28px; /* make room for dirty indication when we are running without close button */
}

.vs .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off.dirty:not(.dirty-border-top) {
background-image: url('close-dirty-light.svg');
}

.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off.dirty:not(.dirty-border-top),
.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off.dirty {
background-image: url('close-dirty-dark.svg');
}

/* Editor Actions */

.monaco-workbench .part.editor > .content .editor-group-container > .title .editor-actions {
Expand Down
16 changes: 1 addition & 15 deletions src/vs/workbench/browser/parts/editor/media/titlecontrol.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,6 @@
cursor: grab;
}

/* Actions */

.monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action {
background: url('close-light.svg') center center no-repeat;
}

.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action {
background: url('close-dark.svg') center center no-repeat;
}

.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action {
background: url('close-hc.svg') center center no-repeat;
}

/* Drag and Drop Feedback */

.monaco-editor-group-drag-image {
Expand All @@ -76,4 +62,4 @@
border-radius: 10px;
font-size: 12px;
position: absolute;
}
}
Loading