From a6d81adab9ccc6801694377f5c45e120c5e28b0e Mon Sep 17 00:00:00 2001
From: "Brian E. Granger" <ellisonbg@gmail.com>
Date: Thu, 20 Jun 2019 13:02:45 -0700
Subject: [PATCH] Update status bar icons.

---
 packages/statusbar/style/base.css             | 24 ++++---------------
 packages/statusbar/style/kernel-icon-dark.svg |  6 -----
 .../statusbar/style/kernel-icon-light.svg     |  6 -----
 .../statusbar/style/terminal-icon-dark.svg    |  4 ----
 .../statusbar/style/terminal-icon-light.svg   |  4 ----
 .../style/icons/jupyter/terminal.svg          |  4 ++--
 6 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 packages/statusbar/style/kernel-icon-dark.svg
 delete mode 100644 packages/statusbar/style/kernel-icon-light.svg
 delete mode 100644 packages/statusbar/style/terminal-icon-dark.svg
 delete mode 100644 packages/statusbar/style/terminal-icon-light.svg

diff --git a/packages/statusbar/style/base.css b/packages/statusbar/style/base.css
index edb6b59d0a5a..6625ae0e0324 100644
--- a/packages/statusbar/style/base.css
+++ b/packages/statusbar/style/base.css
@@ -7,26 +7,10 @@
   background-image: url('./line-form.svg');
 }
 
-/*
- * icons for light themes
- */
-
-[data-jp-theme-light='true'] .jp-StatusItem-kernel {
-  background-image: url('./kernel-icon-light.svg');
-}
-
-[data-jp-theme-light='true'] .jp-StatusItem-terminal {
-  background-image: url('./terminal-icon-light.svg');
-}
-
-/*
- * icons for dark themes
- */
-
-[data-jp-theme-light='false'] .jp-StatusItem-kernel {
-  background-image: url('./kernel-icon-dark.svg');
+.jp-StatusItem-kernel {
+  background-image: var(--jp-icon-kernel);
 }
 
-[data-jp-theme-light='false'] .jp-StatusItem-terminal {
-  background-image: url('./terminal-icon-dark.svg');
+.jp-StatusItem-terminal {
+  background-image: var(--jp-icon-terminal);
 }
diff --git a/packages/statusbar/style/kernel-icon-dark.svg b/packages/statusbar/style/kernel-icon-dark.svg
deleted file mode 100644
index c0b8e8197f07..000000000000
--- a/packages/statusbar/style/kernel-icon-dark.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect width="24" height="24" fill="black" fill-opacity="0"/>
-    <rect width="18" height="20" fill="black" fill-opacity="0" transform="translate(3 2)"/>
-    <path class="jp-icon-main" d="M4.10885 6.74135C4.20452 6.21505 4.39041 5.72544 4.80634 5.09319C5.35203 4.43482 6.35067 3.89653 7.68975 3.52838C9.02471 3.16136 10.5654 3 11.9998 3C13.4341 3 14.9749 3.16136 16.3098 3.52838C17.649 3.89655 18.6477 4.43488 19.1933 5.0933C19.6095 5.72557 19.7955 6.21514 19.8912 6.74139C19.9967 7.32185 20 7.97294 20 9C20 9.35129 19.7844 10.7386 19.2911 12.4034C18.8013 14.0565 18.0953 15.7799 17.2191 16.8753C16.7844 17.4188 16.3844 17.8059 16.0618 18.0944C15.9489 18.1953 15.8534 18.2774 15.7609 18.3569C15.7136 18.3976 15.6672 18.4375 15.6196 18.4789C15.5062 18.5777 15.3431 18.7207 15.2198 18.8745C14.9711 19.1847 14.7469 19.4839 14.5613 19.7317C14.4709 19.8523 14.3897 19.9607 14.3193 20.0523C14.0816 20.3611 13.9259 20.5338 13.777 20.6516C13.5455 20.8348 13.1949 21 11.9998 21C10.8047 21 10.4542 20.8348 10.2229 20.6517C10.074 20.5339 9.91841 20.3612 9.68072 20.0523C9.61032 19.9609 9.52922 19.8526 9.43901 19.7322C9.25332 19.4843 9.02907 19.1849 8.78025 18.8745C8.5646 18.6055 8.27898 18.3643 8.04285 18.1648C7.98552 18.1164 7.93111 18.0704 7.88133 18.0271C7.58713 17.7713 7.22852 17.4348 6.78084 16.8753C5.90445 15.7799 5.19851 14.0565 4.70872 12.4034C4.21548 10.7387 4 9.35134 4 9C4 7.97301 4.00333 7.32185 4.10885 6.74135Z" stroke="#EEEEEE" stroke-width="2"/>
-    <path class="jp-icon-main" d="M15.9999 18C15.9999 19 14 22 12 22C10 22 8 19 8 18C8 14.9624 10.067 11 12 11C13.933 11 15.9999 14.9624 15.9999 18Z" fill="#EEEEEE"/>
-</svg>
diff --git a/packages/statusbar/style/kernel-icon-light.svg b/packages/statusbar/style/kernel-icon-light.svg
deleted file mode 100644
index 787363598b46..000000000000
--- a/packages/statusbar/style/kernel-icon-light.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect width="24" height="24" fill="black" fill-opacity="0"/>
-    <rect width="18" height="20" fill="black" fill-opacity="0" transform="translate(3 2)"/>
-    <path class="jp-icon-main" d="M4.10885 6.74135C4.20452 6.21505 4.39041 5.72544 4.80634 5.09319C5.35203 4.43482 6.35067 3.89653 7.68975 3.52838C9.02471 3.16136 10.5654 3 11.9998 3C13.4341 3 14.9749 3.16136 16.3098 3.52838C17.649 3.89655 18.6477 4.43488 19.1933 5.0933C19.6095 5.72557 19.7955 6.21514 19.8912 6.74139C19.9967 7.32185 20 7.97294 20 9C20 9.35129 19.7844 10.7386 19.2911 12.4034C18.8013 14.0565 18.0953 15.7799 17.2191 16.8753C16.7844 17.4188 16.3844 17.8059 16.0618 18.0944C15.9489 18.1953 15.8534 18.2774 15.7609 18.3569C15.7136 18.3976 15.6672 18.4375 15.6196 18.4789C15.5062 18.5777 15.3431 18.7207 15.2198 18.8745C14.9711 19.1847 14.7469 19.4839 14.5613 19.7317C14.4709 19.8523 14.3897 19.9607 14.3193 20.0523C14.0816 20.3611 13.9259 20.5338 13.777 20.6516C13.5455 20.8348 13.1949 21 11.9998 21C10.8047 21 10.4542 20.8348 10.2229 20.6517C10.074 20.5339 9.91841 20.3612 9.68072 20.0523C9.61032 19.9609 9.52922 19.8526 9.43901 19.7322C9.25332 19.4843 9.02907 19.1849 8.78025 18.8745C8.5646 18.6055 8.27898 18.3643 8.04285 18.1648C7.98552 18.1164 7.93111 18.0704 7.88133 18.0271C7.58713 17.7713 7.22852 17.4348 6.78084 16.8753C5.90445 15.7799 5.19851 14.0565 4.70872 12.4034C4.21548 10.7387 4 9.35134 4 9C4 7.97301 4.00333 7.32185 4.10885 6.74135Z" stroke="#333333" stroke-width="2"/>
-    <path class="jp-icon-main" d="M15.9999 18C15.9999 19 14 22 12 22C10 22 8 19 8 18C8 14.9624 10.067 11 12 11C13.933 11 15.9999 14.9624 15.9999 18Z" fill="#333333"/>
-</svg>
diff --git a/packages/statusbar/style/terminal-icon-dark.svg b/packages/statusbar/style/terminal-icon-dark.svg
deleted file mode 100644
index 98f917547983..000000000000
--- a/packages/statusbar/style/terminal-icon-dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect class="jp-icon-main" width="20" height="20" transform="translate(2 2)" fill="#EEEEEE"/>
-    <path class="jp-icon-accent" d="M5.05664 8.76172C5.05664 8.59766 5.03125 8.45312 4.98047 8.32812C4.93359 8.19922 4.85547 8.08203 4.74609 7.97656C4.64062 7.87109 4.5 7.77539 4.32422 7.68945C4.15234 7.59961 3.94336 7.51172 3.69727 7.42578C3.30273 7.28516 2.94336 7.13672 2.61914 6.98047C2.29492 6.82422 2.01758 6.64258 1.78711 6.43555C1.56055 6.22852 1.38477 5.98828 1.25977 5.71484C1.13477 5.4375 1.07227 5.10938 1.07227 4.73047C1.07227 4.39844 1.12891 4.0957 1.24219 3.82227C1.35547 3.54492 1.51562 3.30469 1.72266 3.10156C1.92969 2.89844 2.17969 2.73437 2.47266 2.60938C2.76562 2.48438 3.0918 2.4043 3.45117 2.36914V1.10938H4.38867V2.38086C4.74023 2.42773 5.05664 2.52344 5.33789 2.66797C5.61914 2.8125 5.85742 3.00195 6.05273 3.23633C6.25195 3.4668 6.4043 3.74023 6.50977 4.05664C6.61914 4.36914 6.67383 4.7207 6.67383 5.11133H5.04492C5.04492 4.63867 4.9375 4.28125 4.72266 4.03906C4.50781 3.79297 4.2168 3.66992 3.84961 3.66992C3.65039 3.66992 3.47656 3.69727 3.32812 3.75195C3.18359 3.80273 3.06445 3.87695 2.9707 3.97461C2.87695 4.06836 2.80664 4.17969 2.75977 4.30859C2.7168 4.4375 2.69531 4.57812 2.69531 4.73047C2.69531 4.88281 2.7168 5.01953 2.75977 5.14062C2.80664 5.25781 2.88281 5.36719 2.98828 5.46875C3.09766 5.57031 3.24023 5.66797 3.41602 5.76172C3.5918 5.85156 3.81055 5.94336 4.07227 6.03711C4.4668 6.18555 4.82422 6.33984 5.14453 6.5C5.46484 6.65625 5.73828 6.83984 5.96484 7.05078C6.19531 7.25781 6.37109 7.5 6.49219 7.77734C6.61719 8.05078 6.67969 8.375 6.67969 8.75C6.67969 9.09375 6.62305 9.4043 6.50977 9.68164C6.39648 9.95508 6.23438 10.1914 6.02344 10.3906C5.8125 10.5898 5.55859 10.75 5.26172 10.8711C4.96484 10.9883 4.63281 11.0645 4.26562 11.0996V12.248H3.33398V11.0996C3.00195 11.0684 2.67969 10.9961 2.36719 10.8828C2.05469 10.7656 1.77734 10.5977 1.53516 10.3789C1.29688 10.1602 1.10547 9.88477 0.960938 9.55273C0.816406 9.2168 0.744141 8.81445 0.744141 8.3457H2.37891C2.37891 8.62695 2.41992 8.86328 2.50195 9.05469C2.58398 9.24219 2.68945 9.39258 2.81836 9.50586C2.95117 9.61523 3.10156 9.69336 3.26953 9.74023C3.4375 9.78711 3.60938 9.81055 3.78516 9.81055C4.20312 9.81055 4.51953 9.71289 4.73438 9.51758C4.94922 9.32227 5.05664 9.07031 5.05664 8.76172ZM13.418 12.2715H8.07422V11H13.418V12.2715Z" transform="translate(3.95264 6)" fill="black"/>
-</svg>
diff --git a/packages/statusbar/style/terminal-icon-light.svg b/packages/statusbar/style/terminal-icon-light.svg
deleted file mode 100644
index 668da37bfc4b..000000000000
--- a/packages/statusbar/style/terminal-icon-light.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect class="jp-icon-main" width="20" height="20" transform="translate(2 2)" fill="#333333"/>
-    <path class="jp-icon-accent" d="M5.05664 8.76172C5.05664 8.59766 5.03125 8.45312 4.98047 8.32812C4.93359 8.19922 4.85547 8.08203 4.74609 7.97656C4.64062 7.87109 4.5 7.77539 4.32422 7.68945C4.15234 7.59961 3.94336 7.51172 3.69727 7.42578C3.30273 7.28516 2.94336 7.13672 2.61914 6.98047C2.29492 6.82422 2.01758 6.64258 1.78711 6.43555C1.56055 6.22852 1.38477 5.98828 1.25977 5.71484C1.13477 5.4375 1.07227 5.10938 1.07227 4.73047C1.07227 4.39844 1.12891 4.0957 1.24219 3.82227C1.35547 3.54492 1.51562 3.30469 1.72266 3.10156C1.92969 2.89844 2.17969 2.73437 2.47266 2.60938C2.76562 2.48438 3.0918 2.4043 3.45117 2.36914V1.10938H4.38867V2.38086C4.74023 2.42773 5.05664 2.52344 5.33789 2.66797C5.61914 2.8125 5.85742 3.00195 6.05273 3.23633C6.25195 3.4668 6.4043 3.74023 6.50977 4.05664C6.61914 4.36914 6.67383 4.7207 6.67383 5.11133H5.04492C5.04492 4.63867 4.9375 4.28125 4.72266 4.03906C4.50781 3.79297 4.2168 3.66992 3.84961 3.66992C3.65039 3.66992 3.47656 3.69727 3.32812 3.75195C3.18359 3.80273 3.06445 3.87695 2.9707 3.97461C2.87695 4.06836 2.80664 4.17969 2.75977 4.30859C2.7168 4.4375 2.69531 4.57812 2.69531 4.73047C2.69531 4.88281 2.7168 5.01953 2.75977 5.14062C2.80664 5.25781 2.88281 5.36719 2.98828 5.46875C3.09766 5.57031 3.24023 5.66797 3.41602 5.76172C3.5918 5.85156 3.81055 5.94336 4.07227 6.03711C4.4668 6.18555 4.82422 6.33984 5.14453 6.5C5.46484 6.65625 5.73828 6.83984 5.96484 7.05078C6.19531 7.25781 6.37109 7.5 6.49219 7.77734C6.61719 8.05078 6.67969 8.375 6.67969 8.75C6.67969 9.09375 6.62305 9.4043 6.50977 9.68164C6.39648 9.95508 6.23438 10.1914 6.02344 10.3906C5.8125 10.5898 5.55859 10.75 5.26172 10.8711C4.96484 10.9883 4.63281 11.0645 4.26562 11.0996V12.248H3.33398V11.0996C3.00195 11.0684 2.67969 10.9961 2.36719 10.8828C2.05469 10.7656 1.77734 10.5977 1.53516 10.3789C1.29688 10.1602 1.10547 9.88477 0.960938 9.55273C0.816406 9.2168 0.744141 8.81445 0.744141 8.3457H2.37891C2.37891 8.62695 2.41992 8.86328 2.50195 9.05469C2.58398 9.24219 2.68945 9.39258 2.81836 9.50586C2.95117 9.61523 3.10156 9.69336 3.26953 9.74023C3.4375 9.78711 3.60938 9.81055 3.78516 9.81055C4.20312 9.81055 4.51953 9.71289 4.73438 9.51758C4.94922 9.32227 5.05664 9.07031 5.05664 8.76172ZM13.418 12.2715H8.07422V11H13.418V12.2715Z" transform="translate(3.95264 6)" fill="white"/>
-</svg>
diff --git a/packages/theme-dark-extension/style/icons/jupyter/terminal.svg b/packages/theme-dark-extension/style/icons/jupyter/terminal.svg
index 3d6a98bb99b8..2a3fee273d68 100644
--- a/packages/theme-dark-extension/style/icons/jupyter/terminal.svg
+++ b/packages/theme-dark-extension/style/icons/jupyter/terminal.svg
@@ -1,12 +1,12 @@
 <svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0)">
-<path d="M180 20H20V180H180V20Z" fill="white"/>
+<path d="M180 20H20V180H180V20Z" fill="#e0e0e0"/>
 <path d="M150 127.2H110V140H150V127.2Z" fill="#424242"/>
 <path d="M68.9 145.4V134.8C61.4 134.5 54.2 132.5 50 130L53.3 117C58 119.6 64.5 121.9 71.8 121.9C78.1 121.9 82.5 119.5 82.5 115C82.5 110.8 78.9 108.1 70.7 105.3C58.8 101.3 50.7 95.7 50.7 84.9C50.7 75.1 57.6 67.4 69.5 65.1V54.6H80.4V64.4C87.9 64.7 92.9 66.3 96.5 68.1L93.3 80.7C90.4 79.5 85.3 76.9 77.3 76.9C70.1 76.9 67.7 80 67.7 83.1C67.7 86.8 71.6 89.1 81.1 92.7C94.3 97.4 99.7 103.5 99.7 113.5C99.7 123.4 92.7 131.9 79.9 134.1V145.5L68.9 145.4Z" fill="#424242"/>
 </g>
 <defs>
 <clipPath id="clip0">
-<rect width="200" height="200" fill="white"/>
+<rect width="200" height="200" fill="#e0e0e0"/>
 </clipPath>
 </defs>
 </svg>