mirror of
https://github.com/Microsoft/vscode
synced 2024-10-12 06:17:18 +00:00
Build with TS 3.5.1
The dom.d.ts types changed to not allow null on the outline styles. I believe that setting this to empty string should be equivalent
This commit is contained in:
parent
b33f52a46e
commit
1cdf995036
|
@ -39,7 +39,7 @@
|
|||
"minimist": "^1.2.0",
|
||||
"request": "^2.85.0",
|
||||
"tslint": "^5.9.1",
|
||||
"typescript": "3.4.5",
|
||||
"typescript": "3.5.1",
|
||||
"vsce": "1.48.0",
|
||||
"xml2js": "^0.4.17"
|
||||
},
|
||||
|
|
|
@ -1894,10 +1894,10 @@ typed-rest-client@^0.9.0:
|
|||
tunnel "0.0.4"
|
||||
underscore "1.8.3"
|
||||
|
||||
typescript@3.4.5:
|
||||
version "3.4.5"
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
|
||||
integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
|
||||
typescript@3.5.1:
|
||||
version "3.5.1"
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.1.tgz#ba72a6a600b2158139c5dd8850f700e231464202"
|
||||
integrity sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==
|
||||
|
||||
uc.micro@^1.0.1, uc.micro@^1.0.5:
|
||||
version "1.0.5"
|
||||
|
|
|
@ -129,7 +129,7 @@
|
|||
"source-map": "^0.4.4",
|
||||
"ts-loader": "^4.4.2",
|
||||
"tslint": "^5.16.0",
|
||||
"typescript": "3.4.5",
|
||||
"typescript": "3.5.1",
|
||||
"typescript-formatter": "7.1.0",
|
||||
"uglify-es": "^3.0.18",
|
||||
"underscore": "^1.8.2",
|
||||
|
|
|
@ -209,7 +209,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
|
|||
|
||||
const borderColor = this.getColor(ACTIVITY_BAR_BORDER) || this.getColor(contrastBorder);
|
||||
const isPositionLeft = this.layoutService.getSideBarPosition() === SideBarPosition.LEFT;
|
||||
container.style.boxSizing = borderColor && isPositionLeft ? 'border-box' : null;
|
||||
container.style.boxSizing = borderColor && isPositionLeft ? 'border-box' : '';
|
||||
container.style.borderRightWidth = borderColor && isPositionLeft ? '1px' : null;
|
||||
container.style.borderRightStyle = borderColor && isPositionLeft ? 'solid' : null;
|
||||
container.style.borderRightColor = isPositionLeft ? borderColor : null;
|
||||
|
|
|
@ -88,10 +88,10 @@ class DropOverlay extends Themable {
|
|||
|
||||
// Overlay contrast border (if any)
|
||||
const activeContrastBorderColor = this.getColor(activeContrastBorder);
|
||||
this.overlay.style.outlineColor = activeContrastBorderColor;
|
||||
this.overlay.style.outlineOffset = activeContrastBorderColor ? '-2px' : null;
|
||||
this.overlay.style.outlineStyle = activeContrastBorderColor ? 'dashed' : null;
|
||||
this.overlay.style.outlineWidth = activeContrastBorderColor ? '2px' : null;
|
||||
this.overlay.style.outlineColor = activeContrastBorderColor || '';
|
||||
this.overlay.style.outlineOffset = activeContrastBorderColor ? '-2px' : '';
|
||||
this.overlay.style.outlineStyle = activeContrastBorderColor ? 'dashed' : '';
|
||||
this.overlay.style.outlineWidth = activeContrastBorderColor ? '2px' : '';
|
||||
}
|
||||
|
||||
private registerListeners(): void {
|
||||
|
|
|
@ -710,10 +710,10 @@ export class TabsTitleControl extends TitleControl {
|
|||
element.style.outlineColor = activeContrastBorderColor;
|
||||
element.style.outlineOffset = isTab ? '-5px' : '-3px';
|
||||
} else {
|
||||
element.style.outlineWidth = null;
|
||||
element.style.outlineStyle = null;
|
||||
element.style.outlineColor = activeContrastBorderColor;
|
||||
element.style.outlineOffset = null;
|
||||
element.style.outlineWidth = '';
|
||||
element.style.outlineStyle = '';
|
||||
element.style.outlineColor = activeContrastBorderColor || '';
|
||||
element.style.outlineOffset = '';
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -850,7 +850,7 @@ export class TabsTitleControl extends TitleControl {
|
|||
// Borders / Outline
|
||||
const borderRightColor = (this.getColor(TAB_BORDER) || this.getColor(contrastBorder));
|
||||
tabContainer.style.borderRight = borderRightColor ? `1px solid ${borderRightColor}` : null;
|
||||
tabContainer.style.outlineColor = this.getColor(activeContrastBorder);
|
||||
tabContainer.style.outlineColor = this.getColor(activeContrastBorder) || '';
|
||||
|
||||
// Settings
|
||||
const options = this.accessor.partOptions;
|
||||
|
|
|
@ -219,7 +219,7 @@ export class NotificationsList extends Themable {
|
|||
this.listContainer.style.background = background ? background.toString() : null;
|
||||
|
||||
const outlineColor = this.getColor(contrastBorder);
|
||||
this.listContainer.style.outlineColor = outlineColor ? outlineColor.toString() : null;
|
||||
this.listContainer.style.outlineColor = outlineColor ? outlineColor.toString() : '';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -251,7 +251,7 @@ export class ColorThemeData implements IColorTheme {
|
|||
break;
|
||||
case 'themeTokenColors':
|
||||
case 'id': case 'label': case 'settingsId': case 'extensionData': case 'watch':
|
||||
theme[key] = data[key];
|
||||
(theme as any)[key] = data[key];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -118,7 +118,7 @@ export class FileIconThemeData implements IFileIconTheme {
|
|||
case 'hidesExplorerArrows':
|
||||
case 'hasFolderIcons':
|
||||
case 'watch':
|
||||
theme[key] = data[key];
|
||||
(theme as any)[key] = data[key];
|
||||
break;
|
||||
case 'location':
|
||||
theme.location = URI.revive(data.location);
|
||||
|
|
|
@ -9055,10 +9055,10 @@ typescript-formatter@7.1.0:
|
|||
commandpost "^1.0.0"
|
||||
editorconfig "^0.15.0"
|
||||
|
||||
typescript@3.4.5:
|
||||
version "3.4.5"
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
|
||||
integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
|
||||
typescript@3.5.1:
|
||||
version "3.5.1"
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.1.tgz#ba72a6a600b2158139c5dd8850f700e231464202"
|
||||
integrity sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==
|
||||
|
||||
typescript@^2.6.2:
|
||||
version "2.6.2"
|
||||
|
|
Loading…
Reference in a new issue