ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Alanren/icon overwrite issue (#2484)

Browse Source 
* fix the error icon too large issue

* formatting
This commit is contained in:
Alan Ren
2018-09-10 15:55:40 -07:00
committed by GitHub
parent 4ceb869420
commit 709ef4e39f
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/base/browser/ui/modal/modal.ts
View File

@@ -217,7 +217,7 @@ export abstract class Modal extends Disposable implements IThemable {
if (this._modalOptions.isAngular === false && this._modalOptions.hasErrors) { if (this._modalOptions.isAngular === false && this._modalOptions.hasErrors) {
let builder = errorMessagesInFooter ? this._leftFooter : body; let builder = errorMessagesInFooter ? this._leftFooter : body;
builder.div({ class: 'dialogErrorMessage', id: 'dialogErrorMessage' }, (errorMessageContainer) => { builder.div({ class: 'dialogErrorMessage', id: 'dialogErrorMessage' }, (errorMessageContainer) => {
errorMessageContainer.div({ class: 'icon error' }, (iconContainer) => { errorMessageContainer.div({ class: 'sql icon error' }, (iconContainer) => {
this._errorIconElement = iconContainer.getHTMLElement(); this._errorIconElement = iconContainer.getHTMLElement();
this._errorIconElement.style.visibility = 'hidden'; this._errorIconElement.style.visibility = 'hidden';
}); });

18
src/sql/media/icons/common-icons.css
View File

@@ -63,21 +63,21 @@
background: url("globalerror.svg") center center no-repeat; background: url("globalerror.svg") center center no-repeat;
} }
.vs .icon.error, .vs .sql.icon.error,
.vs-dark .icon.error, .vs-dark .sql.icon.error,
.hc-black .icon.error { .hc-black .sql.icon.error {
content: url("status_error.svg"); content: url("status_error.svg");
} }
.vs .icon.warning, .vs .sql.icon.warning,
.vs-dark .icon.warning, .vs-dark .sql.icon.warning,
.hc-black .icon.warning { .hc-black .sql.icon.warning {
content: url("status_warning.svg"); content: url("status_warning.svg");
} }
.vs .icon.info, .vs .sql.icon.info,
.vs-dark .icon.info, .vs-dark .sql.icon.info,
.hc-black .icon.info { .hc-black .sql.icon.info {
content: url("status_info.svg"); content: url("status_info.svg");
} }

2
src/sql/parts/accountManagement/accountPicker/accountPicker.ts
View File

@@ -117,7 +117,7 @@ export class AccountPicker extends Disposable {
// Create refresh account action // Create refresh account action
this._refreshContainer = DOM.append(this._rootElement, DOM.$('div.refresh-container')); this._refreshContainer = DOM.append(this._rootElement, DOM.$('div.refresh-container'));
DOM.append(this._refreshContainer, DOM.$('div.icon warning')); DOM.append(this._refreshContainer, DOM.$('div.sql icon warning'));
let actionBar = new ActionBar(this._refreshContainer, { animated: false }); let actionBar = new ActionBar(this._refreshContainer, { animated: false });
this._refreshAccountAction = this._instantiationService.createInstance(RefreshAccountAction); this._refreshAccountAction = this._instantiationService.createInstance(RefreshAccountAction);
actionBar.push(this._refreshAccountAction, { icon: false, label: true }); actionBar.push(this._refreshAccountAction, { icon: false, label: true });

2
src/sql/parts/disasterRecovery/backup/backup.component.html
View File

@@ -65,7 +65,7 @@
<div class="option check" #encryptCheckContainer> <div class="option check" #encryptCheckContainer>
</div> </div>
<div class="option" #encryptWarningContainer> <div class="option" #encryptWarningContainer>
<div class="icon warning"> <div class="sql icon warning">
</div> </div>
<div class="warning-message"> <div class="warning-message">
{{localizedStrings.NO_ENCRYPTOR_WARNING}} {{localizedStrings.NO_ENCRYPTOR_WARNING}}

6
src/sql/workbench/errorMessageDialog/errorMessageDialog.ts
View File

@@ -108,13 +108,13 @@ export class ErrorMessageDialog extends Modal {
private updateIconTitle(): void { private updateIconTitle(): void {
switch (this._severity) { switch (this._severity) {
case Severity.Error: case Severity.Error:
this.titleIconClassName = 'icon error'; this.titleIconClassName = 'sql icon error';
break; break;
case Severity.Warning: case Severity.Warning:
this.titleIconClassName = 'icon warning'; this.titleIconClassName = 'sql icon warning';
break; break;
case Severity.Info: case Severity.Info:
this.titleIconClassName = 'icon info'; this.titleIconClassName = 'sql icon info';
break; break;
} }
} }