Clean up handling of font-awesome

jupyterlab/package.json

@@ -52,6 +52,7 @@
     "@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",
@@ -64,6 +65,7 @@
     "@phosphor/virtualdom": "^1.1.1",
     "@phosphor/widgets": "^1.3.0",
     "d3": "^3.5.17",
+    "font-awesome": "^4.7.0",
     "vega": "^2.6.1",
     "vega-embed": "^2.2.0",
     "vega-lite": "^1.0.16"

packages/application/style/index.css

@@ -3,7 +3,6 @@
 | 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');
 
 

packages/theme-dark-extension/package.json

@@ -17,17 +17,14 @@
   },
   "dependencies": {
     "@jupyterlab/application": "^0.9.0",
-    "@jupyterlab/apputils": "^0.9.0"
+    "@jupyterlab/apputils": "^0.9.0",
+    "@jupyterlab/theming": "^0.9.0",
+    "font-awesome": "^4.7.0"
   },
   "devDependencies": {
      "rimraf": "^2.5.2",
      "typescript": "~2.4.1"
   },
-  "scripts": {
-    "build": "tsc",
-    "clean": "rimraf lib",
-    "watch": "tsc -w"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/jupyterlab/jupyterlab.git"

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

@@ -3,6 +3,7 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
+@import '~font-awesome/css/font-awesome.min.css';
 @import '~@jupyterlab/application/style/index.css';
 @import './variables.css';
 

packages/theme-light-extension/package.json

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

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

@@ -3,6 +3,7 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
+@import '~font-awesome/css/font-awesome.min.css';
 @import '~@jupyterlab/application/style/index.css';
 @import './variables.css';
 

test/package.json

@@ -59,7 +59,6 @@
     "concurrently": "^3.4.0",
     "css-loader": "^0.27.3",
     "file-loader": "^0.10.1",
-    "font-awesome": "^4.6.3",
     "fs-extra": "^2.1.2",
     "istanbul-instrumenter-loader": "^2.0.0",
     "json-loader": "^0.5.4",