From 502746fac06d096388322608108047418f33746c Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nick.bollweg@gmail.com>
Date: Tue, 19 May 2020 00:34:30 -0400
Subject: [PATCH] more logo work

---
 scripts/Drawio_Update.ipynb | 13 ++++++++-----
 src/index.ts                | 20 ++++++++++++--------
 style/img/drawio.svg        | 10 ++++++++++
 3 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 style/img/drawio.svg

diff --git a/scripts/Drawio_Update.ipynb b/scripts/Drawio_Update.ipynb
index 54db9af..00a9a47 100644
--- a/scripts/Drawio_Update.ipynb
+++ b/scripts/Drawio_Update.ipynb
@@ -109,7 +109,7 @@
     {
      "data": {
       "text/markdown": [
-       "> ### Packaging 1029 of 3399 files"
+       "> ### Packaging 1195 of 3399 files"
       ],
       "text/plain": [
        "<IPython.core.display.Markdown object>"
@@ -125,7 +125,10 @@
     "    DIO_APP / \"js/PostConfig.js\",\n",
     "    *(DIO_APP / \"math\").rglob(\"*.*\"),\n",
     "    *(DIO_APP / \"mxgraph/images\").rglob(\"*.png\"),\n",
-    "    *(DIO_APP / \"mxgraph/images\").rglob(\"*.gif\")\n",
+    "    *(DIO_APP / \"mxgraph/images\").rglob(\"*.gif\"),\n",
+    "    *(DIO_APP / \"images\").rglob(\"*.svg\"),\n",
+    "    *(DIO_APP / \"images\").rglob(\"*.png\"),\n",
+    "    *(DIO_APP / \"images\").rglob(\"*.gif\"),\n",
     "}\n",
     "show_files()"
    ]
@@ -147,7 +150,7 @@
     {
      "data": {
       "text/markdown": [
-       "> ### Packaging 1025 of 3399 files"
+       "> ### Packaging 1191 of 3399 files"
       ],
       "text/plain": [
        "<IPython.core.display.Markdown object>"
@@ -220,7 +223,7 @@
     {
      "data": {
       "text/plain": [
-       "91655"
+       "101380"
       ]
      },
      "execution_count": 8,
@@ -251,7 +254,7 @@
     {
      "data": {
       "text/plain": [
-       "145880"
+       "164569"
       ]
      },
      "execution_count": 10,
diff --git a/src/index.ts b/src/index.ts
index 4d3c56b..faa411d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { Token } from "@lumino/coreutils";
+import { Contents } from "@jupyterlab/services";
+import { PathExt } from "@jupyterlab/coreutils";
+
 import {
   ILayoutRestorer,
   JupyterLab,
@@ -24,24 +28,24 @@ import {
   ICommandPalette,
 } from "@jupyterlab/apputils";
 
-import { IFileBrowserFactory } from "@jupyterlab/filebrowser";
+import { LabIcon } from "@jupyterlab/ui-components";
 
-import { Contents } from "@jupyterlab/services";
+import { IFileBrowserFactory } from "@jupyterlab/filebrowser";
 
 import { ILauncher } from "@jupyterlab/launcher";
 
 import { IMainMenu } from "@jupyterlab/mainmenu";
 
-import { Token } from "@lumino/coreutils";
-import { LabIcon } from "@jupyterlab/ui-components";
 import { DrawioWidget, DrawioFactory } from "./editor";
-import { PathExt } from "@jupyterlab/coreutils";
 
-import DRAWIO_ICON_SVG from "!!file-loader!./drawio/src/main/webapp/images/drawlogo-color.svg";
+import DRAWIO_ICON_SVG from "../style/img/drawio.svg";
 
 const drawioIcon = new LabIcon({
   name: "drawio:drawio",
-  svgstr: DRAWIO_ICON_SVG,
+  svgstr: DRAWIO_ICON_SVG.replace(/xmlns:.+".+?"/g, "").replace(
+    /viewBox=".*?"/,
+    'viewBox="0 0 161.6 161.6"'
+  ),
 });
 
 /**
@@ -166,7 +170,7 @@ function activate(
   });
 
   factory.widgetCreated.connect((sender, widget) => {
-    widget.title.icon = "jp-MaterialIcon jp-ImageIcon"; // TODO change
+    widget.title.icon = drawioIcon;
 
     // Notify the instance tracker if restore data needs to update.
     widget.context.pathChanged.connect(() => {
diff --git a/style/img/drawio.svg b/style/img/drawio.svg
new file mode 100644
index 0000000..6275825
--- /dev/null
+++ b/style/img/drawio.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 161.6 161.6" version="1.1">
+  <g class="jp-icon-warn0 jp-icon-selectable" fill="#f08705">
+    <path d="m 161.6,154.7 c 0,3.9 -3.2,6.9 -6.9,6.9 H 6.9 C 3,161.6 0,158.4 0,154.7 V 6.9 C 0,3 3.2,0 6.9,0 h 147.8 c 3.9,0 6.9,3.2 6.9,6.9 z" />
+  </g>
+  <path d="m 161.6,154.7 c 0,3.9 -3.2,6.9 -6.9,6.9 H 55.3 l -32.2,-32.7 20,-32.7 59.4,-73.8 58.9,60.7 z" fill="rgba(0,0,0,0.1)"/>
+  <g class="jp-icon-accent0 jp-icon-selectable-inverse" fill="#ffffff">
+    <path d="m 132.7,90.3 h -17 l -18,-30.6 c 4,-0.8 7,-4.4 7,-8.6 V 28 c 0,-4.9 -3.9,-8.8 -8.8,-8.8 h -30 c -4.9,0 -8.8,3.9 -8.8,8.8 v 23.1 c 0,4.3 3,7.8 6.9,8.6 L 46,90.4 H 29 c -4.9,0 -8.8,3.9 -8.8,8.8 v 23.1 c 0,4.9 3.9,8.8 8.8,8.8 h 30 c 4.9,0 8.8,-3.9 8.8,-8.8 V 99.2 c 0,-4.9 -3.9,-8.8 -8.8,-8.8 H 56.1 L 73.9,60 h 13.9 l 17.9,30.4 h -3 c -4.9,0 -8.8,3.9 -8.8,8.8 v 23.1 c 0,4.9 3.9,8.8 8.8,8.8 h 30 c 4.9,0 8.8,-3.9 8.8,-8.8 V 99.2 c 0,-4.9 -3.9,-8.9 -8.8,-8.9 z"/>
+  </g>
+</svg>