Merge pull request #88 from doki-theme/smallFixes

Small Fixes

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+# 13.2.0 [Small Enhancements]
+
+- Welcome Window now has background in VS Code 1.58
+- Extensions View Header now has background.
+- Changelog has theme's current sticker in the bottom right & the sticker shows above images.
+
 # 13.1.0 [Insiders Content Support]
 
 - Changed how stickers/wallpapers are installed, so they show up in VSCode v1.58.+. 

package.json

@@ -3,7 +3,7 @@
   "displayName": "The Doki Theme",
   "description": "A bunch of themes with cute anime girls. Code with your waifu!",
   "publisher": "unthrottled",
-  "version": "13.1.0",
+  "version": "13.2.0",
   "license": "MIT",
   "icon": "Doki-Theme.png",
   "galleryBanner": {
@@ -744,18 +744,18 @@
         "path": "./generatedThemes/Mai Light.theme.json",
         "uiTheme": "vs"
       },
-      {
-        "id": "dce48196-ff46-470c-b5f9-d1e23f4a79d3",
-        "label": "Doki Theme: DDLC:  Monika",
-        "path": "./generatedThemes/Monika Dark.theme.json",
-        "uiTheme": "vs-dark"
-      },
       {
         "id": "9a310731-ab2d-40f5-b502-fa5419f799a2",
         "label": "Doki Theme: DDLC:  Monika",
         "path": "./generatedThemes/Monika Light.theme.json",
         "uiTheme": "vs"
       },
+      {
+        "id": "dce48196-ff46-470c-b5f9-d1e23f4a79d3",
+        "label": "Doki Theme: DDLC:  Monika",
+        "path": "./generatedThemes/Monika Dark.theme.json",
+        "uiTheme": "vs-dark"
+      },
       {
         "id": "a7e0aa28-739a-4671-80ae-3980997e6b71",
         "label": "Doki Theme: DDLC:  Natsuki",
@@ -780,18 +780,18 @@
         "path": "./generatedThemes/Sayori Dark.theme.json",
         "uiTheme": "vs-dark"
       },
-      {
-        "id": "a14733d6-8e15-4e75-b6b8-509f323e5b3b",
-        "label": "Doki Theme: DDLC:  Yuri",
-        "path": "./generatedThemes/Yuri Dark.theme.json",
-        "uiTheme": "vs-dark"
-      },
       {
         "id": "cecf3f92-76d4-4f14-9a9c-3d558b6b3b68",
         "label": "Doki Theme: DDLC:  Yuri",
         "path": "./generatedThemes/Yuri Light.theme.json",
         "uiTheme": "vs"
       },
+      {
+        "id": "a14733d6-8e15-4e75-b6b8-509f323e5b3b",
+        "label": "Doki Theme: DDLC:  Yuri",
+        "path": "./generatedThemes/Yuri Dark.theme.json",
+        "uiTheme": "vs-dark"
+      },
       {
         "id": "b93ab4ea-ff96-4459-8fa2-0caae5bc7116",
         "label": "Doki Theme: DM:  Kanna",
@@ -823,15 +823,15 @@
         "uiTheme": "vs-dark"
       },
       {
-        "id": "c5e92ad9-2fa0-491e-b92a-48ab92d13597",
+        "id": "ea9a13f6-fa7f-46a4-ba6e-6cefe1f55160",
         "label": "Doki Theme: DxD:  Rias",
-        "path": "./generatedThemes/Rias Crimson.theme.json",
+        "path": "./generatedThemes/Rias Onyx.theme.json",
         "uiTheme": "vs-dark"
       },
       {
-        "id": "ea9a13f6-fa7f-46a4-ba6e-6cefe1f55160",
+        "id": "c5e92ad9-2fa0-491e-b92a-48ab92d13597",
         "label": "Doki Theme: DxD:  Rias",
-        "path": "./generatedThemes/Rias Onyx.theme.json",
+        "path": "./generatedThemes/Rias Crimson.theme.json",
         "uiTheme": "vs-dark"
       },
       {
@@ -894,18 +894,18 @@
         "path": "./generatedThemes/Aqua.theme.json",
         "uiTheme": "vs-dark"
       },
-      {
-        "id": "774ec7ad-d6a0-4d9c-b195-2f54d72ab664",
-        "label": "Doki Theme: KonoSuba:  Darkness",
-        "path": "./generatedThemes/Darkness Dark.theme.json",
-        "uiTheme": "vs-dark"
-      },
       {
         "id": "8474d98d-7bb1-462c-82b1-dd7c512142a6",
         "label": "Doki Theme: KonoSuba:  Darkness",
         "path": "./generatedThemes/Darkness Light.theme.json",
         "uiTheme": "vs"
       },
+      {
+        "id": "774ec7ad-d6a0-4d9c-b195-2f54d72ab664",
+        "label": "Doki Theme: KonoSuba:  Darkness",
+        "path": "./generatedThemes/Darkness Dark.theme.json",
+        "uiTheme": "vs-dark"
+      },
       {
         "id": "63fe4617-4cac-47a5-9b93-6794514c35ad",
         "label": "Doki Theme: KonoSuba:  Megumin",
@@ -990,18 +990,18 @@
         "path": "./generatedThemes/Rem.theme.json",
         "uiTheme": "vs-dark"
       },
-      {
-        "id": "bac375a4-abb3-44d5-9bef-8039eb83fec0",
-        "label": "Doki Theme: SAO:  Asuna",
-        "path": "./generatedThemes/Asuna Dark.theme.json",
-        "uiTheme": "vs-dark"
-      },
       {
         "id": "546e8fb8-6082-4ef5-a5e3-44790686f02f",
         "label": "Doki Theme: SAO:  Asuna",
         "path": "./generatedThemes/Asuna Light.theme.json",
         "uiTheme": "vs"
       },
+      {
+        "id": "bac375a4-abb3-44d5-9bef-8039eb83fec0",
+        "label": "Doki Theme: SAO:  Asuna",
+        "path": "./generatedThemes/Asuna Dark.theme.json",
+        "uiTheme": "vs-dark"
+      },
       {
         "id": "d39df813-8701-463b-a964-b8cb7714d1cc",
         "label": "Doki Theme: Steins Gate:  Kurisu",

src/ChangelogService.ts

@@ -1,6 +1,8 @@
 import * as vscode from 'vscode';
 import * as path from 'path';
 import ChangelogHtml from "./ChangelogHtml";
+import { getCurrentThemeAndSticker } from './ThemeManager';
+import { ASSETS_URL } from './ENV';
 
 export function showChanglog(context: vscode.ExtensionContext) {
     const welcomPanel = vscode.window.createWebviewPanel(
@@ -12,20 +14,16 @@ export function showChanglog(context: vscode.ExtensionContext) {
     welcomPanel.iconPath = getWebviewIcon(context);
     welcomPanel.webview.html = buildWebviewHtml(
         ChangelogHtml,
-        context,
-        welcomPanel
     );
 }
 
 export function buildWebviewHtml(
     content: string,
-    context: vscode.ExtensionContext,
-    panel: vscode.WebviewPanel
 ): string {
-    const monikaUrl =
-    panel.webview.asWebviewUri(
-        vscode.Uri.file(path.join(context.extensionPath, 'assets', 'just_monika.png'))
-    );
+    const {sticker} = getCurrentThemeAndSticker();
+    const stickerUrl =
+    `${ASSETS_URL}/stickers/jetbrains/v2${sticker.sticker.path}`;
+
     return `<!DOCTYPE html>
         <html lang="en">
         <head>
@@ -37,13 +35,13 @@ export function buildWebviewHtml(
                 position: fixed;
                 right: 0;
                 bottom: 0;
-                z-index: -1;
+                z-index: 9001;
             }
             </style>
         </head>
         <body>
             ${content}
-            <img class="sticker" src="${monikaUrl}" />
+            <img class="sticker" src="${stickerUrl}" />
         </body>
         </html>`;
 }

src/NotificationService.ts

@@ -3,7 +3,7 @@ import { VSCodeGlobals } from "./VSCodeGlobals";
 import { attemptToGreetUser } from "./WelcomeService";
 
 const SAVED_VERSION = "doki.theme.version";
-const DOKI_THEME_VERSION = "v13.1.0";
+const DOKI_THEME_VERSION = "v13.2.0";
 
 export function attemptToNotifyUpdates(context: vscode.ExtensionContext) {
   const savedVersion = VSCodeGlobals.globalState.get(SAVED_VERSION);

src/StickerService.ts

@@ -37,6 +37,11 @@ function buildWallpaperCss({
   .tabs-container,
   .monaco-pane-view, 
   .composite.title,
+  /* welcome window */
+  .editor-container,
+  button.getting-started-category,
+  /* end welcome window */
+  div.header, /* extensions header */
   .content,
   .monaco-select-box,
   .pane-header, 

src/SupportService.ts

@@ -68,5 +68,5 @@ function showStickerHelp(context: vscode.ExtensionContext, verbs: any) {
                    <br/> or <p><a href="https://gitter.im/doki-theme-vscode/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge" rel="nofollow"><img src="https://camo.githubusercontent.com/537aa03d68a16139ee3ee03e48fe1a463739b5de/68747470733a2f2f6261646765732e6769747465722e696d2f646f6b692d7468656d652d6a6574627261696e732f636f6d6d756e6974792e737667" alt="Gitter" data-canonical-src="https://badges.gitter.im/doki-theme-vscode/community.svg" style="max-width:100%;"></a></p>
                 </div>
             </div>
-            `, context, welcomPanel);
+            `);
 }

src/WelcomeService.ts

@@ -92,7 +92,7 @@ export function attemptToGreetUser(context: vscode.ExtensionContext) {
                 </ol> 
             </div>
             </div>
-            `, context, welcomePanel);
+            `,);
 
         VSCodeGlobals.globalState.update(IS_GREETED, true);
     }