@jupyterlab/apputils-extension 4.0.6 → 4.1.0-alpha.2

package/lib/announcements.js

@@ -10,7 +10,7 @@ import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 const COMMAND_HELP_OPEN = 'help:open';
 const NEWS_API_URL = '/lab/api/news';
 const UPDATE_API_URL = '/lab/api/update';
-const PRIVACY_URL = 'https://jupyterlab.readthedocs.io/en/stable/privacy_policies.html';
+const PRIVACY_URL = 'https://jupyterlab.readthedocs.io/en/latest/privacy_policies.html';
 /**
  * Call the announcement API
  *

package/lib/index.js

@@ -521,10 +521,11 @@ const utilityCommands = {
             label: trans.__('Show Keyboard Shortcuts'),
             caption: trans.__('Show relevant keyboard shortcuts for the current active widget'),
             execute: args => {
-                var _a, _b, _c, _d;
-                const included = (_a = app.shell.currentWidget) === null || _a === void 0 ? void 0 : _a.node.contains(document.activeElement);
-                if (!included) {
-                    const currentNode = (_c = (_b = app.shell.currentWidget) === null || _b === void 0 ? void 0 : _b.content.node) !== null && _c !== void 0 ? _c : (_d = app.shell.currentWidget) === null || _d === void 0 ? void 0 : _d.node;
+                var _a;
+                const currentWidget = app.shell.currentWidget;
+                const included = currentWidget === null || currentWidget === void 0 ? void 0 : currentWidget.node.contains(document.activeElement);
+                if (!included && currentWidget instanceof MainAreaWidget) {
+                    const currentNode = (_a = currentWidget.content.node) !== null && _a !== void 0 ? _a : currentWidget === null || currentWidget === void 0 ? void 0 : currentWidget.node;
                     currentNode === null || currentNode === void 0 ? void 0 : currentNode.focus();
                 }
                 const options = { commands, trans };

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/settingconnector.js

@@ -32,7 +32,7 @@ export class SettingConnector extends DataConnector {
         return throttlers[id].invoke();
     }
     async list(query = 'all') {
-        const { isDeferred, isDisabled } = PageConfig.Extension;
+        const { isDisabled } = PageConfig.Extension;
         const { ids, values } = await this._connector.list(query === 'ids' ? 'ids' : undefined);
         if (query === 'all') {
             return { ids, values };
@@ -41,8 +41,8 @@ export class SettingConnector extends DataConnector {
             return { ids };
         }
         return {
-            ids: ids.filter(id => !isDeferred(id) && !isDisabled(id)),
-            values: values.filter(({ id }) => !isDeferred(id) && !isDisabled(id))
+            ids: ids.filter(id => !isDisabled(id)),
+            values: values.filter(({ id }) => !isDisabled(id))
         };
     }
     async save(id, raw) {

package/lib/settingconnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"settingconnector.js","sourceRoot":"","sources":["../src/settingconnector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,OAAO,gBAAiB,SAAQ,aAGrC;IACC,YAAY,SAA2D;QACrE,KAAK,EAAE,CAAC;QAkDF,gBAAW,GAAiC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAjDtE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,EAAU;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,CAAC,EAAE,IAAI,UAAU,CAAC,EAAE;YACvB,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;SACtE;QACD,OAAO,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAMD,KAAK,CAAC,IAAI,CACR,QAAkC,KAAK;QAEvC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC;QACxD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAChD,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CACpC,CAAC;QAEF,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;SACxB;QAED,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,OAAO,EAAE,GAAG,EAAE,CAAC;SAChB;QAED,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACzD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;SACtE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAU,EAAE,GAAW;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;CAIF"}
+{"version":3,"file":"settingconnector.js","sourceRoot":"","sources":["../src/settingconnector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,OAAO,gBAAiB,SAAQ,aAGrC;IACC,YAAY,SAA2D;QACrE,KAAK,EAAE,CAAC;QAkDF,gBAAW,GAAiC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAjDtE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,EAAU;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,CAAC,EAAE,IAAI,UAAU,CAAC,EAAE;YACvB,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;SACtE;QACD,OAAO,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAMD,KAAK,CAAC,IAAI,CACR,QAAkC,KAAK;QAEvC,MAAM,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC;QAC5C,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAChD,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CACpC,CAAC;QAEF,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;SACxB;QAED,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,OAAO,EAAE,GAAG,EAAE,CAAC;SAChB;QAED,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACtC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;SACnD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAU,EAAE,GAAW;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;CAIF"}

package/lib/themesplugins.js

@@ -12,6 +12,9 @@ import scrollbarStyleText from '../style/scrollbar.raw.css';
 var CommandIDs;
 (function (CommandIDs) {
     CommandIDs.changeTheme = 'apputils:change-theme';
+    CommandIDs.changePreferredLightTheme = 'apputils:change-light-theme';
+    CommandIDs.changePreferredDarkTheme = 'apputils:change-dark-theme';
+    CommandIDs.toggleAdaptiveTheme = 'apputils:adaptive-theme';
     CommandIDs.themeScrollbars = 'apputils:theme-scrollbars';
     CommandIDs.changeFont = 'apputils:change-font';
     CommandIDs.incrFontSize = 'apputils:incr-font-size';
@@ -90,9 +93,63 @@ export const themesPlugin = {
                 if (theme === manager.theme) {
                     return;
                 }
+                // Disable adaptive theme if users decide to change the theme when adaptive theme is on
+                if (manager.isToggledAdaptiveTheme()) {
+                    return manager.toggleAdaptiveTheme();
+                }
                 return manager.setTheme(theme);
             }
         });
+        commands.addCommand(CommandIDs.changePreferredLightTheme, {
+            label: args => {
+                if (args.theme === undefined) {
+                    return trans.__('Switch to the provided light `theme`.');
+                }
+                const theme = args['theme'];
+                const displayName = manager.getDisplayName(theme);
+                return args['isPalette']
+                    ? trans.__('Set Preferred Light Theme: %1', displayName)
+                    : displayName;
+            },
+            isToggled: args => args['theme'] === manager.preferredLightTheme,
+            execute: args => {
+                const theme = args['theme'];
+                if (theme === manager.preferredLightTheme) {
+                    return;
+                }
+                return manager.setPreferredLightTheme(theme);
+            }
+        });
+        commands.addCommand(CommandIDs.changePreferredDarkTheme, {
+            label: args => {
+                if (args.theme === undefined) {
+                    return trans.__('Switch to the provided dark `theme`.');
+                }
+                const theme = args['theme'];
+                const displayName = manager.getDisplayName(theme);
+                return args['isPalette']
+                    ? trans.__('Set Preferred Dark Theme: %1', displayName)
+                    : displayName;
+            },
+            isToggled: args => args['theme'] === manager.preferredDarkTheme,
+            execute: args => {
+                const theme = args['theme'];
+                if (theme === manager.preferredDarkTheme) {
+                    return;
+                }
+                return manager.setPreferredDarkTheme(theme);
+            }
+        });
+        commands.addCommand(CommandIDs.toggleAdaptiveTheme, {
+            // Avoid lengthy option text in menu
+            label: args => args['isPalette']
+                ? trans.__('Synchronize Styling Theme with System Settings')
+                : trans.__('Synchronize with System Settings'),
+            isToggled: () => manager.isToggledAdaptiveTheme(),
+            execute: () => {
+                manager.toggleAdaptiveTheme().catch(console.warn);
+            }
+        });
         commands.addCommand(CommandIDs.themeScrollbars, {
             label: trans.__('Theme Scrollbars'),
             isToggled: () => manager.isToggledThemeScrollbars(),
@@ -185,6 +242,28 @@ export const themesPaletteMenuPlugin = {
                 manager.themes.forEach(theme => {
                     palette.addItem({ command, args: { isPalette, theme }, category });
                 });
+                // choose preferred light theme
+                manager.themes.forEach(theme => {
+                    palette.addItem({
+                        command: CommandIDs.changePreferredLightTheme,
+                        args: { isPalette, theme },
+                        category
+                    });
+                });
+                // choose preferred dark theme
+                manager.themes.forEach(theme => {
+                    palette.addItem({
+                        command: CommandIDs.changePreferredDarkTheme,
+                        args: { isPalette, theme },
+                        category
+                    });
+                });
+                // toggle adaptive theme
+                palette.addItem({
+                    command: CommandIDs.toggleAdaptiveTheme,
+                    args: { isPalette },
+                    category
+                });
                 // toggle scrollbar theming
                 palette.addItem({ command: CommandIDs.themeScrollbars, category });
                 // increase/decrease code font size

package/lib/themesplugins.js.map

@@ -1 +1 @@
-{"version":3,"file":"themesplugins.js","sourceRoot":"","sources":["../src/themesplugins.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"themesplugins.js","sourceRoot":"","sources":["../src/themesplugins.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/apputils-extension",
-  "version": "4.0.6",
+  "version": "4.1.0-alpha.2",
   "description": "JupyterLab - Application Utilities Extension",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -38,26 +38,26 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/application": "^4.0.6",
-    "@jupyterlab/apputils": "^4.1.6",
-    "@jupyterlab/coreutils": "^6.0.6",
-    "@jupyterlab/docregistry": "^4.0.6",
-    "@jupyterlab/filebrowser": "^4.0.6",
-    "@jupyterlab/mainmenu": "^4.0.6",
-    "@jupyterlab/rendermime-interfaces": "^3.8.6",
-    "@jupyterlab/services": "^7.0.6",
-    "@jupyterlab/settingregistry": "^4.0.6",
-    "@jupyterlab/statedb": "^4.0.6",
-    "@jupyterlab/statusbar": "^4.0.6",
-    "@jupyterlab/translation": "^4.0.6",
-    "@jupyterlab/ui-components": "^4.0.6",
+    "@jupyterlab/application": "^4.1.0-alpha.2",
+    "@jupyterlab/apputils": "^4.2.0-alpha.2",
+    "@jupyterlab/coreutils": "^6.1.0-alpha.2",
+    "@jupyterlab/docregistry": "^4.1.0-alpha.2",
+    "@jupyterlab/filebrowser": "^4.1.0-alpha.2",
+    "@jupyterlab/mainmenu": "^4.1.0-alpha.2",
+    "@jupyterlab/rendermime-interfaces": "^3.8.3-alpha.1",
+    "@jupyterlab/services": "^7.1.0-alpha.2",
+    "@jupyterlab/settingregistry": "^4.1.0-alpha.2",
+    "@jupyterlab/statedb": "^4.1.0-alpha.2",
+    "@jupyterlab/statusbar": "^4.1.0-alpha.2",
+    "@jupyterlab/translation": "^4.1.0-alpha.2",
+    "@jupyterlab/ui-components": "^4.1.0-alpha.2",
     "@lumino/algorithm": "^2.0.1",
     "@lumino/commands": "^2.1.3",
     "@lumino/coreutils": "^2.1.2",
     "@lumino/disposable": "^2.1.2",
     "@lumino/domutils": "^2.0.1",
     "@lumino/polling": "^2.1.2",
-    "@lumino/widgets": "^2.3.0",
+    "@lumino/widgets": "^2.3.1-alpha.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-toastify": "^9.0.8"

package/schema/themes.json

@@ -12,6 +12,10 @@
               "id": "jp-mainmenu-settings-apputilstheme",
               "label": "Theme",
               "items": [
+                { "type": "separator" },
+                {
+                  "command": "apputils:adaptive-theme"
+                },
                 { "type": "separator" },
                 {
                   "command": "apputils:theme-scrollbars"
@@ -105,9 +109,27 @@
     "theme": {
       "type": "string",
       "title": "Selected Theme",
-      "description": "Application-level visual styling theme",
+      "description": "Application-level visual styling theme. Ignored when Adaptive Theme is enabled.",
       "default": "JupyterLab Light"
     },
+    "adaptive-theme": {
+      "type": "boolean",
+      "title": "Adaptive Theme",
+      "description": "Synchronize visual styling theme with system settings",
+      "default": false
+    },
+    "preferred-light-theme": {
+      "type": "string",
+      "title": "Preferred Light Theme",
+      "description": "Application-level light visual styling theme. Ignored when Adaptive Theme is disabled.",
+      "default": "JupyterLab Light"
+    },
+    "preferred-dark-theme": {
+      "type": "string",
+      "title": "Preferred Dark Theme",
+      "description": "Application-level dark visual styling theme. Ignored when Adaptive Theme is disabled.",
+      "default": "JupyterLab Dark"
+    },
     "theme-scrollbars": {
       "type": "boolean",
       "title": "Scrollbar Theming",

package/src/announcements.ts

@@ -17,7 +17,7 @@ const COMMAND_HELP_OPEN = 'help:open';
 const NEWS_API_URL = '/lab/api/news';
 const UPDATE_API_URL = '/lab/api/update';
 const PRIVACY_URL =
-  'https://jupyterlab.readthedocs.io/en/stable/privacy_policies.html';
+  'https://jupyterlab.readthedocs.io/en/latest/privacy_policies.html';
 
 /**
  * Call the announcement API

package/src/index.ts

@@ -646,14 +646,11 @@ const utilityCommands: JupyterFrontEndPlugin<void> = {
         'Show relevant keyboard shortcuts for the current active widget'
       ),
       execute: args => {
-        const included = app.shell.currentWidget?.node.contains(
-          document.activeElement
-        );
+        const currentWidget = app.shell.currentWidget;
+        const included = currentWidget?.node.contains(document.activeElement);
 
-        if (!included) {
-          const currentNode =
-            (app.shell.currentWidget as MainAreaWidget)?.content.node ??
-            app.shell.currentWidget?.node;
+        if (!included && currentWidget instanceof MainAreaWidget) {
+          const currentNode = currentWidget.content.node ?? currentWidget?.node;
           currentNode?.focus();
         }
         const options = { commands, trans };

package/src/settingconnector.ts

@@ -45,7 +45,7 @@ export class SettingConnector extends DataConnector<
   async list(
     query: 'active' | 'all' | 'ids' = 'all'
   ): Promise<{ ids: string[]; values?: ISettingRegistry.IPlugin[] }> {
-    const { isDeferred, isDisabled } = PageConfig.Extension;
+    const { isDisabled } = PageConfig.Extension;
     const { ids, values } = await this._connector.list(
       query === 'ids' ? 'ids' : undefined
     );
@@ -59,8 +59,8 @@ export class SettingConnector extends DataConnector<
     }
 
     return {
-      ids: ids.filter(id => !isDeferred(id) && !isDisabled(id)),
-      values: values.filter(({ id }) => !isDeferred(id) && !isDisabled(id))
+      ids: ids.filter(id => !isDisabled(id)),
+      values: values.filter(({ id }) => !isDisabled(id))
     };
   }
 

package/src/themesplugins.ts

@@ -23,6 +23,12 @@ import scrollbarStyleText from '../style/scrollbar.raw.css';
 namespace CommandIDs {
   export const changeTheme = 'apputils:change-theme';
 
+  export const changePreferredLightTheme = 'apputils:change-light-theme';
+
+  export const changePreferredDarkTheme = 'apputils:change-dark-theme';
+
+  export const toggleAdaptiveTheme = 'apputils:adaptive-theme';
+
   export const themeScrollbars = 'apputils:theme-scrollbars';
 
   export const changeFont = 'apputils:change-font';
@@ -123,10 +129,68 @@ export const themesPlugin: JupyterFrontEndPlugin<IThemeManager> = {
         if (theme === manager.theme) {
           return;
         }
+        // Disable adaptive theme if users decide to change the theme when adaptive theme is on
+        if (manager.isToggledAdaptiveTheme()) {
+          return manager.toggleAdaptiveTheme();
+        }
         return manager.setTheme(theme);
       }
     });
 
+    commands.addCommand(CommandIDs.changePreferredLightTheme, {
+      label: args => {
+        if (args.theme === undefined) {
+          return trans.__('Switch to the provided light `theme`.');
+        }
+        const theme = args['theme'] as string;
+        const displayName = manager.getDisplayName(theme);
+        return args['isPalette']
+          ? trans.__('Set Preferred Light Theme: %1', displayName)
+          : displayName;
+      },
+      isToggled: args => args['theme'] === manager.preferredLightTheme,
+      execute: args => {
+        const theme = args['theme'] as string;
+        if (theme === manager.preferredLightTheme) {
+          return;
+        }
+        return manager.setPreferredLightTheme(theme);
+      }
+    });
+
+    commands.addCommand(CommandIDs.changePreferredDarkTheme, {
+      label: args => {
+        if (args.theme === undefined) {
+          return trans.__('Switch to the provided dark `theme`.');
+        }
+        const theme = args['theme'] as string;
+        const displayName = manager.getDisplayName(theme);
+        return args['isPalette']
+          ? trans.__('Set Preferred Dark Theme: %1', displayName)
+          : displayName;
+      },
+      isToggled: args => args['theme'] === manager.preferredDarkTheme,
+      execute: args => {
+        const theme = args['theme'] as string;
+        if (theme === manager.preferredDarkTheme) {
+          return;
+        }
+        return manager.setPreferredDarkTheme(theme);
+      }
+    });
+
+    commands.addCommand(CommandIDs.toggleAdaptiveTheme, {
+      // Avoid lengthy option text in menu
+      label: args =>
+        args['isPalette']
+          ? trans.__('Synchronize Styling Theme with System Settings')
+          : trans.__('Synchronize with System Settings'),
+      isToggled: () => manager.isToggledAdaptiveTheme(),
+      execute: () => {
+        manager.toggleAdaptiveTheme().catch(console.warn);
+      }
+    });
+
     commands.addCommand(CommandIDs.themeScrollbars, {
       label: trans.__('Theme Scrollbars'),
       isToggled: () => manager.isToggledThemeScrollbars(),
@@ -237,6 +301,31 @@ export const themesPaletteMenuPlugin: JupyterFrontEndPlugin<void> = {
           palette.addItem({ command, args: { isPalette, theme }, category });
         });
 
+        // choose preferred light theme
+        manager.themes.forEach(theme => {
+          palette.addItem({
+            command: CommandIDs.changePreferredLightTheme,
+            args: { isPalette, theme },
+            category
+          });
+        });
+
+        // choose preferred dark theme
+        manager.themes.forEach(theme => {
+          palette.addItem({
+            command: CommandIDs.changePreferredDarkTheme,
+            args: { isPalette, theme },
+            category
+          });
+        });
+
+        // toggle adaptive theme
+        palette.addItem({
+          command: CommandIDs.toggleAdaptiveTheme,
+          args: { isPalette },
+          category
+        });
+
         // toggle scrollbar theming
         palette.addItem({ command: CommandIDs.themeScrollbars, category });
 

package/style/base.css

@@ -1,6 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2014-2017, Jupyter Development Team.
-|
+| Copyright (c) Jupyter Development Team.
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 

package/style/splash.css

@@ -1,6 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2014-2016, Jupyter Development Team.
-|
+| Copyright (c) Jupyter Development Team.
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/