Skip to content

Commit

Permalink
Fix linting issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
HaudinFlorence committed Nov 1, 2023
1 parent f59f43c commit 97aedce
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 17 deletions.
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Otherwise a bot should pick up the new version publish to PyPI, and open a new PR on the feedstock repository automatically.
16 changes: 12 additions & 4 deletions packages/nbdime/src/common/collapsible.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 3 additions & 2 deletions packages/nbdime/src/common/dragpanel.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -19,4 +20,4 @@
.lm-mod-drag-image {
left: 0px;
top: 0px;
}
}
2 changes: 1 addition & 1 deletion packages/nbdime/src/common/mergeview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
});

Expand Down
6 changes: 4 additions & 2 deletions packages/nbdime/src/styles/merge.css
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
6 changes: 3 additions & 3 deletions ui-tests/tests/nbdime-merge-test1.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions ui-tests/tests/nbdime-merge-test2.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion ui-tests/tests/nbdime-merge-test6.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 97aedce

Please sign in to comment.