Merge pull request #6541 from jasongrout/cssincludes

Fix CSS include files

buildutils/src/ensure-repo.ts

@@ -256,9 +256,9 @@ export async function ensureIntegrity(): Promise<boolean> {
     const skip = SKIP_CSS[name] || [];
     const cssData: Dict<Array<string>> = {};
 
-    if (data.jupyter && data.jupyter.extraStyles) {
-      Object.keys(data.jupyter.extraStyles).forEach(depName => {
-        cssData[depName] = data.jupyter.extraStyles[depName];
+    if (data.jupyterlab && data.jupyterlab.extraStyles) {
+      Object.keys(data.jupyterlab.extraStyles).forEach(depName => {
+        cssData[depName] = data.jupyterlab.extraStyles[depName];
       });
     }
 
@@ -279,7 +279,7 @@ export async function ensureIntegrity(): Promise<boolean> {
     graph.dependenciesOf(name).forEach(depName => {
       if (depName in cssData) {
         cssData[depName].forEach(cssPath => {
-          cssImports[name].push(depName + '/' + cssPath);
+          cssImports[name].push(`${depName}/${cssPath}`);
         });
       }
     });

packages/application/style/index.css

@@ -7,6 +7,6 @@
 @import url('~@phosphor/widgets/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@jupyterlab/docregistry/style/index.css');
-@import url('~font-awesome/css/font-awesome.css');
+@import url('~font-awesome/css/font-awesome.min.css');
 
 @import url('./base.css');

packages/codemirror/style/index.css

@@ -9,5 +9,20 @@
 @import url('~@jupyterlab/codeeditor/style/index.css');
 @import url('~@jupyterlab/statusbar/style/index.css');
 @import url('~codemirror/lib/codemirror.css');
+@import url('~codemirror/addon/dialog/dialog.css');
+@import url('~codemirror/addon/fold/foldgutter.css');
+@import url('~codemirror/theme/material.css');
+@import url('~codemirror/theme/zenburn.css');
+@import url('~codemirror/theme/abcdef.css');
+@import url('~codemirror/theme/base16-light.css');
+@import url('~codemirror/theme/base16-dark.css');
+@import url('~codemirror/theme/dracula.css');
+@import url('~codemirror/theme/hopscotch.css');
+@import url('~codemirror/theme/mbo.css');
+@import url('~codemirror/theme/mdn-like.css');
+@import url('~codemirror/theme/seti.css');
+@import url('~codemirror/theme/solarized.css');
+@import url('~codemirror/theme/the-matrix.css');
+@import url('~codemirror/theme/xq-light.css');
 
 @import url('./base.css');

packages/terminal/style/index.css

@@ -6,5 +6,6 @@
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 @import url('~@phosphor/widgets/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
+@import url('~xterm/src/xterm.css');
 
 @import url('./base.css');