Merge pull request #426 from fcollonval/410-dark-theme-history

Correct dark theming

Author: telamonian

jest.config.js

@@ -1,11 +1,12 @@
 module.exports = {
   automock: false,
   moduleNameMapper: {
-    '\\.(css|less|sass|scss)$': 'identity-obj-proxy'
+    '\\.(css|less|sass|scss)$': 'identity-obj-proxy',
+    '\\.(svg)$': '<rootDir>/testutils/jest-file-mock.js'
   },
   preset: 'ts-jest/presets/js-with-babel',
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
-  setupFiles: ['./setupJest.js'],
+  setupFiles: ['<rootDir>/testutils/jest-setup-files.js'],
   testPathIgnorePatterns: ['/dev_mode/', '/lib/', '/node_modules/'],
   testRegex: '/tests/test-.*/.*.spec.ts[x]?$',
   transformIgnorePatterns: ['/node_modules/(?!(@jupyterlab/.*)/)'],

package.json

@@ -31,6 +31,9 @@
     "style/*.css",
     "style/images/*.svg"
   ],
+  "sideEffects": [
+    "style/*.css"
+  ],
   "jupyterlab": {
     "extension": true,
     "discovery": {
@@ -46,14 +49,15 @@
     }
   },
   "dependencies": {
-    "@jupyterlab/application": "^1.0.0",
-    "@jupyterlab/apputils": "^1.0.0",
-    "@jupyterlab/console": "^1.0.0",
-    "@jupyterlab/coreutils": "^3.0.0",
-    "@jupyterlab/filebrowser": "^1.0.0",
-    "@jupyterlab/mainmenu": "^1.0.0",
-    "@jupyterlab/services": "^4.0.0",
-    "@jupyterlab/terminal": "^1.0.0",
+    "@jupyterlab/application": "^1.1.0",
+    "@jupyterlab/apputils": "^1.1.0",
+    "@jupyterlab/console": "^1.1.0",
+    "@jupyterlab/coreutils": "^3.1.0",
+    "@jupyterlab/filebrowser": "^1.1.0",
+    "@jupyterlab/mainmenu": "^1.1.0",
+    "@jupyterlab/services": "^4.1.0",
+    "@jupyterlab/terminal": "^1.1.0",
+    "@jupyterlab/ui-components": "^1.1.0",
     "@phosphor/widgets": "^1.8.0",
     "nbdime": "~5.0.1",
     "react": "~16.8.4",

src/components/BranchHeader.tsx

@@ -25,7 +25,7 @@ import {
   branchHeaderCenterContent,
   branchTrackingIconStyle,
   branchTrackingLabelStyle
-} from '../componentsStyle/BranchHeaderStyle';
+} from '../style/BranchHeaderStyle';
 
 import { classes } from 'typestyle';
 

src/components/CommitBox.tsx

@@ -4,7 +4,7 @@ import {
   textInputStyle,
   stagedCommitStyle,
   stagedCommitMessageStyle
-} from '../componentsStyle/BranchHeaderStyle';
+} from '../style/BranchHeaderStyle';
 
 import { classes } from 'typestyle';
 

src/components/FileItem.tsx

@@ -5,7 +5,7 @@ import {
   changeStageButtonStyle,
   diffFileButtonStyle,
   discardFileButtonStyle
-} from '../componentsStyle/GitStageStyle';
+} from '../style/GitStageStyle';
 
 import {
   disabledFileStyle,
@@ -22,7 +22,7 @@ import {
   selectedFileChangedLabelStyle,
   selectedFileStyle,
   sideBarExpandedFileLabelStyle
-} from '../componentsStyle/FileItemStyle';
+} from '../style/FileItemStyle';
 
 import { classes } from 'typestyle';
 

src/components/FileList.tsx

@@ -31,7 +31,7 @@ import {
   spreadsheetFileIconStyle,
   yamlFileIconSelectedStyle,
   yamlFileIconStyle
-} from '../componentsStyle/FileListStyle';
+} from '../style/FileListStyle';
 import { Git, IGitShowPrefixResult } from '../git';
 import { GitStage } from './GitStage';
 

src/components/GitPanel.tsx

@@ -26,7 +26,7 @@ import {
   panelContainerStyle,
   panelWarningStyle,
   findRepoButtonStyle
-} from '../componentsStyle/GitPanelStyle';
+} from '../style/GitPanelStyle';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 
 /** Interface for GitPanel component state */

src/components/GitStage.tsx

@@ -12,7 +12,7 @@ import {
   caretrightImageStyle,
   changeStageButtonLeftStyle,
   discardFileButtonStyle
-} from '../componentsStyle/GitStageStyle';
+} from '../style/GitStageStyle';
 
 import { FileItem } from './FileItem';
 

src/components/GitWidget.tsx

@@ -14,7 +14,7 @@ import { ISignal, Signal } from '@phosphor/signaling';
 
 import { GitPanel } from './GitPanel';
 
-import { gitWidgetStyle } from '../componentsStyle/GitWidgetStyle';
+import { gitWidgetStyle } from '../style/GitWidgetStyle';
 
 import { IDiffCallback } from '../git';
 

src/components/HistorySideBar.tsx

@@ -1,6 +1,6 @@
 import { JupyterFrontEnd } from '@jupyterlab/application';
 import * as React from 'react';
-import { historySideBarStyle } from '../componentsStyle/HistorySideBarStyle';
+import { historySideBarStyle } from '../style/HistorySideBarStyle';
 import { IGitBranchResult, ISingleCommitInfo, IDiffCallback } from '../git';
 import { PastCommitNode } from './PastCommitNode';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';