From 0f813a99000ec102111e57fe0fce8963319733d1 Mon Sep 17 00:00:00 2001 From: Lewis Sanchez <87730006+lewis-sanchez@users.noreply.github.com> Date: Fri, 3 Mar 2023 17:42:10 -0800 Subject: [PATCH] Update add account icon (#22142) * Update add account icon * Remove unused icon from SqlIconId * Remove unused accountActions.css * Revert "Remove unused accountActions.css" This reverts commit d31d17f5d2027f25f306e713abff14e750e7479a. * Remove unused css file and svg's * Remove unused import * Revert "Remove unused import" This reverts commit 91ad47da56d428d8805b65f685af76694b16ba6c. * Remove unused import --- src/sql/base/common/codicons.ts | 3 +-- .../accountManagement/browser/accountDialog.ts | 5 ++--- .../browser/accountListRenderer.ts | 1 - .../browser/media/accountActions.css | 14 -------------- .../browser/media/new_account.svg | 1 - .../browser/media/new_account_inverse.svg | 1 - 6 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 src/sql/workbench/services/accountManagement/browser/media/accountActions.css delete mode 100644 src/sql/workbench/services/accountManagement/browser/media/new_account.svg delete mode 100644 src/sql/workbench/services/accountManagement/browser/media/new_account_inverse.svg diff --git a/src/sql/base/common/codicons.ts b/src/sql/base/common/codicons.ts index f4138ae7a1..767dd1c364 100644 --- a/src/sql/base/common/codicons.ts +++ b/src/sql/base/common/codicons.ts @@ -13,6 +13,5 @@ export const enum SqlIconId { addServerGroupAction = 'add-server-group-action', addServerAction = 'add-server-action', activeConnectionsAction = 'active-connections-action', - serverPage = 'server-page', - addAccountAction = 'add-linked-account-action' + serverPage = 'server-page' } diff --git a/src/sql/workbench/services/accountManagement/browser/accountDialog.ts b/src/sql/workbench/services/accountManagement/browser/accountDialog.ts index e847e6ffea..abc193668b 100644 --- a/src/sql/workbench/services/accountManagement/browser/accountDialog.ts +++ b/src/sql/workbench/services/accountManagement/browser/accountDialog.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./media/accountDialog'; -import 'vs/css!./media/accountActions'; import * as DOM from 'vs/base/browser/dom'; import { List } from 'vs/base/browser/ui/list/listWidget'; import { Event, Emitter } from 'vs/base/common/event'; @@ -22,7 +21,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import * as azdata from 'azdata'; import { Button } from 'sql/base/browser/ui/button/button'; -import { SqlIconId } from 'sql/base/common/codicons'; +import { Codicon } from 'vs/base/common/codicons'; import { HideReason, Modal } from 'sql/workbench/browser/modal/modal'; import { AccountViewModel } from 'sql/platform/accounts/common/accountViewModel'; import { AddAccountAction } from 'sql/platform/accounts/common/accountActions'; @@ -467,7 +466,7 @@ export class AccountDialog extends Modal { id: `workbench.actions.accountDialog.${viewId}.addAccount`, title: { value: localize('accountDialog.addConnection', "Add an account"), original: 'Add an account' }, f1: true, - icon: { id: SqlIconId.addAccountAction }, + icon: { id: Codicon.add.id }, menu: { id: MenuId.ViewTitle, group: 'navigation', diff --git a/src/sql/workbench/services/accountManagement/browser/accountListRenderer.ts b/src/sql/workbench/services/accountManagement/browser/accountListRenderer.ts index f4b482ad18..30d73f976d 100644 --- a/src/sql/workbench/services/accountManagement/browser/accountListRenderer.ts +++ b/src/sql/workbench/services/accountManagement/browser/accountListRenderer.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./media/accountListRenderer'; -import 'vs/css!./media/accountActions'; import * as DOM from 'vs/base/browser/dom'; import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; diff --git a/src/sql/workbench/services/accountManagement/browser/media/accountActions.css b/src/sql/workbench/services/accountManagement/browser/media/accountActions.css deleted file mode 100644 index 2934c0e2d8..0000000000 --- a/src/sql/workbench/services/accountManagement/browser/media/accountActions.css +++ /dev/null @@ -1,14 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -/* Icons for various account actions */ -.monaco-workbench .account-view .actions-container .action-label.codicon-add-linked-account-action { - background-image: url('new_account.svg') !important; -} - -.monaco-workbench.vs-dark .account-view .actions-container .action-label.codicon-add-linked-account-action, -.monaco-workbench.hc-black .account-view .actions-container .action-label.codicon-add-linked-account-action { - background-image: url('new_account_inverse.svg') !important; -} diff --git a/src/sql/workbench/services/accountManagement/browser/media/new_account.svg b/src/sql/workbench/services/accountManagement/browser/media/new_account.svg deleted file mode 100644 index 25ffd03ad8..0000000000 --- a/src/sql/workbench/services/accountManagement/browser/media/new_account.svg +++ /dev/null @@ -1 +0,0 @@ -new_account_16x16 \ No newline at end of file diff --git a/src/sql/workbench/services/accountManagement/browser/media/new_account_inverse.svg b/src/sql/workbench/services/accountManagement/browser/media/new_account_inverse.svg deleted file mode 100644 index a02a86a5b0..0000000000 --- a/src/sql/workbench/services/accountManagement/browser/media/new_account_inverse.svg +++ /dev/null @@ -1 +0,0 @@ -new_account_inverse_16x16 \ No newline at end of file