mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 21:09:43 +00:00
Move our watermark to resources so that distro can pick it up (#30256)
* move watermark to resources folder
* add to build
* 💄
* update distro
* update distro
This commit is contained in:
parent
4080a38ada
commit
de4b5be4c6
|
@ -283,6 +283,8 @@ function packageTask(platform, arch, opts) {
|
|||
|
||||
const license = gulp.src(['LICENSES.chromium.html', 'LICENSE.txt', 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.' });
|
||||
|
||||
const watermark = gulp.src(['resources/letterpress.svg', 'resources/letterpress-dark.svg', 'resources/letterpress-hc.svg'], { base: '.' });
|
||||
|
||||
// TODO the API should be copied to `out` during compile, not here
|
||||
const api = gulp.src('src/vs/vscode.d.ts').pipe(rename('out/vs/vscode.d.ts'));
|
||||
|
||||
|
@ -306,6 +308,7 @@ function packageTask(platform, arch, opts) {
|
|||
packageJsonStream,
|
||||
productJsonStream,
|
||||
license,
|
||||
watermark,
|
||||
api,
|
||||
sources,
|
||||
deps
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"name": "code-oss-dev",
|
||||
"version": "1.15.0",
|
||||
"electronVersion": "1.6.6",
|
||||
"distro": "3d527860a13c6374d293f95ac2b8d26338d5f428",
|
||||
"distro": "01a59e58dc560865433d23039da2ad82638444a5",
|
||||
"author": {
|
||||
"name": "Microsoft Corporation"
|
||||
},
|
||||
|
|
33
resources/letterpress-dark.svg
Normal file
33
resources/letterpress-dark.svg
Normal file
|
@ -0,0 +1,33 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg width="100%" height="100%" viewBox="0 0 260 260" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
|
||||
<g transform="matrix(1,0,0,1,-875,-1078)">
|
||||
<g transform="matrix(1,0,0,1,0,999)">
|
||||
<g transform="matrix(1,0,0,1,286,2.27374e-13)">
|
||||
<g opacity="0.3">
|
||||
<g transform="matrix(1.06122,0,0,1.03704,-43.4898,-1044.78)">
|
||||
<path d="M841,1317L596,1317L596,1101L841,1101L841,1317ZM601.654,1106.79L601.654,1311.21L835.346,1311.21L835.346,1106.79L601.654,1106.79Z"/>
|
||||
</g>
|
||||
<g transform="matrix(1,0,0,1,1,-999)">
|
||||
<rect x="665" y="1100" width="18" height="216"/>
|
||||
</g>
|
||||
<g transform="matrix(1,0,0,1,0,-1000)">
|
||||
<rect x="701" y="1121" width="70" height="18"/>
|
||||
</g>
|
||||
<g transform="matrix(1,0,0,1,0,-860)">
|
||||
<rect x="701" y="1121" width="70" height="18"/>
|
||||
</g>
|
||||
<g transform="matrix(1.25714,0,0,1,-162.757,-965)">
|
||||
<rect x="701" y="1121" width="70" height="18"/>
|
||||
</g>
|
||||
<g transform="matrix(1.25714,0,0,1,-162.757,-930)">
|
||||
<rect x="701" y="1121" width="70" height="18"/>
|
||||
</g>
|
||||
<g transform="matrix(1.25714,0,0,1,-162.757,-895)">
|
||||
<rect x="701" y="1121" width="70" height="18"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 1.9 KiB |
33
resources/letterpress-hc.svg
Normal file
33
resources/letterpress-hc.svg
Normal file
|
@ -0,0 +1,33 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg width="100%" height="100%" viewBox="0 0 260 260" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
|
||||
<g transform="matrix(1,0,0,1,-1169,-1078)">
|
||||
<g transform="matrix(1,0,0,1,0,999)">
|
||||
<g transform="matrix(1,0,0,1,580,2.27374e-13)">
|
||||
<g opacity="0.12">
|
||||
<g transform="matrix(1.06122,0,0,1.03704,-43.4898,-1044.78)">
|
||||
<path d="M841,1317L596,1317L596,1101L841,1101L841,1317ZM601.654,1106.79L601.654,1311.21L835.346,1311.21L835.346,1106.79L601.654,1106.79Z" style="fill:white;"/>
|
||||
</g>
|
||||
<g transform="matrix(1,0,0,1,1,-999)">
|
||||
<rect x="665" y="1100" width="18" height="216" style="fill:white;"/>
|
||||
</g>
|
||||
<g transform="matrix(1,0,0,1,0,-1000)">
|
||||
<rect x="701" y="1121" width="70" height="18" style="fill:white;"/>
|
||||
</g>
|
||||
<g transform="matrix(1,0,0,1,0,-860)">
|
||||
<rect x="701" y="1121" width="70" height="18" style="fill:white;"/>
|
||||
</g>
|
||||
<g transform="matrix(1.25714,0,0,1,-162.757,-965)">
|
||||
<rect x="701" y="1121" width="70" height="18" style="fill:white;"/>
|
||||
</g>
|
||||
<g transform="matrix(1.25714,0,0,1,-162.757,-930)">
|
||||
<rect x="701" y="1121" width="70" height="18" style="fill:white;"/>
|
||||
</g>
|
||||
<g transform="matrix(1.25714,0,0,1,-162.757,-895)">
|
||||
<rect x="701" y="1121" width="70" height="18" style="fill:white;"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 2 KiB |
31
resources/letterpress.svg
Normal file
31
resources/letterpress.svg
Normal file
|
@ -0,0 +1,31 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg width="100%" height="100%" viewBox="0 0 260 260" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
|
||||
<g transform="matrix(1,0,0,1,-589,-1078)">
|
||||
<g transform="matrix(1,0,0,1,0,999)">
|
||||
<g opacity="0.1">
|
||||
<g transform="matrix(1.06122,0,0,1.03704,-43.4898,-1044.78)">
|
||||
<path d="M841,1317L596,1317L596,1101L841,1101L841,1317ZM601.654,1106.79L601.654,1311.21L835.346,1311.21L835.346,1106.79L601.654,1106.79Z"/>
|
||||
</g>
|
||||
<g transform="matrix(1,0,0,1,1,-999)">
|
||||
<rect x="665" y="1100" width="18" height="216"/>
|
||||
</g>
|
||||
<g transform="matrix(1,0,0,1,0,-1000)">
|
||||
<rect x="701" y="1121" width="70" height="18"/>
|
||||
</g>
|
||||
<g transform="matrix(1,0,0,1,0,-860)">
|
||||
<rect x="701" y="1121" width="70" height="18"/>
|
||||
</g>
|
||||
<g transform="matrix(1.25714,0,0,1,-162.757,-965)">
|
||||
<rect x="701" y="1121" width="70" height="18"/>
|
||||
</g>
|
||||
<g transform="matrix(1.25714,0,0,1,-162.757,-930)">
|
||||
<rect x="701" y="1121" width="70" height="18"/>
|
||||
</g>
|
||||
<g transform="matrix(1.25714,0,0,1,-162.757,-895)">
|
||||
<rect x="701" y="1121" width="70" height="18"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 1.7 KiB |
|
@ -41,6 +41,9 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
|
|||
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||
import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { EDITOR_GROUP_BACKGROUND } from 'vs/workbench/common/theme';
|
||||
import { createCSSRule } from "vs/base/browser/dom";
|
||||
import { IEnvironmentService } from "vs/platform/environment/common/environment";
|
||||
import { join } from "vs/base/common/paths";
|
||||
|
||||
class ProgressMonitor {
|
||||
|
||||
|
@ -122,7 +125,8 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
|
|||
@IConfigurationService private configurationService: IConfigurationService,
|
||||
@IContextKeyService contextKeyService: IContextKeyService,
|
||||
@IInstantiationService private instantiationService: IInstantiationService,
|
||||
@IThemeService themeService: IThemeService
|
||||
@IThemeService themeService: IThemeService,
|
||||
@IEnvironmentService private environmentService: IEnvironmentService
|
||||
) {
|
||||
super(id, { hasTitle: false }, themeService);
|
||||
|
||||
|
@ -172,9 +176,18 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
|
|||
this.revealIfOpen = false;
|
||||
}
|
||||
|
||||
this.initStyles();
|
||||
this.registerListeners();
|
||||
}
|
||||
|
||||
private initStyles(): void {
|
||||
|
||||
// Letterpress Background when Empty
|
||||
createCSSRule('.vs .monaco-workbench > .part.editor.empty', `background-image: url('${join(this.environmentService.appRoot, 'resources/letterpress.svg')}')`);
|
||||
createCSSRule('.vs-dark .monaco-workbench > .part.editor.empty', `background-image: url('${join(this.environmentService.appRoot, 'resources/letterpress-dark.svg')}')`);
|
||||
createCSSRule('.hc-black .monaco-workbench > .part.editor.empty', `background-image: url('${join(this.environmentService.appRoot, 'resources/letterpress-hc.svg')}')`);
|
||||
}
|
||||
|
||||
private registerListeners(): void {
|
||||
this.toUnbind.push(this.stacks.onEditorDirty(identifier => this.onEditorDirty(identifier)));
|
||||
this.toUnbind.push(this.stacks.onEditorDisposed(identifier => this.onEditorDisposed(identifier)));
|
||||
|
|
|
@ -3,27 +3,9 @@
|
|||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
.monaco-workbench > .part.editor {
|
||||
/** Letter press styling for empty editor */
|
||||
.monaco-workbench > .part.editor.empty {
|
||||
background-repeat: no-repeat;
|
||||
background-position: 50% 50%;
|
||||
}
|
||||
|
||||
.monaco-workbench > .part.editor.empty {
|
||||
background-image: url('letterpress.svg');
|
||||
}
|
||||
|
||||
.vs-dark .monaco-workbench > .part.editor.empty {
|
||||
background-image: url('letterpress-dark.svg');
|
||||
}
|
||||
|
||||
.hc-black .monaco-workbench > .part.editor.empty {
|
||||
background-image: url('letterpress-hc.svg');
|
||||
}
|
||||
|
||||
@media
|
||||
(-webkit-min-device-pixel-ratio: 2),
|
||||
(min-resolution: 192dppx) {
|
||||
.monaco-workbench > .part.editor {
|
||||
background-size: 260px 260px;
|
||||
}
|
||||
background-size: 260px 260px;
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="260" height="260" viewBox="0 0 260 260"><style>.st0{opacity:.25}.st1{opacity:3e-2}.st2{fill:#fff}</style><path d="M194 2L92.4 103.6 27.6 53.2 2 66v128l25.6 12.8 64.8-50.4L194 258l64-25.6V27.6L194 2zM27 169V91l39 39-39 39zm99.4-39L194 77v106l-67.6-53z" class="st0"/><path class="st1 st2" d="M194 2l64 25.6v204.8L194 258 92.4 156.4l-64.8 50.4L2 194V66l25.6-12.8 64.8 50.4L194 2m0 181V77l-67.6 53 67.6 53M27 169l39-39-39-39v78M193.8.8l-.5.5-101 101-64.1-49.9-.5-.4-.6.3L1.6 65.1l-.6.3v129.2l.6.3 25.6 12.8.6.3.5-.4 64.1-49.9 101 101 .5.5.6-.2 64-25.6.6-.3V26.9l-.6-.3-64-25.6-.7-.2zM128 130l65-50.9V181l-65-51zM28 166.6V93.4L64.6 130 28 166.6z"/></svg>
|
Before Width: | Height: | Size: 709 B |
|
@ -1 +0,0 @@
|
|||
<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="260" height="260" viewBox="0 0 260 260"><style>.st0{fill:#fff;fill-opacity:.13;enable-background:new}</style><path class="st0" d="M194 2L92.4 103.6 27.6 53.2 2 66v128l25.6 12.8 64.8-50.4L194 258l64-25.6V27.6L194 2zM27 169V91l39 39-39 39zm99.4-39L194 77v106l-67.6-53z"/></svg>
|
Before Width: | Height: | Size: 335 B |
|
@ -1 +0,0 @@
|
|||
<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="260" height="260" viewBox="0 0 260 260"><style>.st0{opacity:.1}.st1{opacity:5e-2}.st2{fill:#231f20}</style><path d="M194 2L92.4 103.6 27.6 53.2 2 66v128l25.6 12.8 64.8-50.4L194 258l64-25.6V27.6L194 2zM27 169V91l39 39-39 39zm99.4-39L194 77v106l-67.6-53z" class="st0"/><path class="st1 st2" d="M194 2l64 25.6v204.8L194 258 92.4 156.4l-64.8 50.4L2 194V66l25.6-12.8 64.8 50.4L194 2m0 181V77l-67.6 53 67.6 53M27 169l39-39-39-39v78M193.8.8l-.5.5-101 101-64.1-49.9-.5-.4-.6.3L1.6 65.1l-.6.3v129.2l.6.3 25.6 12.8.6.3.5-.4 64.1-49.9 101 101 .5.5.6-.2 64-25.6.6-.3V26.9l-.6-.3-64-25.6-.7-.2zM128 130l65-50.9V181l-65-51zM28 166.6V93.4L64.6 130 28 166.6z"/></svg>
|
Before Width: | Height: | Size: 711 B |
Loading…
Reference in a new issue