Fix conflict between mocha and jest types (#100)

* Fix conflict between mocha and jest types

* Add types only if test is enabled

* Fix CSS format

Author: fcollonval

template/style/{% if kind == 'theme' %}variables.css{% endif %}

@@ -53,31 +53,40 @@ all of MD as it is not optimized for dense, information rich UIs.
     0.12
   );
   --jp-elevation-z0: none;
-  --jp-elevation-z1: 0 2px 1px -1px var(--jp-shadow-umbra-color),
+  --jp-elevation-z1:
+    0 2px 1px -1px var(--jp-shadow-umbra-color),
     0 1px 1px 0 var(--jp-shadow-penumbra-color),
     0 1px 3px 0 var(--jp-shadow-ambient-color);
-  --jp-elevation-z2: 0 3px 1px -2px var(--jp-shadow-umbra-color),
+  --jp-elevation-z2:
+    0 3px 1px -2px var(--jp-shadow-umbra-color),
     0 2px 2px 0 var(--jp-shadow-penumbra-color),
     0 1px 5px 0 var(--jp-shadow-ambient-color);
-  --jp-elevation-z4: 0 2px 4px -1px var(--jp-shadow-umbra-color),
+  --jp-elevation-z4:
+    0 2px 4px -1px var(--jp-shadow-umbra-color),
     0 4px 5px 0 var(--jp-shadow-penumbra-color),
     0 1px 10px 0 var(--jp-shadow-ambient-color);
-  --jp-elevation-z6: 0 3px 5px -1px var(--jp-shadow-umbra-color),
+  --jp-elevation-z6:
+    0 3px 5px -1px var(--jp-shadow-umbra-color),
     0 6px 10px 0 var(--jp-shadow-penumbra-color),
     0 1px 18px 0 var(--jp-shadow-ambient-color);
-  --jp-elevation-z8: 0 5px 5px -3px var(--jp-shadow-umbra-color),
+  --jp-elevation-z8:
+    0 5px 5px -3px var(--jp-shadow-umbra-color),
     0 8px 10px 1px var(--jp-shadow-penumbra-color),
     0 3px 14px 2px var(--jp-shadow-ambient-color);
-  --jp-elevation-z12: 0 7px 8px -4px var(--jp-shadow-umbra-color),
+  --jp-elevation-z12:
+    0 7px 8px -4px var(--jp-shadow-umbra-color),
     0 12px 17px 2px var(--jp-shadow-penumbra-color),
     0 5px 22px 4px var(--jp-shadow-ambient-color);
-  --jp-elevation-z16: 0 8px 10px -5px var(--jp-shadow-umbra-color),
+  --jp-elevation-z16:
+    0 8px 10px -5px var(--jp-shadow-umbra-color),
     0 16px 24px 2px var(--jp-shadow-penumbra-color),
     0 6px 30px 5px var(--jp-shadow-ambient-color);
-  --jp-elevation-z20: 0 10px 13px -6px var(--jp-shadow-umbra-color),
+  --jp-elevation-z20:
+    0 10px 13px -6px var(--jp-shadow-umbra-color),
     0 20px 31px 3px var(--jp-shadow-penumbra-color),
     0 8px 38px 7px var(--jp-shadow-ambient-color);
-  --jp-elevation-z24: 0 11px 15px -7px var(--jp-shadow-umbra-color),
+  --jp-elevation-z24:
+    0 11px 15px -7px var(--jp-shadow-umbra-color),
     0 24px 38px 3px var(--jp-shadow-penumbra-color),
     0 9px 46px 8px var(--jp-shadow-ambient-color);
 
@@ -108,8 +117,9 @@ all of MD as it is not optimized for dense, information rich UIs.
   --jp-ui-font-size1: 13px; /* Base font size */
   --jp-ui-font-size2: 1.2em;
   --jp-ui-font-size3: 1.44em;
-  --jp-ui-font-family: -apple-system, blinkmacsystemfont, 'Segoe UI', helvetica,
-    arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+  --jp-ui-font-family:
+    -apple-system, blinkmacsystemfont, 'Segoe UI', helvetica, arial, sans-serif,
+    'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
 
   /*
    * Use these font colors against the corresponding main layout colors.
@@ -163,9 +173,9 @@ all of MD as it is not optimized for dense, information rich UIs.
   --jp-content-font-color2: rgba(0, 0, 0, 0.54);
   --jp-content-font-color3: rgba(0, 0, 0, 0.38);
   --jp-content-link-color: var(--md-blue-700);
-  --jp-content-font-family: -apple-system, blinkmacsystemfont, 'Segoe UI',
-    helvetica, arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
-    'Segoe UI Symbol';
+  --jp-content-font-family:
+    -apple-system, blinkmacsystemfont, 'Segoe UI', helvetica, arial, sans-serif,
+    'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
 
   /*
    * Code Fonts

template/tsconfig.json template/tsconfig.json.jinjatemplate/tsconfig.json renamed to template/tsconfig.json.jinja

@@ -18,7 +18,8 @@
     "rootDir": "src",
     "strict": true,
     "strictNullChecks": true,
-    "target": "ES2018"
+    "target": "ES2018"{% if test %},
+    "types": ["jest"]{% endif %}
   },
   "include": ["src/*"]
 }

template/{% if test %}tsconfig.test.json{% endif %}

@@ -1,6 +1,3 @@
 {
-  "extends": "./tsconfig",
-  "compilerOptions": {
-    "types": ["jest"]
-  }
+  "extends": "./tsconfig"
 }