diff --git a/src/vs/workbench/contrib/search/browser/media/clear-dark.svg b/src/vs/workbench/contrib/search/browser/media/clear-dark.svg deleted file mode 100644 index 7a95ac064623b..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/clear-dark.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/vs/workbench/contrib/search/browser/media/clear-hc.svg b/src/vs/workbench/contrib/search/browser/media/clear-hc.svg deleted file mode 100644 index 6709e070c672c..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/clear-hc.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/vs/workbench/contrib/search/browser/media/clear-light.svg b/src/vs/workbench/contrib/search/browser/media/clear-light.svg deleted file mode 100644 index b024caa8052ae..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/clear-light.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/vs/workbench/contrib/search/browser/media/collapse-all-dark.svg b/src/vs/workbench/contrib/search/browser/media/collapse-all-dark.svg deleted file mode 100644 index 4862c55dbeba7..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/collapse-all-dark.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/search/browser/media/collapse-all-hc.svg b/src/vs/workbench/contrib/search/browser/media/collapse-all-hc.svg deleted file mode 100644 index 05f920b29b685..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/collapse-all-hc.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/search/browser/media/collapse-all-light.svg b/src/vs/workbench/contrib/search/browser/media/collapse-all-light.svg deleted file mode 100644 index 6359b42e623fb..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/collapse-all-light.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/search/browser/media/ellipsis-dark.svg b/src/vs/workbench/contrib/search/browser/media/ellipsis-dark.svg deleted file mode 100644 index 2c52e359f610d..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/ellipsis-dark.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/vs/workbench/contrib/search/browser/media/ellipsis-hc.svg b/src/vs/workbench/contrib/search/browser/media/ellipsis-hc.svg deleted file mode 100644 index 3d7068f6b4cd1..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/ellipsis-hc.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/vs/workbench/contrib/search/browser/media/ellipsis-light.svg b/src/vs/workbench/contrib/search/browser/media/ellipsis-light.svg deleted file mode 100644 index 883d2722ce306..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/ellipsis-light.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/vs/workbench/contrib/search/browser/media/exclude-settings-dark.svg b/src/vs/workbench/contrib/search/browser/media/exclude-settings-dark.svg deleted file mode 100644 index 0b1694dc2f18f..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/exclude-settings-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/exclude-settings-hc.svg b/src/vs/workbench/contrib/search/browser/media/exclude-settings-hc.svg deleted file mode 100644 index ba88235419aeb..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/exclude-settings-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/exclude-settings-light.svg b/src/vs/workbench/contrib/search/browser/media/exclude-settings-light.svg deleted file mode 100644 index 114ec3f0fec6c..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/exclude-settings-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/refresh-dark.svg b/src/vs/workbench/contrib/search/browser/media/refresh-dark.svg deleted file mode 100644 index e1f05aadeebdf..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/refresh-dark.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/search/browser/media/refresh-hc.svg b/src/vs/workbench/contrib/search/browser/media/refresh-hc.svg deleted file mode 100644 index 48fc30f2c48d0..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/refresh-hc.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/search/browser/media/refresh-light.svg b/src/vs/workbench/contrib/search/browser/media/refresh-light.svg deleted file mode 100644 index 9b1d910840919..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/refresh-light.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/vs/workbench/contrib/search/browser/media/remove-dark.svg b/src/vs/workbench/contrib/search/browser/media/remove-dark.svg deleted file mode 100644 index 6d16d212ae504..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/remove-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/remove-hc.svg b/src/vs/workbench/contrib/search/browser/media/remove-hc.svg deleted file mode 100644 index fa205f4ee128c..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/remove-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/remove-light.svg b/src/vs/workbench/contrib/search/browser/media/remove-light.svg deleted file mode 100644 index 742fcae4ae7d6..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/remove-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/replace-all-dark.svg b/src/vs/workbench/contrib/search/browser/media/replace-all-dark.svg deleted file mode 100644 index 07bd41a789f30..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/replace-all-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/replace-all-hc.svg b/src/vs/workbench/contrib/search/browser/media/replace-all-hc.svg deleted file mode 100644 index e375cf395e1a1..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/replace-all-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/replace-all-light.svg b/src/vs/workbench/contrib/search/browser/media/replace-all-light.svg deleted file mode 100644 index cd3974fae7ec8..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/replace-all-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/replace-dark.svg b/src/vs/workbench/contrib/search/browser/media/replace-dark.svg deleted file mode 100644 index 5882b22c58926..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/replace-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/replace-hc.svg b/src/vs/workbench/contrib/search/browser/media/replace-hc.svg deleted file mode 100644 index 7b419b11308b0..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/replace-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/replace-light.svg b/src/vs/workbench/contrib/search/browser/media/replace-light.svg deleted file mode 100644 index 220f2aba40c07..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/replace-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/searchview.css b/src/vs/workbench/contrib/search/browser/media/searchview.css index decc617396219..1505caa8e6ad8 100644 --- a/src/vs/workbench/contrib/search/browser/media/searchview.css +++ b/src/vs/workbench/contrib/search/browser/media/searchview.css @@ -18,6 +18,9 @@ background-position: center center; background-repeat: no-repeat; cursor: pointer; + display: flex; + align-items: center; + justify-content: center; } .search-view .search-widget .search-container, @@ -104,22 +107,10 @@ right: 0; cursor: pointer; width: 16px; - height: 13px; + height: 16px; z-index: 2; /* Force it above the search results message, which has a negative top margin */ } -.vs-dark .monaco-workbench .search-view .query-details .more { - background: url('ellipsis-dark.svg') center no-repeat; -} - -.hc-black .monaco-workbench .search-view .query-details .more { - background: url('ellipsis-hc.svg') center no-repeat; -} - -.vs .monaco-workbench .search-view .query-details .more { - background: url('ellipsis-light.svg') center no-repeat; -} - .search-view .query-details .file-types { display: none; } @@ -261,30 +252,6 @@ margin-top: 2px; } -.search-view .action-replace { - background-image: url('replace-light.svg'); -} - -.vs-dark .search-view .action-replace { - background-image: url('replace-dark.svg'); -} - -.hc-black .search-view .action-replace { - background-image: url('replace-hc.svg'); -} - -.search-view .action-replace-all { - background: url('replace-all-light.svg') center center no-repeat; -} - -.vs-dark .search-view .action-replace-all { - background: url('replace-all-dark.svg') center center no-repeat; -} - -.hc-black .search-view .action-replace-all { - background: url('replace-all-hc.svg') center center no-repeat; -} - .search-view .monaco-count-badge { margin-right: 12px; } @@ -298,67 +265,6 @@ display: none; } -.monaco-workbench .search-action.refresh { - background: url('refresh-light.svg') center center no-repeat; -} - -.vs-dark .monaco-workbench .search-action.refresh { - background: url('refresh-dark.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .search-action.refresh { - background: url('refresh-hc.svg') center center no-repeat; -} - -.monaco-workbench .search-action.collapse { - background: url('collapse-all-light.svg') center center no-repeat; -} - -.vs-dark .monaco-workbench .search-action.collapse, -.hc-black .monaco-workbench .search-action.collapse { - background: url('collapse-all-dark.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .search-action.collapse { - background: url('collapse-all-hc.svg') center center no-repeat; -} - -.monaco-workbench .search-action.clear-search-results { - background: url('clear-light.svg') center center no-repeat; -} - -.vs-dark .monaco-workbench .search-action.clear-search-results { - background: url('clear-dark.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .search-action.clear-search-results { - background: url('clear-hc.svg') center center no-repeat; -} - -.monaco-workbench .search-action.cancel-search { - background: url('stop-light.svg') center center no-repeat; -} - -.vs-dark .monaco-workbench .search-action.cancel-search { - background: url('stop-dark.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .search-action.cancel-search { - background: url('stop-hc.svg') center center no-repeat; -} - -.vs .monaco-workbench .search-view .query-details .file-types .controls>.monaco-custom-checkbox.useExcludesAndIgnoreFiles { - background: url('exclude-settings-light.svg') center center no-repeat; -} - -.vs-dark .monaco-workbench .search-view .query-details .file-types .controls>.monaco-custom-checkbox.useExcludesAndIgnoreFiles { - background: url('exclude-settings-dark.svg') center center no-repeat; -} - -.hc-black .monaco-workbench .search-view .query-details .file-types .controls>.monaco-custom-checkbox.useExcludesAndIgnoreFiles { - background: url('exclude-settings-hc.svg') center center no-repeat; -} - .search-view .replace.findInFileMatch { text-decoration: line-through; } @@ -388,18 +294,6 @@ background-color: rgba(255, 255, 255, 0.1) !important; } -.search-view .action-remove { - background: url("remove-light.svg") center center no-repeat; -} - -.vs-dark .search-view .action-remove { - background: url("remove-dark.svg") center center no-repeat; -} - -.hc-black .search-view .action-remove { - background: url("remove-hc.svg") center center no-repeat; -} - .vs-dark .search-view .message { opacity: .5; } @@ -409,30 +303,6 @@ padding: 0; } -.vs .search-view .search-widget .toggle-replace-button.expand { - background-image: url('tree-expanded-light.svg'); -} - -.vs-dark .search-view .search-widget .toggle-replace-button.expand { - background-image: url('tree-expanded-dark.svg'); -} - -.hc-black .search-view .search-widget .toggle-replace-button.expand { - background-image: url('tree-expanded-hc.svg'); -} - -.vs .search-view .search-widget .toggle-replace-button.collapse { - background-image: url('tree-collapsed-light.svg'); -} - -.vs-dark .search-view .search-widget .toggle-replace-button.collapse { - background-image: url('tree-collapsed-dark.svg'); -} - -.hc-black .search-view .search-widget .toggle-replace-button.collapse { - background-image: url('tree-collapsed-hc.svg'); -} - /* High Contrast Theming */ .hc-black .monaco-workbench .search-view .foldermatch, diff --git a/src/vs/workbench/contrib/search/browser/media/stop-dark.svg b/src/vs/workbench/contrib/search/browser/media/stop-dark.svg deleted file mode 100644 index 890af29835444..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/stop-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/stop-hc.svg b/src/vs/workbench/contrib/search/browser/media/stop-hc.svg deleted file mode 100644 index 1c88dfb60a7b2..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/stop-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/stop-light.svg b/src/vs/workbench/contrib/search/browser/media/stop-light.svg deleted file mode 100644 index 7e41aeff58966..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/stop-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/tree-collapsed-dark.svg b/src/vs/workbench/contrib/search/browser/media/tree-collapsed-dark.svg deleted file mode 100644 index f518fc1632a11..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/tree-collapsed-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/tree-collapsed-hc.svg b/src/vs/workbench/contrib/search/browser/media/tree-collapsed-hc.svg deleted file mode 100644 index 40ba72b70868a..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/tree-collapsed-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/tree-collapsed-light.svg b/src/vs/workbench/contrib/search/browser/media/tree-collapsed-light.svg deleted file mode 100644 index 0d746558a4fa9..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/tree-collapsed-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/tree-expanded-dark.svg b/src/vs/workbench/contrib/search/browser/media/tree-expanded-dark.svg deleted file mode 100644 index a1df6a8d44ae5..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/tree-expanded-dark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/tree-expanded-hc.svg b/src/vs/workbench/contrib/search/browser/media/tree-expanded-hc.svg deleted file mode 100644 index 4f2ec14692729..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/tree-expanded-hc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/media/tree-expanded-light.svg b/src/vs/workbench/contrib/search/browser/media/tree-expanded-light.svg deleted file mode 100644 index e60e357f573d5..0000000000000 --- a/src/vs/workbench/contrib/search/browser/media/tree-expanded-light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/vs/workbench/contrib/search/browser/patternInputWidget.ts b/src/vs/workbench/contrib/search/browser/patternInputWidget.ts index 2dc5484c5348e..b2a57faee4243 100644 --- a/src/vs/workbench/contrib/search/browser/patternInputWidget.ts +++ b/src/vs/workbench/contrib/search/browser/patternInputWidget.ts @@ -195,7 +195,7 @@ export class ExcludePatternInputWidget extends PatternInputWidget { protected renderSubcontrols(controlsDiv: HTMLDivElement): void { this.useExcludesAndIgnoreFilesBox = this._register(new Checkbox({ - actionClassName: 'useExcludesAndIgnoreFiles', + actionClassName: 'useExcludesAndIgnoreFiles codicon-exclude', title: nls.localize('useExcludesAndIgnoreFilesDescription', "Use Exclude Settings and Ignore Files"), isChecked: true, })); diff --git a/src/vs/workbench/contrib/search/browser/searchActions.ts b/src/vs/workbench/contrib/search/browser/searchActions.ts index a8c6d8774f384..099312d3d9805 100644 --- a/src/vs/workbench/contrib/search/browser/searchActions.ts +++ b/src/vs/workbench/contrib/search/browser/searchActions.ts @@ -260,7 +260,7 @@ export class RefreshAction extends Action { @IViewletService private readonly viewletService: IViewletService, @IPanelService private readonly panelService: IPanelService ) { - super(id, label, 'search-action refresh'); + super(id, label, 'search-action codicon-refresh'); } get enabled(): boolean { @@ -291,7 +291,7 @@ export class CollapseDeepestExpandedLevelAction extends Action { @IViewletService private readonly viewletService: IViewletService, @IPanelService private readonly panelService: IPanelService ) { - super(id, label, 'search-action collapse'); + super(id, label, 'search-action codicon-collapse-all'); this.update(); } @@ -348,7 +348,7 @@ export class ClearSearchResultsAction extends Action { @IViewletService private readonly viewletService: IViewletService, @IPanelService private readonly panelService: IPanelService ) { - super(id, label, 'search-action clear-search-results'); + super(id, label, 'search-action codicon-clear-all'); this.update(); } @@ -375,7 +375,7 @@ export class CancelSearchAction extends Action { @IViewletService private readonly viewletService: IViewletService, @IPanelService private readonly panelService: IPanelService ) { - super(id, label, 'search-action cancel-search'); + super(id, label, 'search-action codicon-search-stop'); this.update(); } @@ -500,7 +500,7 @@ export class RemoveAction extends AbstractSearchAndReplaceAction { private viewer: WorkbenchObjectTree, private element: RenderableMatch ) { - super('remove', RemoveAction.LABEL, 'action-remove'); + super('remove', RemoveAction.LABEL, 'codicon-close'); } run(): Promise { @@ -540,7 +540,7 @@ export class ReplaceAllAction extends AbstractSearchAndReplaceAction { private fileMatch: FileMatch, @IKeybindingService keyBindingService: IKeybindingService ) { - super(Constants.ReplaceAllInFileActionId, appendKeyBindingLabel(ReplaceAllAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceAllInFileActionId), keyBindingService), 'action-replace-all'); + super(Constants.ReplaceAllInFileActionId, appendKeyBindingLabel(ReplaceAllAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceAllInFileActionId), keyBindingService), 'codicon-replace-all'); } run(): Promise { @@ -564,7 +564,7 @@ export class ReplaceAllInFolderAction extends AbstractSearchAndReplaceAction { constructor(private viewer: WorkbenchObjectTree, private folderMatch: FolderMatch, @IKeybindingService keyBindingService: IKeybindingService ) { - super(Constants.ReplaceAllInFolderActionId, appendKeyBindingLabel(ReplaceAllInFolderAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceAllInFolderActionId), keyBindingService), 'action-replace-all'); + super(Constants.ReplaceAllInFolderActionId, appendKeyBindingLabel(ReplaceAllInFolderAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceAllInFolderActionId), keyBindingService), 'codicon-replace-all'); } run(): Promise { @@ -587,7 +587,7 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction { @IKeybindingService keyBindingService: IKeybindingService, @IEditorService private readonly editorService: IEditorService, @IConfigurationService private readonly configurationService: IConfigurationService) { - super(Constants.ReplaceActionId, appendKeyBindingLabel(ReplaceAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceActionId), keyBindingService), 'action-replace'); + super(Constants.ReplaceActionId, appendKeyBindingLabel(ReplaceAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceActionId), keyBindingService), 'codicon-replace'); } run(): Promise { diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts index e4993dde0bd77..324b47862b271 100644 --- a/src/vs/workbench/contrib/search/browser/searchView.ts +++ b/src/vs/workbench/contrib/search/browser/searchView.ts @@ -224,7 +224,7 @@ export class SearchView extends ViewletPanel { // Toggle query details button this.toggleQueryDetailsButton = dom.append(this.queryDetails, - $('.more', { tabindex: 0, role: 'button', title: nls.localize('moreSearch', "Toggle Search Details") })); + $('.more.codicon.codicon-ellipsis', { tabindex: 0, role: 'button', title: nls.localize('moreSearch', "Toggle Search Details") })); this._register(dom.addDisposableListener(this.toggleQueryDetailsButton, dom.EventType.CLICK, e => { dom.EventHelper.stop(e); diff --git a/src/vs/workbench/contrib/search/browser/searchWidget.ts b/src/vs/workbench/contrib/search/browser/searchWidget.ts index 254346cc052b0..db1d349f32497 100644 --- a/src/vs/workbench/contrib/search/browser/searchWidget.ts +++ b/src/vs/workbench/contrib/search/browser/searchWidget.ts @@ -62,7 +62,7 @@ class ReplaceAllAction extends Action { private _searchWidget: SearchWidget | null = null; constructor() { - super(ReplaceAllAction.ID, '', 'action-replace-all', false); + super(ReplaceAllAction.ID, '', 'codicon-replace-all', false); } set searchWidget(searchWidget: SearchWidget) { @@ -280,7 +280,8 @@ export class SearchWidget extends Widget { }; this.toggleReplaceButton = this._register(new Button(parent, opts)); this.toggleReplaceButton.element.setAttribute('aria-expanded', 'false'); - this.toggleReplaceButton.element.classList.add('collapse'); + this.toggleReplaceButton.element.classList.add('codicon'); + this.toggleReplaceButton.element.classList.add('codicon-chevron-right'); this.toggleReplaceButton.icon = 'toggle-replace-button'; // TODO@joh need to dispose this listener eventually this.toggleReplaceButton.onDidClick(() => this.onToggleReplaceButton()); @@ -396,8 +397,8 @@ export class SearchWidget extends Widget { private onToggleReplaceButton(): void { dom.toggleClass(this.replaceContainer, 'disabled'); - dom.toggleClass(this.toggleReplaceButton.element, 'collapse'); - dom.toggleClass(this.toggleReplaceButton.element, 'expand'); + dom.toggleClass(this.toggleReplaceButton.element, 'codicon-chevron-right'); + dom.toggleClass(this.toggleReplaceButton.element, 'codicon-chevron-down'); this.toggleReplaceButton.element.setAttribute('aria-expanded', this.isReplaceShown() ? 'true' : 'false'); this.updateReplaceActiveState(); this._onReplaceToggled.fire(); diff --git a/test/automation/src/search.ts b/test/automation/src/search.ts index e23e42ab172cf..2b8076cc27ea7 100644 --- a/test/automation/src/search.ts +++ b/test/automation/src/search.ts @@ -74,12 +74,12 @@ export class Search extends Viewlet { await retry( () => this.code.waitAndClick(fileMatch), - () => this.code.waitForElement(`${fileMatch} .action-label.icon.action-remove`, el => !!el && el.top > 0 && el.left > 0, 10) + () => this.code.waitForElement(`${fileMatch} .action-label.codicon.codicon-close`, el => !!el && el.top > 0 && el.left > 0, 10) ); // ¯\_(ツ)_/¯ await new Promise(c => setTimeout(c, 500)); - await this.code.waitAndClick(`${fileMatch} .action-label.icon.action-remove`); + await this.code.waitAndClick(`${fileMatch} .action-label.codicon.codicon-close`); await this.code.waitForElement(fileMatch, el => !el); } @@ -100,12 +100,12 @@ export class Search extends Viewlet { await retry( () => this.code.waitAndClick(fileMatch), - () => this.code.waitForElement(`${fileMatch} .action-label.icon.action-replace-all`, el => !!el && el.top > 0 && el.left > 0, 10) + () => this.code.waitForElement(`${fileMatch} .action-label.codicon.action-replace-all`, el => !!el && el.top > 0 && el.left > 0, 10) ); // ¯\_(ツ)_/¯ await new Promise(c => setTimeout(c, 500)); - await this.code.waitAndClick(`${fileMatch} .action-label.icon.action-replace-all`); + await this.code.waitAndClick(`${fileMatch} .action-label.codicon.action-replace-all`); } async waitForResultText(text: string): Promise {