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

Update more CSS url use (#7341)

Browse Source 
* Update more CSS urls

* URI with resources (#7348)

* URI with resources

* Remove logs
This commit is contained in:
Charles Gagnon
2019-09-24 18:07:23 -07:00
committed by GitHub
parent 49851daf0d
commit 82b19614e1
4 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sql/platform/accounts/browser/accountManagement.contribution.ts
View File

@@ -6,9 +6,8 @@
import { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { IJSONSchema } from 'vs/base/common/jsonSchema';
import { localize } from 'vs/nls'; import { localize } from 'vs/nls';
import { join } from 'vs/base/common/path'; import { createCSSRule, asCSSUrl } from 'vs/base/browser/dom';
import { createCSSRule } from 'vs/base/browser/dom'; import * as resources from 'vs/base/common/resources';
import { URI } from 'vs/base/common/uri';
export interface IAccountContrib { export interface IAccountContrib {
id: string; id: string;
@@ -64,13 +63,13 @@ ExtensionsRegistry.registerExtensionPoint<IAccountContrib | IAccountContrib[]>({
if (icon) { if (icon) {
const iconClass = id; const iconClass = id;
if (typeof icon === 'string') { if (typeof icon === 'string') {
const path = join(extension.description.extensionLocation.fsPath, icon); const path = resources.joinPath(extension.description.extensionLocation, icon);
createCSSRule(`.icon.${iconClass}`, `background-image: url("${URI.file(path).toString()}")`); createCSSRule(`.icon.${iconClass}`, `background-image: ${asCSSUrl(path)}`);
} else { } else {
const light = join(extension.description.extensionLocation.fsPath, icon.light); const light = resources.joinPath(extension.description.extensionLocation, icon.light);
const dark = join(extension.description.extensionLocation.fsPath, icon.dark); const dark = resources.joinPath(extension.description.extensionLocation, icon.dark);
createCSSRule(`.icon.${iconClass}`, `background-image: url("${URI.file(light).toString()}")`); createCSSRule(`.icon.${iconClass}`, `background-image: ${asCSSUrl(light)}`);
createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: url("${URI.file(dark).toString()}")`); createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: ${asCSSUrl(dark)}`);
} }
} }
} }

6
src/sql/platform/tasks/browser/tasksRegistry.ts
View File

@@ -10,7 +10,7 @@ import * as types from 'vs/base/common/types';
import { Event, Emitter } from 'vs/base/common/event'; import { Event, Emitter } from 'vs/base/common/event';
import { URI } from 'vs/base/common/uri'; import { URI } from 'vs/base/common/uri';
import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { CommandsRegistry } from 'vs/platform/commands/common/commands';
import { createCSSRule } from 'vs/base/browser/dom'; import { createCSSRule, asCSSUrl } from 'vs/base/browser/dom';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
import { IdGenerator } from 'vs/base/common/idGenerator'; import { IdGenerator } from 'vs/base/common/idGenerator';
@@ -58,8 +58,8 @@ export const TaskRegistry: ITaskRegistry = new class implements ITaskRegistry {
iconClass = this.taskIdToIconClassNameMap.get(item.id); iconClass = this.taskIdToIconClassNameMap.get(item.id);
} else if (item.iconLocation) { } else if (item.iconLocation) {
iconClass = ids.nextId(); iconClass = ids.nextId();
createCSSRule(`.icon.${iconClass}`, `background-image: url("${(item.iconLocation.light || item.iconLocation.dark).toString()}")`); createCSSRule(`.icon.${iconClass}`, `background-image: ${asCSSUrl(item.iconLocation.light || item.iconLocation.dark)}`);
createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: url("${(item.iconLocation.dark).toString()}")`); createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: ${asCSSUrl(item.iconLocation.dark)}`);
this.taskIdToIconClassNameMap.set(item.id, iconClass); this.taskIdToIconClassNameMap.set(item.id, iconClass);
} }
return iconClass; return iconClass;

27
src/sql/workbench/browser/modelComponents/componentWithIconBase.ts
View File

@@ -9,7 +9,7 @@ import { IComponentDescriptor } from 'sql/workbench/browser/modelComponents/inte
import * as azdata from 'azdata'; import * as azdata from 'azdata';
import { URI } from 'vs/base/common/uri'; import { URI } from 'vs/base/common/uri';
import { IdGenerator } from 'vs/base/common/idGenerator'; import { IdGenerator } from 'vs/base/common/idGenerator';
import { createCSSRule, removeCSSRulesContainingSelector } from 'vs/base/browser/dom'; import { createCSSRule, removeCSSRulesContainingSelector, asCSSUrl } from 'vs/base/browser/dom';
import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';
@@ -45,35 +45,34 @@ export abstract class ComponentWithIconBase extends ComponentBase {
} }
removeCSSRulesContainingSelector(this._iconClass); removeCSSRulesContainingSelector(this._iconClass);
const icon = this.getLightIconPath(this.iconPath); const icon = this.getLightIconUri(this.iconPath);
const iconDark = this.getDarkIconPath(this.iconPath) || icon; const iconDark = this.getDarkIconUri(this.iconPath) || icon;
createCSSRule(`.icon.${this._iconClass}`, `background-image: url("${icon}")`); createCSSRule(`.icon.${this._iconClass}`, `background-image: ${asCSSUrl(icon)}`);
createCSSRule(`.vs-dark .icon.${this._iconClass}, .hc-black .icon.${this._iconClass}`, `background-image: url("${iconDark}")`); createCSSRule(`.vs-dark .icon.${this._iconClass}, .hc-black .icon.${this._iconClass}`, `background-image: ${asCSSUrl(iconDark)}`);
this._changeRef.detectChanges(); this._changeRef.detectChanges();
} }
} }
private getLightIconPath(iconPath: IUserFriendlyIcon): string { private getLightIconUri(iconPath: IUserFriendlyIcon): URI {
if (iconPath && iconPath['light']) { if (iconPath && iconPath['light']) {
return this.getIconPath(iconPath['light']); return this.getIconUri(iconPath['light']);
} else { } else {
return this.getIconPath(<string | URI>iconPath); return this.getIconUri(<string | URI>iconPath);
} }
} }
private getDarkIconPath(iconPath: IUserFriendlyIcon): string { private getDarkIconUri(iconPath: IUserFriendlyIcon): URI {
if (iconPath && iconPath['dark']) { if (iconPath && iconPath['dark']) {
return this.getIconPath(iconPath['dark']); return this.getIconUri(iconPath['dark']);
} }
return null; return null;
} }
private getIconPath(iconPath: string | URI): string { private getIconUri(iconPath: string | URI): URI {
if (typeof iconPath === 'string') { if (typeof iconPath === 'string') {
return URI.file(iconPath).toString(); return URI.file(iconPath);
} else { } else {
let uri = URI.revive(iconPath); return URI.revive(iconPath);
return uri.toString();
} }
} }

15
src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.contribution.ts
View File

@@ -7,9 +7,10 @@ import { IExtensionPointUser } from 'vs/workbench/services/extensions/common/ext
import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { IJSONSchema } from 'vs/base/common/jsonSchema';
import * as nls from 'vs/nls'; import * as nls from 'vs/nls';
import { join } from 'vs/base/common/path'; import { join } from 'vs/base/common/path';
import { createCSSRule } from 'vs/base/browser/dom'; import { createCSSRule, asCSSUrl } from 'vs/base/browser/dom';
import { URI } from 'vs/base/common/uri'; import { URI } from 'vs/base/common/uri';
import { IdGenerator } from 'vs/base/common/idGenerator'; import { IdGenerator } from 'vs/base/common/idGenerator';
import * as resources from 'vs/base/common/resources';
import { NavSectionConfig, IUserFriendlyIcon } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; import { NavSectionConfig, IUserFriendlyIcon } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget';
import { registerContainerType, generateNavSectionContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; import { registerContainerType, generateNavSectionContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry';
@@ -84,13 +85,13 @@ function createCSSRuleForIcon(icon: IUserFriendlyIcon, extension: IExtensionPoin
if (icon) { if (icon) {
iconClass = ids.nextId(); iconClass = ids.nextId();
if (typeof icon === 'string') { if (typeof icon === 'string') {
const path = join(extension.description.extensionLocation.fsPath, icon); const path = resources.joinPath(extension.description.extensionLocation, icon);
createCSSRule(`.icon.${iconClass}`, `background-image: url("${URI.file(path).toString()}")`); createCSSRule(`.icon.${iconClass}`, `background-image: ${asCSSUrl(path)}`);
} else { } else {
const light = join(extension.description.extensionLocation.fsPath, icon.light); const light = resources.joinPath(extension.description.extensionLocation, icon.light);
const dark = join(extension.description.extensionLocation.fsPath, icon.dark); const dark = resources.joinPath(extension.description.extensionLocation, icon.dark);
createCSSRule(`.icon.${iconClass}`, `background-image: url("${URI.file(light).toString()}")`); createCSSRule(`.icon.${iconClass}`, `background-image: ${asCSSUrl(light)}`);
createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: url("${URI.file(dark).toString()}")`); createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: ${asCSSUrl(dark)}`);
} }
} }
return iconClass; return iconClass;