diff --git a/RELEASE.md b/RELEASE.md index 7d582894..a00bd98d 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -109,4 +109,4 @@ Here is a summary of the steps to cut a new release: If the package is not on conda forge yet, check the documentation to learn how to add it: https://conda-forge.org/docs/maintainer/adding_pkgs.html -Otherwise a bot should pick up the new version publish to PyPI, and open a new PR on the feedstock repository automatically. \ No newline at end of file +Otherwise a bot should pick up the new version publish to PyPI, and open a new PR on the feedstock repository automatically. diff --git a/packages/nbdime/src/common/collapsible.css b/packages/nbdime/src/common/collapsible.css index 1e3501d9..032b13bd 100644 --- a/packages/nbdime/src/common/collapsible.css +++ b/packages/nbdime/src/common/collapsible.css @@ -50,10 +50,18 @@ button.jp-CollapsiblePanel-header-icon:active { height: 100%; /* only transition on transform properties which are hardware accelerated = way better performances */ - -webkit-transition: -webkit-transform 0.3s ease, height 0.3s; - -moz-transition: -moz-transform 0.3s ease, height 0.3s; - -ms-transition: -ms-transform 0.3s ease, height 0.3s; - transition: transform 0.3s ease, height 0.3s; + -webkit-transition: + -webkit-transform 0.3s ease, + height 0.3s; + -moz-transition: + -moz-transform 0.3s ease, + height 0.3s; + -ms-transition: + -ms-transform 0.3s ease, + height 0.3s; + transition: + transform 0.3s ease, + height 0.3s; } .jp-CollapsiblePanel-opened { diff --git a/packages/nbdime/src/common/dragpanel.css b/packages/nbdime/src/common/dragpanel.css index c180f2c5..556cb4c7 100644 --- a/packages/nbdime/src/common/dragpanel.css +++ b/packages/nbdime/src/common/dragpanel.css @@ -5,7 +5,8 @@ |----------------------------------------------------------------------------*/ .jp-DragPanel-dragHandle { - background: radial-gradient(rgba(255, 255, 255, 0.6) 30%, transparent 31%) 0 0, + background: + radial-gradient(rgba(255, 255, 255, 0.6) 30%, transparent 31%) 0 0, radial-gradient(transparent 19%, rgba(0, 0, 0, 0.4) 20%, transparent 50%) 0 1px; background-size: 6px 6px; @@ -19,4 +20,4 @@ .lm-mod-drag-image { left: 0px; top: 0px; -} \ No newline at end of file +} diff --git a/packages/nbdime/src/common/mergeview.ts b/packages/nbdime/src/common/mergeview.ts index 5a5c7d55..221d78a2 100644 --- a/packages/nbdime/src/common/mergeview.ts +++ b/packages/nbdime/src/common/mergeview.ts @@ -143,7 +143,7 @@ const baseTheme = EditorView.baseTheme({ border: 'var(--jp-border-width) solid var(--jp-border-color1)', fontSize: '90%', padding: '0 3px', - borderRadius: '4px' + borderRadius: '4px', }, }); diff --git a/packages/nbdime/src/styles/merge.css b/packages/nbdime/src/styles/merge.css index 906e4066..566d78ce 100644 --- a/packages/nbdime/src/styles/merge.css +++ b/packages/nbdime/src/styles/merge.css @@ -227,12 +227,14 @@ } .jp-Notebook-merge .cm-merge-m-chunk-start-either::before, -.jp-Notebook-merge .cm-merge-m-chunk-start-mixed:not(.cm-merge-m-chunk-custom)::before { +.jp-Notebook-merge + .cm-merge-m-chunk-start-mixed:not(.cm-merge-m-chunk-custom)::before { border-top: 1px solid var(--jp-merge-either-color1); } .jp-Notebook-merge .cm-merge-m-chunk-end-either::after, -.jp-Notebook-merge .cm-merge-m-chunk-end-mixed:not(.cm-merge-m-chunk-custom)::after { +.jp-Notebook-merge + .cm-merge-m-chunk-end-mixed:not(.cm-merge-m-chunk-custom)::after { border-bottom: 1px solid var(--jp-merge-either-color1); } diff --git a/ui-tests/tests/nbdime-merge-test1.spec.ts b/ui-tests/tests/nbdime-merge-test1.spec.ts index f2e78392..0935cd33 100644 --- a/ui-tests/tests/nbdime-merge-test1.spec.ts +++ b/ui-tests/tests/nbdime-merge-test1.spec.ts @@ -27,7 +27,7 @@ test.describe('merge test1', () => { test('choose left version for conflict', async ({ page }) => { await page .locator('.cm-merge-left-editor') - .nth(1) // This select the cell; 0 being the notebook metadata + .nth(1) // This select the cell; 0 being the notebook metadata .locator('.jp-Merge-gutter-picker') .last() .click(); @@ -38,7 +38,7 @@ test.describe('merge test1', () => { test('choose central version for conflict', async ({ page }) => { await page .locator('.cm-central-editor') - .nth(1) // This select the cell; 0 being the notebook metadata + .nth(1) // This select the cell; 0 being the notebook metadata .locator('.jp-Merge-gutter-picker') .nth(2) .click(); @@ -49,7 +49,7 @@ test.describe('merge test1', () => { test('choose right version for conflict', async ({ page }) => { await page .locator('.cm-merge-right-editor') - .nth(1) // This select the cell; 0 being the notebook metadata + .nth(1) // This select the cell; 0 being the notebook metadata .locator('.jp-Merge-gutter-picker') .last() .click(); diff --git a/ui-tests/tests/nbdime-merge-test2.spec.ts b/ui-tests/tests/nbdime-merge-test2.spec.ts index cf3d3704..b8b77976 100644 --- a/ui-tests/tests/nbdime-merge-test2.spec.ts +++ b/ui-tests/tests/nbdime-merge-test2.spec.ts @@ -18,7 +18,7 @@ test.describe('merge test2 ', () => { test('choose left version', async ({ page }) => { await page .locator('.cm-merge-left-editor') - .nth(1) // This select the cell; 0 being the notebook metadata + .nth(1) // This select the cell; 0 being the notebook metadata .locator('.jp-Merge-gutter-picker') .last() .click(); @@ -28,7 +28,7 @@ test.describe('merge test2 ', () => { test('choose central version', async ({ page }) => { await page .locator('.cm-central-editor') - .nth(1) // This select the cell; 0 being the notebook metadata + .nth(1) // This select the cell; 0 being the notebook metadata .locator('.jp-Merge-gutter-picker') .nth(2) .click(); @@ -38,7 +38,7 @@ test.describe('merge test2 ', () => { test('choose right version', async ({ page }) => { await page .locator('.cm-merge-right-editor') - .nth(1) // This select the cell; 0 being the notebook metadata + .nth(1) // This select the cell; 0 being the notebook metadata .locator('.jp-Merge-gutter-picker') .last() .click(); diff --git a/ui-tests/tests/nbdime-merge-test6.spec.ts b/ui-tests/tests/nbdime-merge-test6.spec.ts index 28a41bfe..7fd2841c 100644 --- a/ui-tests/tests/nbdime-merge-test6.spec.ts +++ b/ui-tests/tests/nbdime-merge-test6.spec.ts @@ -10,7 +10,7 @@ test.describe('merge test6', () => { }); test('take a snapshot at opening', async ({ page }) => { - await page.getByText('Hide unchanged cells').click() + await page.getByText('Hide unchanged cells').click(); await page.getByText('a = "hello the world"').waitFor(); // Check that single editor are not collapsed; added cell and unchanged cell expect.soft(await page.locator('#main').screenshot()).toMatchSnapshot();