Merge pull request #390 from jupyterlab/rc08

Release 0.8

Author: jaipreet-s

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/git",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "A JupyterLab extension for version control using git",
   "main": "lib/index.js",
   "style": "style/index.css",

setup.py

@@ -8,14 +8,15 @@
 
 setuptools.setup(
     name='jupyterlab_git',
-    version='0.6.1',
+    version='0.8.0',
     author='Git Intern Team - Noah Stapp, Jenna Landy, Alena Mueller; AWS - Jaipreet Singh, Neelam Gehlot; Quansight - Saul Shanabrook',
     description="A server extension for JupyterLab's git extension",
     long_description=long_description,
     long_description_content_type="text/markdown",
     packages=setuptools.find_packages(),
     install_requires=[
-        'notebook'
+        'notebook',
+        'nbdime @ git+https://github.com/jupyter/nbdime.git@f96ac655cdb4fce33eb8a2de4ce06913b942a97b'
     ],
     package_data={'jupyterlab_git': ['*']},
-)
+)

style/diff.css

@@ -76,8 +76,8 @@
     background-size: 20px;
     background-position: center;
     background-repeat: no-repeat;
-    height: 10px;
-    width: 15px;
+    height: 2px;
+    width: 4px;
     font-size: var(--jp-ui-font-size1);
     line-height: var(--jp-private-toolbar-height);
     margin-top: .1em;
@@ -88,6 +88,7 @@
     transition: background-color 0.1s ease;
     margin-left: 5px;
     border: transparent;
+    float: none;
 }
 
 .jp-git-diff-Widget {