From 6d99d34574c7ea25c129058e834e04c489da2976 Mon Sep 17 00:00:00 2001 From: Gerry Manoim Date: Tue, 24 Sep 2019 20:36:44 -0400 Subject: [PATCH 1/2] Bump dependencies, bump version, update css for lab --- js/package.json | 4 ++-- js/src/qgrid.css | 4 ++++ qgrid/_version.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/package.json b/js/package.json index 17ef05d3..49cb1cea 100644 --- a/js/package.json +++ b/js/package.json @@ -25,8 +25,8 @@ "webpack": "^3.5.5" }, "dependencies": { - "@jupyter-widgets/base": "^1.0.0", - "@jupyter-widgets/controls": "^1.0.0", + "@jupyter-widgets/base": "^1.1 || ^2", + "@jupyter-widgets/controls": "^1.0.0 || ^1.5.1", "css-loader": "^0.28.7", "expose-loader": "^0.7.3", "file-loader": "^0.11.2", diff --git a/js/src/qgrid.css b/js/src/qgrid.css index a0553074..0d4f4e06 100644 --- a/js/src/qgrid.css +++ b/js/src/qgrid.css @@ -737,3 +737,7 @@ input.bool-filter-radio { .q-grid .slick-sort-indicator-asc { background-image: none; } + +.jupyter-widgets { + overflow: auto !important; +} \ No newline at end of file diff --git a/qgrid/_version.py b/qgrid/_version.py index 54554498..5ed46518 100644 --- a/qgrid/_version.py +++ b/qgrid/_version.py @@ -1,4 +1,4 @@ -version_info = (1, 1, 1, 'final') +version_info = (1, 2, 0, 'final') _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''} From bd691dd37819dcaaf37cf69ab7bc1828b915a20e Mon Sep 17 00:00:00 2001 From: gerrymanoim Date: Tue, 31 Dec 2019 12:15:53 -0500 Subject: [PATCH 2/2] Update js/src/qgrid.css New lines are good Co-Authored-By: Scott Sanderson --- js/src/qgrid.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/qgrid.css b/js/src/qgrid.css index 0d4f4e06..7875a231 100644 --- a/js/src/qgrid.css +++ b/js/src/qgrid.css @@ -740,4 +740,4 @@ input.bool-filter-radio { .jupyter-widgets { overflow: auto !important; -} \ No newline at end of file +}