diff --git a/packages/application/style/icons.css b/packages/application/style/icons.css index 547fd92fcf8d..449ad0140833 100644 --- 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 index 2fffde24024f..156d56f4ae72 100644 --- 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 index 015b9d66fb2a..f234672f5963 100644 --- 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 index 8dc6c2364fc5..9bbe95a912e2 100644 --- 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 index 045e75732c1f..ee3722b96529 100644 --- 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 index 86cf0f432c03..4290aa23651e 100644 --- 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 index 3d281cc45210..2379f659544c 100644 --- 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 index 9e47479e6a27..4ec8e3af7a51 100644 --- 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 index 1839e54405f5..1f7dd5977e68 100644 --- 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 index 748847d125de..7956d19d4a5e 100644 --- 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 index 86a3599e6ab7..15eb4eb2d6fc 100644 --- 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 index f7aab149c902..d4c849594d7c 100644 --- 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 index 86ce056e384a..8ff979e8058e 100644 --- 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 deleted file mode 100644 index 8f8dee397c0e..000000000000 --- a/packages/statusbar-extension/style/base.css +++ /dev/null @@ -1,9 +0,0 @@ -/*----------------------------------------------------------------------------- -| Copyright (c) Jupyter Development Team. -| Distributed under the terms of the Modified BSD License. -|----------------------------------------------------------------------------*/ - -/* A status bar icon */ -.jp-StatusBarIcon { - background-image: url('./status-bar-icon.svg'); -} diff --git a/packages/statusbar-extension/style/index.css b/packages/statusbar-extension/style/index.css index d22723071f4f..ccd1da2b939c 100644 --- 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 deleted file mode 100644 index 383e3c500df2..000000000000 --- a/packages/statusbar-extension/style/status-bar-icon.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - 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 @@ - - - - - - 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 @@ - - - - - - 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 @@ - - - - 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 @@ - - - - diff --git a/packages/tabmanager-extension/style/base.css b/packages/tabmanager-extension/style/base.css index 1aa39c9f3023..e969726c7cc3 100644 --- a/packages/tabmanager-extension/style/base.css +++ b/packages/tabmanager-extension/style/base.css @@ -70,10 +70,13 @@ } #tab-manager .p-TabBar-tab .p-TabBar-tabIcon { - width: 14px; background-position: left center; background-repeat: no-repeat; margin-right: 2px; + min-width: 16px; + min-height: 16px; + background-size: 16px; + vertical-align: middle; } #tab-manager .p-TabBar-tab.p-mod-closable > .p-TabBar-tabCloseIcon { @@ -117,3 +120,55 @@ background-size: 16px; background-image: var(--jp-icon-inverse-close-circle); } + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-FileIcon { + background-image: var(--jp-icon-file-selected); +} + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-TextEditorIcon { + background-image: var(--jp-icon-text-editor-selected); +} + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-NotebookIcon { + background-image: var(--jp-icon-notebook-selected); +} + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-FolderIcon { + background-image: var(--jp-icon-folder-selected); +} + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-MarkdownIcon { + background-image: var(--jp-icon-markdown-selected); +} + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-PythonIcon { + background-image: var(--jp-icon-python-selected); +} + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-JSONIcon { + background-image: var(--jp-icon-json-selected); +} + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-SpreadsheetIcon { + background-image: var(--jp-icon-spreadsheet-selected); +} + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-RKernelIcon { + background-image: var(--jp-icon-r-selected); +} + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-YAMLIcon { + background-image: var(--jp-icon-yaml-selected); +} + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-ImageIcon { + background-image: var(--jp-icon-image-selected); +} + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-CodeConsoleIcon { + background-image: var(--jp-icon-console-selected); +} + +#tab-manager .p-TabBar-tab.jp-mod-current .p-TabBar-tabIcon.jp-LauncherIcon { + background-image: var(--jp-icon-launcher-selected); +} diff --git a/packages/theme-dark-extension/style/icons/jupyter/console_selected.svg b/packages/theme-dark-extension/style/icons/jupyter/console_selected.svg new file mode 100644 index 000000000000..7b0a5b1e2fae --- /dev/null +++ b/packages/theme-dark-extension/style/icons/jupyter/console_selected.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/packages/theme-dark-extension/style/icons/jupyter/directory.svg b/packages/theme-dark-extension/style/icons/jupyter/directory.svg deleted file mode 100644 index b329c75886d7..000000000000 --- a/packages/theme-dark-extension/style/icons/jupyter/directory.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-dark-extension/style/icons/jupyter/directory_selected.svg b/packages/theme-dark-extension/style/icons/jupyter/directory_selected.svg deleted file mode 100644 index a4d376aed309..000000000000 --- a/packages/theme-dark-extension/style/icons/jupyter/directory_selected.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-dark-extension/style/icons/jupyter/launcher.svg b/packages/theme-dark-extension/style/icons/jupyter/launcher.svg deleted file mode 100644 index bed51da7117f..000000000000 --- a/packages/theme-dark-extension/style/icons/jupyter/launcher.svg +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-dark-extension/style/icons/jupyter/launcher_selected.svg b/packages/theme-dark-extension/style/icons/jupyter/launcher_selected.svg deleted file mode 100644 index e6ba7a43a5a6..000000000000 --- a/packages/theme-dark-extension/style/icons/jupyter/launcher_selected.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-dark-extension/style/icons/jupyter/book.svg b/packages/theme-dark-extension/style/icons/jupyter/notebook.svg similarity index 100% rename from packages/theme-dark-extension/style/icons/jupyter/book.svg rename to packages/theme-dark-extension/style/icons/jupyter/notebook.svg diff --git a/packages/theme-dark-extension/style/icons/jupyter/book_selected.svg b/packages/theme-dark-extension/style/icons/jupyter/notebook_selected.svg similarity index 100% rename from packages/theme-dark-extension/style/icons/jupyter/book_selected.svg rename to packages/theme-dark-extension/style/icons/jupyter/notebook_selected.svg diff --git a/packages/theme-dark-extension/style/icons/jupyter/questionmark.svg b/packages/theme-dark-extension/style/icons/jupyter/questionmark.svg deleted file mode 100644 index 5e711120891a..000000000000 --- a/packages/theme-dark-extension/style/icons/jupyter/questionmark.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - Group 2 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-dark-extension/style/icons/jupyter/settings.svg b/packages/theme-dark-extension/style/icons/jupyter/settings.svg deleted file mode 100644 index cb3c0f9a1c2e..000000000000 --- a/packages/theme-dark-extension/style/icons/jupyter/settings.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-dark-extension/style/icons/jupyter/settings_selected.svg b/packages/theme-dark-extension/style/icons/jupyter/settings_selected.svg deleted file mode 100644 index 1bedc8edb89b..000000000000 --- a/packages/theme-dark-extension/style/icons/jupyter/settings_selected.svg +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-dark-extension/style/icons/jupyter/terminal.svg b/packages/theme-dark-extension/style/icons/jupyter/terminal.svg index ba743b472a00..2a3fee273d68 100644 --- a/packages/theme-dark-extension/style/icons/jupyter/terminal.svg +++ b/packages/theme-dark-extension/style/icons/jupyter/terminal.svg @@ -1,85 +1,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/packages/theme-dark-extension/style/icons/md/bug.svg b/packages/theme-dark-extension/style/icons/md/bug.svg index c975eaa9d1df..65f751ab126f 100644 --- a/packages/theme-dark-extension/style/icons/md/bug.svg +++ b/packages/theme-dark-extension/style/icons/md/bug.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/chat.svg b/packages/theme-dark-extension/style/icons/md/chat.svg deleted file mode 100644 index e4299cdf86c2..000000000000 --- a/packages/theme-dark-extension/style/icons/md/chat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/ellipses.svg b/packages/theme-dark-extension/style/icons/md/ellipses.svg index eb4c1b1ef664..b6d1e650cb02 100644 --- a/packages/theme-dark-extension/style/icons/md/ellipses.svg +++ b/packages/theme-dark-extension/style/icons/md/ellipses.svg @@ -1,5 +1,5 @@ - + diff --git a/packages/theme-dark-extension/style/icons/md/expand-less.svg b/packages/theme-dark-extension/style/icons/md/expand-less.svg deleted file mode 100644 index 22a6f37d5f85..000000000000 --- a/packages/theme-dark-extension/style/icons/md/expand-less.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/packages/theme-dark-extension/style/icons/md/expand-more.svg b/packages/theme-dark-extension/style/icons/md/expand-more.svg deleted file mode 100644 index 3bc08c0b139c..000000000000 --- a/packages/theme-dark-extension/style/icons/md/expand-more.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/packages/theme-dark-extension/style/icons/md/ic_folder_24px.svg b/packages/theme-dark-extension/style/icons/md/ic_folder_24px.svg index cf094ea92a05..764399c1c042 100644 --- a/packages/theme-dark-extension/style/icons/md/ic_folder_24px.svg +++ b/packages/theme-dark-extension/style/icons/md/ic_folder_24px.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/ic_folder_24px_selected.svg b/packages/theme-dark-extension/style/icons/md/ic_folder_24px_selected.svg new file mode 100644 index 000000000000..03c2a41343fd --- /dev/null +++ b/packages/theme-dark-extension/style/icons/md/ic_folder_24px_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/ic_format_align_left_24px.svg b/packages/theme-dark-extension/style/icons/md/ic_format_align_left_24px.svg new file mode 100644 index 000000000000..0a75e3d0c5e5 --- /dev/null +++ b/packages/theme-dark-extension/style/icons/md/ic_format_align_left_24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/ic_format_align_left_24px_selected.svg b/packages/theme-dark-extension/style/icons/md/ic_format_align_left_24px_selected.svg new file mode 100644 index 000000000000..ad40e674fa85 --- /dev/null +++ b/packages/theme-dark-extension/style/icons/md/ic_format_align_left_24px_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/ic_keyboard_24px.svg b/packages/theme-dark-extension/style/icons/md/ic_keyboard_24px.svg new file mode 100644 index 000000000000..36b6e9c1b68e --- /dev/null +++ b/packages/theme-dark-extension/style/icons/md/ic_keyboard_24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/ic_keyboard_24px_selected.svg b/packages/theme-dark-extension/style/icons/md/ic_keyboard_24px_selected.svg new file mode 100644 index 000000000000..e4d62f2e52a3 --- /dev/null +++ b/packages/theme-dark-extension/style/icons/md/ic_keyboard_24px_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/ic_launch_24px.svg b/packages/theme-dark-extension/style/icons/md/ic_launch_24px.svg new file mode 100644 index 000000000000..905a2b3b7aa2 --- /dev/null +++ b/packages/theme-dark-extension/style/icons/md/ic_launch_24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/ic_launch_24px_selected.svg b/packages/theme-dark-extension/style/icons/md/ic_launch_24px_selected.svg new file mode 100644 index 000000000000..ae83117c0845 --- /dev/null +++ b/packages/theme-dark-extension/style/icons/md/ic_launch_24px_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/ic_memory_24px.svg b/packages/theme-dark-extension/style/icons/md/ic_memory_24px.svg new file mode 100644 index 000000000000..59c09f9aa981 --- /dev/null +++ b/packages/theme-dark-extension/style/icons/md/ic_memory_24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/ic_memory_24px_selected.svg b/packages/theme-dark-extension/style/icons/md/ic_memory_24px_selected.svg new file mode 100644 index 000000000000..c1830a8dd425 --- /dev/null +++ b/packages/theme-dark-extension/style/icons/md/ic_memory_24px_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/ic_settings_24px.svg b/packages/theme-dark-extension/style/icons/md/ic_settings_24px.svg new file mode 100644 index 000000000000..63ee312a9039 --- /dev/null +++ b/packages/theme-dark-extension/style/icons/md/ic_settings_24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/ic_settings_24px_selected.svg b/packages/theme-dark-extension/style/icons/md/ic_settings_24px_selected.svg new file mode 100644 index 000000000000..fc0c6c53e828 --- /dev/null +++ b/packages/theme-dark-extension/style/icons/md/ic_settings_24px_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/lens.svg b/packages/theme-dark-extension/style/icons/md/lens.svg deleted file mode 100644 index 31748fdce0f4..000000000000 --- a/packages/theme-dark-extension/style/icons/md/lens.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/theme-dark-extension/style/icons/md/link.svg b/packages/theme-dark-extension/style/icons/md/link.svg index 301c2443888c..b49ffbec9fc6 100644 --- a/packages/theme-dark-extension/style/icons/md/link.svg +++ b/packages/theme-dark-extension/style/icons/md/link.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/icons/md/more-horiz.svg b/packages/theme-dark-extension/style/icons/md/more-horiz.svg index 3b48b79714da..5dae00267d81 100644 --- a/packages/theme-dark-extension/style/icons/md/more-horiz.svg +++ b/packages/theme-dark-extension/style/icons/md/more-horiz.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/theme-dark-extension/style/urls.css b/packages/theme-dark-extension/style/urls.css index 0c555d390c4e..54007cebb1bb 100644 --- a/packages/theme-dark-extension/style/urls.css +++ b/packages/theme-dark-extension/style/urls.css @@ -32,34 +32,31 @@ --jp-about-header-logo: url('icons/jupyter/jupyter.svg'); --jp-about-header-wordmark: url('images/jupyterlab-wordmark.svg'); --jp-icon-add: url('icons/md/ic_add_24px.svg'); - --jp-icon-book-selected: url('icons/jupyter/book_selected.svg'); - --jp-icon-book: url('icons/jupyter/book.svg'); + --jp-icon-notebook-selected: url('icons/jupyter/notebook_selected.svg'); + --jp-icon-notebook: url('icons/jupyter/notebook.svg'); --jp-icon-bug: url('icons/md/bug.svg'); --jp-icon-build: url('icons/md/ic_build_24px.svg'); --jp-icon-caretdown: url('icons/md/caretdown.svg'); --jp-icon-caretleft: url('icons/md/caretleft.svg'); --jp-icon-caretright: url('icons/md/caretright.svg'); --jp-icon-caretup: url('icons/md/caretup.svg'); - --jp-icon-chat: url('icons/md/chat.svg'); --jp-icon-checkmark-disabled: url('icons/md/checkmark-disabled.svg'); --jp-icon-checkmark: url('icons/md/checkmark.svg'); --jp-icon-circle: url('icons/md/circle.svg'); --jp-icon-close-circle: url('icons/md/close-circle.svg'); --jp-icon-close: url('icons/md/close.svg'); + --jp-icon-console-selected: url('icons/jupyter/console_selected.svg'); --jp-icon-console: url('icons/jupyter/console.svg'); --jp-icon-copy: url('icons/md/copy.svg'); --jp-icon-cut: url('icons/md/cut.svg'); - --jp-icon-directory-selected: url('icons/jupyter/directory_selected.svg'); - --jp-icon-directory: url('icons/jupyter/directory.svg'); --jp-icon-download: url('icons/md/download.svg'); --jp-icon-edit: url('icons/md/edit.svg'); --jp-icon-ellipses: url('icons/md/ellipses.svg'); - --jp-icon-expand-less: url('icons/md/expand-less.svg'); - --jp-icon-expand-more: url('icons/md/expand-more.svg'); --jp-icon-extension: url('icons/md/ic_extension_24px.svg'); - --jp-icon-file-selected: url('icons/jupyter/file_selected.svg'); --jp-icon-file-upload: url('icons/md/ic_file_upload_24px.svg'); + --jp-icon-file-selected: url('icons/jupyter/file_selected.svg'); --jp-icon-file: url('icons/jupyter/file.svg'); + --jp-icon-folder-selected: url('icons/md/ic_folder_24px_selected.svg'); --jp-icon-folder: url('icons/md/ic_folder_24px.svg'); --jp-icon-home: url('icons/md/ic_home_24px.svg'); --jp-icon-image-selected: url('icons/jupyter/image_selected.svg'); @@ -72,7 +69,12 @@ --jp-icon-json: url('icons/jupyter/json.svg'); --jp-icon-jupyter: url('icons/jupyter/jupyter.svg'); --jp-icon-kernel-running: url('icons/md/panorama_fish_eye.svg'); - --jp-icon-launcher: url('icons/jupyter/launcher.svg'); + --jp-icon-kernel-selected: url('icons/md/ic_memory_24px_selected.svg'); + --jp-icon-kernel: url('icons/md/ic_memory_24px.svg'); + --jp-icon-keyboard-selected: url('icons/md/ic_keyboard_24px_selected.svg'); + --jp-icon-keyboard: url('icons/md/ic_keyboard_24px.svg'); + --jp-icon-launcher-selected: url('icons/md/ic_launch_24px_selected.svg'); + --jp-icon-launcher: url('icons/md/ic_launch_24px.svg'); --jp-icon-link: url('icons/md/link.svg'); --jp-icon-markdown-selected: url('icons/jupyter/markdown_selected.svg'); --jp-icon-markdown: url('icons/jupyter/markdown.svg'); @@ -82,7 +84,6 @@ --jp-icon-paste: url('icons/md/paste.svg'); --jp-icon-python-selected: url('icons/jupyter/python_selected.svg'); --jp-icon-python: url('icons/jupyter/python.svg'); - --jp-icon-question-mark: url('icons/jupyter/questionmark.svg'); --jp-icon-r-selected: url('icons/jupyter/r_selected.svg'); --jp-icon-r: url('icons/jupyter/r.svg'); --jp-icon-refresh: url('icons/md/ic_refresh_18px.svg'); @@ -94,14 +95,16 @@ --jp-icon-search-arrow-down: url('icons/jupyter/search_arrow_down.svg'); --jp-icon-search-case-sensitive: url('icons/jupyter/search_case_sensitive.svg'); --jp-icon-search-regex: url('icons/jupyter/search_regex.svg'); - --jp-icon-settings: url('icons/jupyter/settings.svg'); + --jp-icon-settings-selected: url('icons/md/ic_settings_24px_selected.svg'); + --jp-icon-settings: url('icons/md/ic_settings_24px.svg'); --jp-icon-spreadsheet-selected: url('icons/jupyter/csv_selected.svg'); --jp-icon-spreadsheet: url('icons/jupyter/csv.svg'); --jp-icon-stop: url('icons/md/stop.svg'); --jp-icon-stop-circle: url('icons/md/stop-circle.svg'); --jp-icon-terminal: url('icons/jupyter/terminal.svg'); --jp-icon-tab: url('icons/md/ic_tab_24px.svg'); - --jp-icon-text-editor: url('icons/jupyter/texteditor.svg'); + --jp-icon-text-editor-selected: url('icons/md/ic_format_align_left_24px_selected.svg'); + --jp-icon-text-editor: url('icons/md/ic_format_align_left_24px.svg'); --jp-icon-undo: url('icons/md/undo.svg'); --jp-icon-vega: url('icons/jupyter/vega.svg'); --jp-icon-yaml-selected: url('icons/jupyter/yml_selected.svg'); diff --git a/packages/theme-light-extension/style/icons/jupyter/console_selected.svg b/packages/theme-light-extension/style/icons/jupyter/console_selected.svg new file mode 100644 index 000000000000..7b0a5b1e2fae --- /dev/null +++ b/packages/theme-light-extension/style/icons/jupyter/console_selected.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/packages/theme-light-extension/style/icons/jupyter/directory.svg b/packages/theme-light-extension/style/icons/jupyter/directory.svg deleted file mode 100644 index b905f97d15ca..000000000000 --- a/packages/theme-light-extension/style/icons/jupyter/directory.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-light-extension/style/icons/jupyter/directory_selected.svg b/packages/theme-light-extension/style/icons/jupyter/directory_selected.svg deleted file mode 100644 index a4d376aed309..000000000000 --- a/packages/theme-light-extension/style/icons/jupyter/directory_selected.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-light-extension/style/icons/jupyter/file.svg b/packages/theme-light-extension/style/icons/jupyter/file.svg index 2274cec79658..a3a2bd6c1e89 100644 --- a/packages/theme-light-extension/style/icons/jupyter/file.svg +++ b/packages/theme-light-extension/style/icons/jupyter/file.svg @@ -4,8 +4,8 @@ viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve"> diff --git a/packages/theme-light-extension/style/icons/jupyter/launcher.svg b/packages/theme-light-extension/style/icons/jupyter/launcher.svg deleted file mode 100644 index bed51da7117f..000000000000 --- a/packages/theme-light-extension/style/icons/jupyter/launcher.svg +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-light-extension/style/icons/jupyter/launcher_selected.svg b/packages/theme-light-extension/style/icons/jupyter/launcher_selected.svg deleted file mode 100644 index e6ba7a43a5a6..000000000000 --- a/packages/theme-light-extension/style/icons/jupyter/launcher_selected.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-light-extension/style/icons/jupyter/book.svg b/packages/theme-light-extension/style/icons/jupyter/notebook.svg similarity index 100% rename from packages/theme-light-extension/style/icons/jupyter/book.svg rename to packages/theme-light-extension/style/icons/jupyter/notebook.svg diff --git a/packages/theme-light-extension/style/icons/jupyter/book_selected.svg b/packages/theme-light-extension/style/icons/jupyter/notebook_selected.svg similarity index 100% rename from packages/theme-light-extension/style/icons/jupyter/book_selected.svg rename to packages/theme-light-extension/style/icons/jupyter/notebook_selected.svg diff --git a/packages/theme-light-extension/style/icons/jupyter/questionmark.svg b/packages/theme-light-extension/style/icons/jupyter/questionmark.svg deleted file mode 100644 index 5e711120891a..000000000000 --- a/packages/theme-light-extension/style/icons/jupyter/questionmark.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - Group 2 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-light-extension/style/icons/jupyter/settings.svg b/packages/theme-light-extension/style/icons/jupyter/settings.svg deleted file mode 100644 index cb3c0f9a1c2e..000000000000 --- a/packages/theme-light-extension/style/icons/jupyter/settings.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-light-extension/style/icons/jupyter/settings_selected.svg b/packages/theme-light-extension/style/icons/jupyter/settings_selected.svg deleted file mode 100644 index 1bedc8edb89b..000000000000 --- a/packages/theme-light-extension/style/icons/jupyter/settings_selected.svg +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/theme-light-extension/style/icons/md/bug.svg b/packages/theme-light-extension/style/icons/md/bug.svg index 18d1ae79a523..e0f59a675e5c 100644 --- a/packages/theme-light-extension/style/icons/md/bug.svg +++ b/packages/theme-light-extension/style/icons/md/bug.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/caretdown.svg b/packages/theme-light-extension/style/icons/md/caretdown.svg index 24ccb2b4e107..893ecbb0da78 100644 --- a/packages/theme-light-extension/style/icons/md/caretdown.svg +++ b/packages/theme-light-extension/style/icons/md/caretdown.svg @@ -4,7 +4,8 @@ viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve"> - + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/caretleft.svg b/packages/theme-light-extension/style/icons/md/caretleft.svg index db0e4d4f040e..39415861e24c 100644 --- a/packages/theme-light-extension/style/icons/md/caretleft.svg +++ b/packages/theme-light-extension/style/icons/md/caretleft.svg @@ -4,7 +4,8 @@ viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve"> - + diff --git a/packages/theme-light-extension/style/icons/md/caretright.svg b/packages/theme-light-extension/style/icons/md/caretright.svg index cfd0aab6336c..5cdc1dd76b4c 100644 --- a/packages/theme-light-extension/style/icons/md/caretright.svg +++ b/packages/theme-light-extension/style/icons/md/caretright.svg @@ -4,7 +4,8 @@ viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve"> - + diff --git a/packages/theme-light-extension/style/icons/md/caretup.svg b/packages/theme-light-extension/style/icons/md/caretup.svg index 8aa5eaeeb4b6..c901eb5dc8a6 100644 --- a/packages/theme-light-extension/style/icons/md/caretup.svg +++ b/packages/theme-light-extension/style/icons/md/caretup.svg @@ -4,7 +4,8 @@ viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve"> - + diff --git a/packages/theme-light-extension/style/icons/md/chat.svg b/packages/theme-light-extension/style/icons/md/chat.svg deleted file mode 100644 index fe158abc86be..000000000000 --- a/packages/theme-light-extension/style/icons/md/chat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/checkmark.svg b/packages/theme-light-extension/style/icons/md/checkmark.svg index 3fab25f262b0..080f31d4e7b1 100644 --- a/packages/theme-light-extension/style/icons/md/checkmark.svg +++ b/packages/theme-light-extension/style/icons/md/checkmark.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/expand-less.svg b/packages/theme-light-extension/style/icons/md/expand-less.svg deleted file mode 100644 index 22a6f37d5f85..000000000000 --- a/packages/theme-light-extension/style/icons/md/expand-less.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/packages/theme-light-extension/style/icons/md/expand-more.svg b/packages/theme-light-extension/style/icons/md/expand-more.svg deleted file mode 100644 index 3bc08c0b139c..000000000000 --- a/packages/theme-light-extension/style/icons/md/expand-more.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/packages/theme-light-extension/style/icons/md/ic_folder_24px.svg b/packages/theme-light-extension/style/icons/md/ic_folder_24px.svg index ef0e7640c184..4e2a6c5f9d69 100644 --- a/packages/theme-light-extension/style/icons/md/ic_folder_24px.svg +++ b/packages/theme-light-extension/style/icons/md/ic_folder_24px.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/ic_folder_24px_selected.svg b/packages/theme-light-extension/style/icons/md/ic_folder_24px_selected.svg new file mode 100644 index 000000000000..03c2a41343fd --- /dev/null +++ b/packages/theme-light-extension/style/icons/md/ic_folder_24px_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/ic_format_align_left_24px.svg b/packages/theme-light-extension/style/icons/md/ic_format_align_left_24px.svg new file mode 100644 index 000000000000..f6c6aed70f4d --- /dev/null +++ b/packages/theme-light-extension/style/icons/md/ic_format_align_left_24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/ic_format_align_left_24px_selected.svg b/packages/theme-light-extension/style/icons/md/ic_format_align_left_24px_selected.svg new file mode 100644 index 000000000000..ad40e674fa85 --- /dev/null +++ b/packages/theme-light-extension/style/icons/md/ic_format_align_left_24px_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/ic_keyboard_24px.svg b/packages/theme-light-extension/style/icons/md/ic_keyboard_24px.svg new file mode 100644 index 000000000000..4c338e732a4b --- /dev/null +++ b/packages/theme-light-extension/style/icons/md/ic_keyboard_24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/ic_keyboard_24px_selected.svg b/packages/theme-light-extension/style/icons/md/ic_keyboard_24px_selected.svg new file mode 100644 index 000000000000..e4d62f2e52a3 --- /dev/null +++ b/packages/theme-light-extension/style/icons/md/ic_keyboard_24px_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/ic_launch_24px.svg b/packages/theme-light-extension/style/icons/md/ic_launch_24px.svg new file mode 100644 index 000000000000..457106e2bcbc --- /dev/null +++ b/packages/theme-light-extension/style/icons/md/ic_launch_24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/ic_launch_24px_selected.svg b/packages/theme-light-extension/style/icons/md/ic_launch_24px_selected.svg new file mode 100644 index 000000000000..ae83117c0845 --- /dev/null +++ b/packages/theme-light-extension/style/icons/md/ic_launch_24px_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/ic_memory_24px.svg b/packages/theme-light-extension/style/icons/md/ic_memory_24px.svg new file mode 100644 index 000000000000..10d00b5963cf --- /dev/null +++ b/packages/theme-light-extension/style/icons/md/ic_memory_24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/ic_memory_24px_selected.svg b/packages/theme-light-extension/style/icons/md/ic_memory_24px_selected.svg new file mode 100644 index 000000000000..c1830a8dd425 --- /dev/null +++ b/packages/theme-light-extension/style/icons/md/ic_memory_24px_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/ic_settings_24px.svg b/packages/theme-light-extension/style/icons/md/ic_settings_24px.svg new file mode 100644 index 000000000000..6acdc98d370d --- /dev/null +++ b/packages/theme-light-extension/style/icons/md/ic_settings_24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/ic_settings_24px_selected.svg b/packages/theme-light-extension/style/icons/md/ic_settings_24px_selected.svg new file mode 100644 index 000000000000..fc0c6c53e828 --- /dev/null +++ b/packages/theme-light-extension/style/icons/md/ic_settings_24px_selected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/landingfolder.svg b/packages/theme-light-extension/style/icons/md/landingfolder.svg deleted file mode 100644 index 4cea84948540..000000000000 --- a/packages/theme-light-extension/style/icons/md/landingfolder.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/lens.svg b/packages/theme-light-extension/style/icons/md/lens.svg deleted file mode 100644 index 31748fdce0f4..000000000000 --- a/packages/theme-light-extension/style/icons/md/lens.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/theme-light-extension/style/icons/md/link.svg b/packages/theme-light-extension/style/icons/md/link.svg index d2492566ad5f..c7ed4a9389f0 100644 --- a/packages/theme-light-extension/style/icons/md/link.svg +++ b/packages/theme-light-extension/style/icons/md/link.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/more-horiz.svg b/packages/theme-light-extension/style/icons/md/more-horiz.svg index 3b48b79714da..3ee0abcd3792 100644 --- a/packages/theme-light-extension/style/icons/md/more-horiz.svg +++ b/packages/theme-light-extension/style/icons/md/more-horiz.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/theme-light-extension/style/icons/md/undo.svg b/packages/theme-light-extension/style/icons/md/undo.svg index ef7bd255fd66..6bf5f4ddad0f 100644 --- a/packages/theme-light-extension/style/icons/md/undo.svg +++ b/packages/theme-light-extension/style/icons/md/undo.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/packages/theme-light-extension/style/urls.css b/packages/theme-light-extension/style/urls.css index fef4d80d87d6..65ec1de86a8a 100644 --- a/packages/theme-light-extension/style/urls.css +++ b/packages/theme-light-extension/style/urls.css @@ -31,34 +31,31 @@ --jp-about-header-logo: url('icons/jupyter/jupyter.svg'); --jp-about-header-wordmark: url('images/jupyterlab-wordmark.svg'); --jp-icon-add: url('icons/md/ic_add_24px.svg'); - --jp-icon-book-selected: url('icons/jupyter/book_selected.svg'); - --jp-icon-book: url('icons/jupyter/book.svg'); + --jp-icon-notebook-selected: url('icons/jupyter/notebook_selected.svg'); + --jp-icon-notebook: url('icons/jupyter/notebook.svg'); --jp-icon-bug: url('icons/md/bug.svg'); --jp-icon-build: url('icons/md/ic_build_24px.svg'); --jp-icon-caretdown: url('icons/md/caretdown.svg'); --jp-icon-caretleft: url('icons/md/caretleft.svg'); --jp-icon-caretright: url('icons/md/caretright.svg'); --jp-icon-caretup: url('icons/md/caretup.svg'); - --jp-icon-chat: url('icons/md/chat.svg'); --jp-icon-checkmark-disabled: url('icons/md/checkmark-disabled.svg'); --jp-icon-checkmark: url('icons/md/checkmark.svg'); --jp-icon-circle: url('icons/md/circle.svg'); --jp-icon-close-circle: url('icons/md/close-circle.svg'); --jp-icon-close: url('icons/md/close.svg'); + --jp-icon-console-selected: url('icons/jupyter/console_selected.svg'); --jp-icon-console: url('icons/jupyter/console.svg'); --jp-icon-copy: url('icons/md/copy.svg'); --jp-icon-cut: url('icons/md/cut.svg'); - --jp-icon-directory-selected: url('icons/jupyter/directory_selected.svg'); - --jp-icon-directory: url('icons/jupyter/directory.svg'); --jp-icon-download: url('icons/md/download.svg'); --jp-icon-edit: url('icons/md/edit.svg'); --jp-icon-ellipses: url('icons/md/ellipses.svg'); - --jp-icon-expand-less: url('icons/md/expand-less.svg'); - --jp-icon-expand-more: url('icons/md/expand-more.svg'); --jp-icon-extension: url('icons/md/ic_extension_24px.svg'); - --jp-icon-file-selected: url('icons/jupyter/file_selected.svg'); --jp-icon-file-upload: url('icons/md/ic_file_upload_24px.svg'); + --jp-icon-file-selected: url('icons/jupyter/file_selected.svg'); --jp-icon-file: url('icons/jupyter/file.svg'); + --jp-icon-folder-selected: url('icons/md/ic_folder_24px_selected.svg'); --jp-icon-folder: url('icons/md/ic_folder_24px.svg'); --jp-icon-home: url('icons/md/ic_home_24px.svg'); --jp-icon-image-selected: url('icons/jupyter/image_selected.svg'); @@ -71,7 +68,12 @@ --jp-icon-json: url('icons/jupyter/json.svg'); --jp-icon-jupyter: url('icons/jupyter/jupyter.svg'); --jp-icon-kernel-running: url('icons/md/panorama_fish_eye.svg'); - --jp-icon-launcher: url('icons/jupyter/launcher.svg'); + --jp-icon-kernel-selected: url('icons/md/ic_memory_24px_selected.svg'); + --jp-icon-kernel: url('icons/md/ic_memory_24px.svg'); + --jp-icon-keyboard-selected: url('icons/md/ic_keyboard_24px_selected.svg'); + --jp-icon-keyboard: url('icons/md/ic_keyboard_24px.svg'); + --jp-icon-launcher-selected: url('icons/md/ic_launch_24px_selected.svg'); + --jp-icon-launcher: url('icons/md/ic_launch_24px.svg'); --jp-icon-link: url('icons/md/link.svg'); --jp-icon-markdown-selected: url('icons/jupyter/markdown_selected.svg'); --jp-icon-markdown: url('icons/jupyter/markdown.svg'); @@ -81,7 +83,6 @@ --jp-icon-paste: url('icons/md/paste.svg'); --jp-icon-python-selected: url('icons/jupyter/python_selected.svg'); --jp-icon-python: url('icons/jupyter/python.svg'); - --jp-icon-question-mark: url('icons/jupyter/questionmark.svg'); --jp-icon-r-selected: url('icons/jupyter/r_selected.svg'); --jp-icon-r: url('icons/jupyter/r.svg'); --jp-icon-refresh: url('icons/md/ic_refresh_18px.svg'); @@ -93,14 +94,16 @@ --jp-icon-search-arrow-down: url('icons/jupyter/search_arrow_down.svg'); --jp-icon-search-case-sensitive: url('icons/jupyter/search_case_sensitive.svg'); --jp-icon-search-regex: url('icons/jupyter/search_regex.svg'); - --jp-icon-settings: url('icons/jupyter/settings.svg'); + --jp-icon-settings-selected: url('icons/md/ic_settings_24px_selected.svg'); + --jp-icon-settings: url('icons/md/ic_settings_24px.svg'); --jp-icon-spreadsheet-selected: url('icons/jupyter/csv_selected.svg'); --jp-icon-spreadsheet: url('icons/jupyter/csv.svg'); --jp-icon-stop: url('icons/md/stop.svg'); --jp-icon-stop-circle: url('icons/md/stop-circle.svg'); --jp-icon-tab: url('icons/md/ic_tab_24px.svg'); --jp-icon-terminal: url('icons/jupyter/terminal.svg'); - --jp-icon-text-editor: url('icons/jupyter/texteditor.svg'); + --jp-icon-text-editor-selected: url('icons/md/ic_format_align_left_24px_selected.svg'); + --jp-icon-text-editor: url('icons/md/ic_format_align_left_24px.svg'); --jp-icon-undo: url('icons/md/undo.svg'); --jp-icon-vega: url('icons/jupyter/vega.svg'); --jp-icon-yaml-selected: url('icons/jupyter/yml_selected.svg');