Merge the theming package into application

jupyterlab/package.json

@@ -52,7 +52,6 @@
     "@jupyterlab/terminal-extension": "^0.9.0",
     "@jupyterlab/theme-dark-extension": "^0.9.0",
     "@jupyterlab/theme-light-extension": "^0.9.0",
-    "@jupyterlab/theming": "^0.9.0",
     "@jupyterlab/tooltip": "^0.9.0",
     "@jupyterlab/tooltip-extension": "^0.9.0",
     "@jupyterlab/vega2-extension": "^0.9.0",

packages/application/style/index.css

@@ -3,13 +3,18 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
+@import url('~font-awesome/css/font-awesome.min.css');
+@import url('~@phosphor/widgets/style/index.css');
 
-/*-----------------------------------------------------------------------------
-| General
-|----------------------------------------------------------------------------*/
+
+.p-Widget.p-mod-hidden {
+  display: none !important;
+}
 
 
 body {
+  font-family: var(--jp-ui-font-family);
+  background: var(--jp-layout-color3);
   margin: 0;
   padding: 0;
   overflow: hidden;
@@ -43,11 +48,14 @@ body {
 }
 
 
-
-/*-----------------------------------------------------------------------------
-| Import children style files
-|----------------------------------------------------------------------------*/
-
+/* Sibling imports */
+@import './datagrid.css';
+@import './dockpanel.css';
+@import './images.css';
+@import './icons.css';
+@import './materialcolors.css';
+@import './menus.css';
+@import './scrollbar.css';
+@import './tabs.css';
+@import './buttons.css';
 @import './sidepanel.css';
-
-

packages/theme-dark-extension/package.json

@@ -17,8 +17,7 @@
   },
   "dependencies": {
     "@jupyterlab/application": "^0.9.0",
-    "@jupyterlab/apputils": "^0.9.0",
-    "@jupyterlab/theming": "^0.9.0"
+    "@jupyterlab/apputils": "^0.9.0"
   },
   "devDependencies": {
      "rimraf": "^2.5.2",

packages/theme-dark-extension/style/embed.css

@@ -3,7 +3,7 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
-@import '~@jupyterlab/theming/style/index.css';
+@import '~@jupyterlab/application/style/index.css';
 @import './variables.css';
 
 :root {

packages/theme-light-extension/package.json

@@ -17,8 +17,7 @@
   "description": "JupyterLab - Default Light Theme",
   "dependencies": {
     "@jupyterlab/application": "^0.9.0",
-    "@jupyterlab/apputils": "^0.9.0",
-    "@jupyterlab/theming": "^0.9.0"
+    "@jupyterlab/apputils": "^0.9.0"
   },
   "devDependencies": {
      "rimraf": "^2.5.2",

packages/theme-light-extension/style/embed.css

@@ -3,7 +3,7 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
-@import '~@jupyterlab/theming/style/index.css';
+@import '~@jupyterlab/application/style/index.css';
 @import './variables.css';
 
 :root {

packages/theming/package.json

@@ -1,35 +0,0 @@
-{
-  "name": "@jupyterlab/theming",
-  "version": "0.9.0",
-  "description": "JupyterLab - Theming",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib/*.d.ts",
-    "lib/*.js",
-    "style/*.css",
-    "style/images/*.*",
-    "style/icons/*.*",
-    "style/icons/**/*.*"
-  ],
-  "directories": {
-    "lib": "lib/"
-  },
-  "dependencies": {
-    "font-awesome": "^4.6.3"
-  },
-  "devDependencies": {
-    "rimraf": "^2.5.2",
-    "typescript": "~2.4.1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/jupyterlab/jupyterlab.git"
-  },
-  "author": "Project Jupyter",
-  "license": "BSD-3-Clause",
-  "bugs": {
-    "url": "https://github.com/jupyterlab/jupyterlab/issues"
-  },
-  "homepage": "https://github.com/jupyterlab/jupyterlab"
-}

packages/theming/style/index.css

@@ -1,30 +0,0 @@
-/*-----------------------------------------------------------------------------
-| Copyright (c) Jupyter Development Team.
-| Distributed under the terms of the Modified BSD License.
-|----------------------------------------------------------------------------*/
-
-@import url('~font-awesome/css/font-awesome.min.css');
-@import url('~@phosphor/widgets/style/index.css');
-
-
-.p-Widget.p-mod-hidden {
-  display: none !important;
-}
-
-
-body {
-  font-family: var(--jp-ui-font-family);
-  background: var(--jp-layout-color3);
-}
-
-
-/* Sibling imports */
-@import './datagrid.css';
-@import './dockpanel.css';
-@import './images.css';
-@import './icons.css';
-@import './materialcolors.css';
-@import './menus.css';
-@import './scrollbar.css';
-@import './tabs.css';
-@import './buttons.css';