Merge pull request #6664 from ellisonbg/icon-work

Icon cleanup
jupyterlab · Jun 20, 2019 · e6fee48 · e6fee48
2 parents d3515a2 + a6d81ad
commit e6fee48
Show file tree

Hide file tree

Showing 92 changed files with 280 additions and 1,358 deletions.
diff --git a/packages/application/style/icons.css b/packages/application/style/icons.css
@@ -51,10 +51,6 @@
   background-image: var(--jp-icon-build);
 }
 
-.jp-ChatIcon {
-  background-image: var(--jp-icon-chat);
-}
-
 .jp-CircleIcon {
   background-image: var(--jp-icon-kernel-running);
 }
@@ -99,14 +95,6 @@
   background-image: var(--jp-icon-ellipses);
 }
 
-.jp-ExpandLessIcon {
-  background-image: var(--jp-icon-expand-less);
-}
-
-.jp-ExpandMoreIcon {
-  background-image: var(--jp-icon-expand-more);
-}
-
 .jp-ExtensionIcon {
   background-image: var(--jp-icon-extension);
 }
@@ -148,6 +136,14 @@
   padding-right: 0px;
 }
 
+.jp-KernelIcon {
+  background-image: var(--jp-icon-kernel);
+}
+
+.jp-KeyboardIcon {
+  background-image: var(--jp-icon-keyboard);
+}
+
 .jp-LauncherIcon {
   background-image: var(--jp-icon-launcher);
 }
@@ -182,11 +178,11 @@
 }
 
 .jp-NotebookIcon {
-  background-image: var(--jp-icon-book);
+  background-image: var(--jp-icon-notebook);
 }
 
-.jp-OpenFolderIcon {
-  background-image: var(--jp-icon-directory);
+.jp-FolderIcon {
+  background-image: var(--jp-icon-folder);
 }
 
 .jp-PaletteIcon {
@@ -253,14 +249,10 @@
   background-image: var(--jp-icon-file-upload);
 }
 
-.jp-YamlIcon {
+.jp-YAMLIcon {
   background-image: var(--jp-icon-yaml);
 }
 
 .jp-VegaIcon {
   background-image: var(--jp-icon-vega);
 }
-
-.jp-QuestionMarkIcon {
-  background-image: var(--jp-icon-question-mark);
-}
diff --git a/packages/console-extension/schema/tracker.json b/packages/console-extension/schema/tracker.json
@@ -1,6 +1,8 @@
 {
-  "title": "Console",
-  "description": "Console settings.",
+  "title": "Code Console",
+  "description": "Code Console settings.",
+  "jupyter.lab.setting-icon-class": "jp-CodeConsoleIcon",
+  "jupyter.lab.setting-icon-label": "Code Console Settings",
   "jupyter.lab.shortcuts": [
     {
       "command": "console:linebreak",

diff --git a/packages/docregistry/src/registry.ts b/packages/docregistry/src/registry.ts
@@ -1183,7 +1183,7 @@ export namespace DocumentRegistry {
     extensions: [],
     mimeTypes: ['text/directory'],
     contentType: 'directory',
-    iconClass: 'jp-MaterialIcon jp-OpenFolderIcon'
+    iconClass: 'jp-MaterialIcon jp-FolderIcon'
   };
 
   /**
@@ -1240,7 +1240,7 @@ export namespace DocumentRegistry {
       displayName: 'YAML File',
       mimeTypes: ['text/x-yaml', 'text/yaml'],
       extensions: ['.yaml', '.yml'],
-      iconClass: 'jp-MaterialIcon jp-YamlIcon'
+      iconClass: 'jp-MaterialIcon jp-YAMLIcon'
     },
     {
       name: 'svg',

diff --git a/packages/filebrowser-extension/schema/browser.json b/packages/filebrowser-extension/schema/browser.json
@@ -1,5 +1,5 @@
 {
-  "jupyter.lab.setting-icon-class": "jp-FileIcon",
+  "jupyter.lab.setting-icon-class": "jp-FolderIcon",
   "jupyter.lab.setting-icon-label": "File Browser",
   "title": "File Browser",
   "description": "File Browser settings.",

diff --git a/packages/filebrowser-extension/src/index.ts b/packages/filebrowser-extension/src/index.ts
@@ -478,7 +478,7 @@ function addCommands(
           return '';
         }
       } else {
-        return 'jp-MaterialIcon jp-OpenFolderIcon';
+        return 'jp-MaterialIcon jp-FolderIcon';
       }
     },
     label: args => (args['label'] || args['factory'] || 'Open') as string,

diff --git a/packages/filebrowser/style/base.css b/packages/filebrowser/style/base.css
@@ -232,46 +232,50 @@
   left: -8px;
 }
 
-.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-NotebookIcon {
-  background-image: var(--jp-icon-book-selected);
+.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-FileIcon {
+  background-image: var(--jp-icon-file-selected);
 }
 
-.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-OpenFolderIcon {
-  background-image: var(--jp-icon-directory-selected);
+.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-TextEditorIcon {
+  background-image: var(--jp-icon-text-editor-selected);
 }
 
-.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-FileIcon {
-  background-image: var(--jp-icon-file-selected);
+.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-NotebookIcon {
+  background-image: var(--jp-icon-notebook-selected);
 }
 
-.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-YamlIcon {
-  background-image: var(--jp-icon-yaml-selected);
+.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-FolderIcon {
+  background-image: var(--jp-icon-folder-selected);
 }
 
 .jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-MarkdownIcon {
   background-image: var(--jp-icon-markdown-selected);
 }
 
-.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-ImageIcon {
-  background-image: var(--jp-icon-image-selected);
-}
-
-.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-SpreadsheetIcon {
-  background-image: var(--jp-icon-spreadsheet-selected);
+.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-PythonIcon {
+  background-image: var(--jp-icon-python-selected);
 }
 
 .jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-JSONIcon {
   background-image: var(--jp-icon-json-selected);
 }
 
-.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-PythonIcon {
-  background-image: var(--jp-icon-python-selected);
+.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-SpreadsheetIcon {
+  background-image: var(--jp-icon-spreadsheet-selected);
 }
 
 .jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-RKernelIcon {
   background-image: var(--jp-icon-r-selected);
 }
 
+.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-YAMLIcon {
+  background-image: var(--jp-icon-yaml-selected);
+}
+
+.jp-DirListing-item.jp-mod-selected .jp-DirListing-itemIcon.jp-ImageIcon {
+  background-image: var(--jp-icon-image-selected);
+}
+
 .jp-DirListing-item.p-mod-drag-image,
 .jp-DirListing-item.jp-mod-selected.p-mod-drag-image {
   font-size: var(--jp-ui-font-size1);

diff --git a/packages/fileeditor-extension/src/index.ts b/packages/fileeditor-extension/src/index.ts
@@ -49,12 +49,12 @@ import { Menu } from '@phosphor/widgets';
 /**
  * The class name for the text editor icon from the default theme.
  */
-const EDITOR_ICON_CLASS = 'jp-TextEditorIcon';
+const EDITOR_ICON_CLASS = 'jp-MaterialIcon jp-TextEditorIcon';
 
 /**
  * The class name for the text editor icon from the default theme.
  */
-const MARKDOWN_ICON_CLASS = 'jp-MarkdownIcon';
+const MARKDOWN_ICON_CLASS = 'jp-MaterialIcon jp-MarkdownIcon';
 
 /**
  * The name of the factory that creates editor widgets.

diff --git a/packages/running/style/base.css b/packages/running/style/base.css
@@ -118,7 +118,7 @@
 }
 
 .jp-RunningSessions-itemIcon.jp-mod-notebook {
-  background-image: var(--jp-icon-book);
+  background-image: var(--jp-icon-notebook);
 }
 
 .jp-RunningSessions-itemIcon.jp-mod-console {

diff --git a/packages/settingeditor/src/pluginlist.tsx b/packages/settingeditor/src/pluginlist.tsx
@@ -253,7 +253,9 @@ namespace Private {
       const { id, schema, version } = plugin;
       const itemTitle = `${schema.description}\n${id}\n${version}`;
       const image = getHint(ICON_CLASS_KEY, registry, plugin);
-      const iconClass = `jp-PluginList-icon${image ? ' ' + image : ''}`;
+      const iconClass = `jp-MaterialIcon jp-PluginList-icon${
+        image ? ' ' + image : ''
+      }`;
       const iconTitle = getHint(ICON_LABEL_KEY, registry, plugin);
 
       return (

diff --git a/packages/settingeditor/style/base.css b/packages/settingeditor/style/base.css
@@ -240,3 +240,66 @@
 #setting-editor .jp-SettingsTableEditor td.jp-SettingsTableEditor-type {
   text-align: right;
 }
+
+#setting-editor
+  .jp-PluginList
+  .jp-mod-selected
+  .jp-PluginList-icon.jp-FileIcon {
+  background-image: var(--jp-icon-file-selected);
+}
+
+#setting-editor
+  .jp-PluginList
+  .jp-mod-selected
+  .jp-PluginList-icon.jp-TextEditorIcon {
+  background-image: var(--jp-icon-text-editor-selected);
+}
+
+#setting-editor
+  .jp-PluginList
+  .jp-mod-selected
+  .jp-PluginList-icon.jp-NotebookIcon {
+  background-image: var(--jp-icon-notebook-selected);
+}
+
+#setting-editor
+  .jp-PluginList
+  .jp-mod-selected
+  .jp-PluginList-icon.jp-FolderIcon {
+  background-image: var(--jp-icon-folder-selected);
+}
+
+#setting-editor
+  .jp-PluginList
+  .jp-mod-selected
+  .jp-PluginList-icon.jp-CodeConsoleIcon {
+  background-image: var(--jp-icon-console-selected);
+}
+
+#setting-editor
+  .jp-PluginList
+  .jp-mod-selected
+  .jp-PluginList-icon.jp-MarkdownIcon {
+  background-image: var(--jp-icon-markdown-selected);
+}
+
+#setting-editor
+  .jp-PluginList
+  .jp-mod-selected
+  .jp-PluginList-icon.jp-LauncherIcon {
+  background-image: var(--jp-icon-launcher-selected);
+}
+
+#setting-editor
+  .jp-PluginList
+  .jp-mod-selected
+  .jp-PluginList-icon.jp-SettingsIcon {
+  background-image: var(--jp-icon-settings-selected);
+}
+
+#setting-editor
+  .jp-PluginList
+  .jp-mod-selected
+  .jp-PluginList-icon.jp-KeyboardIcon {
+  background-image: var(--jp-icon-keyboard-selected);
+}
diff --git a/packages/shortcuts-extension/schema/plugin.json b/packages/shortcuts-extension/schema/plugin.json
@@ -1,6 +1,6 @@
 {
   "jupyter.lab.setting-deprecated": true,
-  "jupyter.lab.setting-icon-class": "jp-LauncherIcon",
+  "jupyter.lab.setting-icon-class": "jp-KeyboardIcon",
   "jupyter.lab.setting-icon-label": "Keyboard Shortcuts",
   "title": "Keyboard Shortcuts",
   "description": "Keyboard shortcut settings for JupyterLab.",

diff --git a/packages/shortcuts-extension/schema/shortcuts.json b/packages/shortcuts-extension/schema/shortcuts.json
@@ -1,9 +1,9 @@
 {
-  "jupyter.lab.setting-icon-class": "jp-LauncherIcon",
+  "jupyter.lab.setting-icon-class": "jp-KeyboardIcon",
   "jupyter.lab.setting-icon-label": "Keyboard Shortcuts",
   "jupyter.lab.transform": true,
   "title": "Keyboard Shortcuts",
-  "description": "Keyboard shortcut settings for JupyterLab.",
+  "description": "Keyboard shortcut settings.",
   "type": "object",
   "additionalProperties": false,
   "properties": {

diff --git a/packages/statusbar-extension/schema/plugin.json b/packages/statusbar-extension/schema/plugin.json
@@ -1,5 +1,5 @@
 {
-  "jupyter.lab.setting-icon-class": "jp-StatusBarIcon",
+  "jupyter.lab.setting-icon-class": "jp-SettingsIcon",
   "jupyter.lab.setting-icon-label": "Status Bar",
   "title": "Status Bar",
   "description": "Status Bar settings.",

diff --git a/packages/statusbar-extension/style/base.css b/packages/statusbar-extension/style/base.css
diff --git a/packages/statusbar-extension/style/index.css b/packages/statusbar-extension/style/index.css
@@ -14,5 +14,3 @@
 @import url('~@jupyterlab/fileeditor/style/index.css');
 @import url('~@jupyterlab/mainmenu/style/index.css');
 @import url('~@jupyterlab/notebook/style/index.css');
-
-@import url('./base.css');
diff --git a/packages/statusbar-extension/style/status-bar-icon.svg b/packages/statusbar-extension/style/status-bar-icon.svg
diff --git 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
diff --git a/packages/statusbar/style/kernel-icon-light.svg b/packages/statusbar/style/kernel-icon-light.svg
diff --git a/packages/statusbar/style/terminal-icon-dark.svg b/packages/statusbar/style/terminal-icon-dark.svg
diff --git a/packages/statusbar/style/terminal-icon-light.svg b/packages/statusbar/style/terminal-icon-light.svg