From 073dbacf03b6b1de06e514dc1942ad620f4d8169 Mon Sep 17 00:00:00 2001
From: Frederic COLLONVAL <fcollonval@gmail.com>
Date: Sat, 13 Mar 2021 12:18:13 +0100
Subject: [PATCH] Load styles from nbdime

---
 package.json   |  3 ++-
 style/base.css |  4 ++++
 yarn.lock      | 26 ++++++++++++++++++++++----
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 43a8eb0..0c8db57 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "json-source-map": "^0.6.1",
     "moment": "^2.24.0",
     "nbdime": "^6.1.0-beta.1",
+    "nbdime-jupyterlab": "2.1.0-beta.1",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-spinners": "^0.5.12"
@@ -148,4 +149,4 @@
   "resolutions": {
     "@types/react": "^17.0.0"
   }
-}
\ No newline at end of file
+}
diff --git a/style/base.css b/style/base.css
index 1876b5d..3fbdc8e 100644
--- a/style/base.css
+++ b/style/base.css
@@ -2,6 +2,10 @@
 | JupyterLab Pull Requests Style
 |----------------------------------------------------------------------------*/
 @import url('~@jupyterlab/git/style/index.css');
+@import url('~nbdime/lib/styles/common.css');
+@import url('~nbdime/lib/styles/diff.css');
+@import url('~nbdime/lib/styles/variables.css');
+@import url('~nbdime-jupyterlab/style/index.css');
 
 .jp-PullRequestPanel {
   height: 100%;
diff --git a/yarn.lock b/yarn.lock
index 0346d90..3ecfcf2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1215,7 +1215,7 @@
     "@lumino/signaling" "^1.4.3"
     "@lumino/widgets" "^1.16.1"
 
-"@jupyterlab/apputils@^3.0.0", "@jupyterlab/apputils@^3.0.5":
+"@jupyterlab/apputils@^2 || ^3", "@jupyterlab/apputils@^3.0.0", "@jupyterlab/apputils@^3.0.5":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@jupyterlab/apputils/-/apputils-3.0.5.tgz#1eb682e20f5da98ea7c1d2b3909ea8c17565f607"
   integrity sha512-m09ClizpX/rysqFvlVRVe683xmbG/Lk8d4TDXZDVmApNyWOLhsBHqfk+Im5WSQt2Oe2DiolwiiJXgZdWN57vag==
@@ -1541,7 +1541,7 @@
   dependencies:
     "@lumino/coreutils" "^1.5.3"
 
-"@jupyterlab/notebook@^3.0.6":
+"@jupyterlab/notebook@^2 || ^3", "@jupyterlab/notebook@^3.0.6":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/@jupyterlab/notebook/-/notebook-3.0.6.tgz#fe49d4b09b66237df4045d2ea0adc90a8708a142"
   integrity sha512-kO9oOFp+VZEnWvGYnmRATXMNmABh3dGdSrCdAOOU7OP09NU6W4VVIjFHYajm++iLTwB1Mejabm8p3ykmA4jyMA==
@@ -1648,7 +1648,7 @@
     node-fetch "^2.6.0"
     ws "^7.2.0"
 
-"@jupyterlab/settingregistry@^3.0.0", "@jupyterlab/settingregistry@^3.0.3":
+"@jupyterlab/settingregistry@^2 || ^3", "@jupyterlab/settingregistry@^3.0.0", "@jupyterlab/settingregistry@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@jupyterlab/settingregistry/-/settingregistry-3.0.3.tgz#ec7943013c1f433ead920c7d9e67aed713461ef0"
   integrity sha512-mxvP4AMi62u6ekarhgCefJeyTV6Z8fnnKb0psvvnWikdSgQT6x7OngV5emuo2N02IXkUqXxM1aHRwYQsLUAbOQ==
@@ -1805,7 +1805,7 @@
   resolved "https://registry.yarnpkg.com/@lumino/coreutils/-/coreutils-1.5.3.tgz#89dd7b7f381642a1bf568910c5b62c7bde705d71"
   integrity sha512-G72jJ6sgOwAUuilz+cri7LpHIJxllK+qz+YZUC3fyyWHK7oRlZemcc43jZAVE+tagTdMxKYSQWNIVzM5lI8sWw==
 
-"@lumino/disposable@^1.4.3":
+"@lumino/disposable@^1.1.2", "@lumino/disposable@^1.4.3":
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/@lumino/disposable/-/disposable-1.4.3.tgz#0a69b15cc5a1e506f93bb390ac44aae338da3c36"
   integrity sha512-zKQ9N2AEGcYpG6PJkeMWQXvoXU9w1ocji78z+fboM/SmSgtOIVGeQt3fZeldymf0XrlOPpNXs1ZFg54yWUMnXA==
@@ -6339,6 +6339,24 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
+nbdime-jupyterlab@2.1.0-beta.1:
+  version "2.1.0-beta.1"
+  resolved "https://registry.yarnpkg.com/nbdime-jupyterlab/-/nbdime-jupyterlab-2.1.0-beta.1.tgz#9b650bd044e94bec24e8ac80b1f25616fd669851"
+  integrity sha512-4QTXnQbSJMbFVnNM35lcrDFLmYF8UCVLa2kUFcEKzsp5gHgQ+zRtxOq0aS4hLI26p394wzAuME24k8bnk2PvaA==
+  dependencies:
+    "@jupyterlab/apputils" "^2 || ^3"
+    "@jupyterlab/coreutils" "^4 || ^5"
+    "@jupyterlab/nbformat" "^2 || ^3"
+    "@jupyterlab/notebook" "^2 || ^3"
+    "@jupyterlab/rendermime" "^2 || ^3"
+    "@jupyterlab/services" "^5 || ^6"
+    "@jupyterlab/settingregistry" "^2 || ^3"
+    "@lumino/algorithm" "^1.1.2"
+    "@lumino/coreutils" "^1.3.0"
+    "@lumino/disposable" "^1.1.2"
+    "@lumino/widgets" "^1.6.0"
+    nbdime "^6.1.0-beta.1"
+
 nbdime@^6.1.0-beta.1:
   version "6.1.0-beta.1"
   resolved "https://registry.yarnpkg.com/nbdime/-/nbdime-6.1.0-beta.1.tgz#3b925f1ef3f028a25ae851e5cd5e7f3c50fc2304"