Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve diff view #696

Merged
merged 6 commits into from
Oct 3, 2023
Merged

Improve diff view #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d175cf
Restore gap element in diff view
fcollonval Sep 26, 2023
5095bfa
Lint the code
fcollonval Sep 26, 2023
ca01a92
Fix styling of input prompt for added/removed cells
fcollonval Sep 27, 2023
253d467
Update Playwright Snapshots
github-actions[bot] Sep 29, 2023
15342cb
Update Playwright Snapshots
github-actions[bot] Sep 29, 2023
2f0f19d
Add quotes to ids
fcollonval Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nbdime/webapp/templates/diff.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h3>Notebook Diff</h3>
<button id="nbdime-close" type="checkbox" style="display: none">Close tool</button>
<button id="nbdime-export" type="checkbox" style="display: none">Export diff</button>
</div>
<div id=nbdime-header-banner>
<div id="nbdime-header-banner" class="cm-merge-2pane">
<span id="nbdime-header-base">Base</span>
<span id="nbdime-header-remote">Remote</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion nbdime/webapp/templates/difftool.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h3>Notebook Diff</h3>
<button id="nbdime-close" style="display: none">Close tool</button>
<button id="nbdime-export" style="display: none">Export diff</button>
</div>
<div id=nbdime-header-banner>
<div id="nbdime-header-banner" class="cm-merge-2pane">
<span id="nbdime-header-base">Base</span>
<span id="nbdime-header-remote">Remote</span>
</div>
Expand Down
1 change: 0 additions & 1 deletion packages/labextension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"watch": "tsc --build --watch"
},
"dependencies": {

"@jupyterlab/apputils": "^4.0.0",
"@jupyterlab/coreutils": "^6.0.0",
"@jupyterlab/codeeditor": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/labextension/src/widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ namespace Private {
<label><input class="nbdime-hide-unchanged" type="checkbox">Hide unchanged cells</label>
<button class="nbdime-export" style="display: none">Export diff</button>
</div>
<div class=nbdime-header-banner>
<div class="nbdime-header-banner">
<span class="nbdime-header-base"></span>
<span class="nbdime-header-remote"></span>
</div>`;
Expand Down
147 changes: 75 additions & 72 deletions packages/labextension/style/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,135 +11,138 @@
@import url('nbdime/lib/styles/merge.css');

.nbdime-Widget {
display: flex;
flex-direction: column;
display: flex;
flex-direction: column;
}

.nbdime-root {
padding: var(--jp-notebook-padding);
min-width: 50px;
min-height: 50px;
outline: none;
overflow: auto;
background: var(--jp-layout-color0);
color: var(--jp-ui-font-color0);
flex: 1 1 auto;
padding: var(--jp-notebook-padding);
min-width: 50px;
min-height: 50px;
outline: none;
overflow: auto;
background: var(--jp-layout-color0);
color: var(--jp-ui-font-color0);
flex: 1 1 auto;
}

.jp-ToolbarButtonComponent-icon.action-notebook-diff {
color: var(--jp-ui-font-color0);
color: var(--jp-ui-font-color0);
}

.nbdime-toolbarButton .jp-ToolbarButtonComponent-label {
display: none;
display: none;
}

.jp-PluginList-icon.nbdime-icon {
font-size: 16px;
vertical-align: text-bottom;
font-size: 16px;
vertical-align: text-bottom;
}

/* Header syling */

.jp-fa-tabIcon {
padding-top: 6px;
padding-top: 6px;
}

.nbdime-Diff {
border-bottom: var(--jp-border-width) solid var(--jp-toolbar-border-color);
box-shadow: var(--jp-toolbar-box-shadow);
background: var(--jp-toolbar-background);
color: var(--jp-ui-font-color1);
flex: 0 0 auto;
padding: 2px;
z-index: 1;
border-bottom: var(--jp-border-width) solid var(--jp-toolbar-border-color);
box-shadow: var(--jp-toolbar-box-shadow);
background: var(--jp-toolbar-background);
color: var(--jp-ui-font-color1);
flex: 0 0 auto;
padding: 2px;
z-index: 1;
}

.nbdime-header-buttonrow > * {
padding-left: 8px;
padding-right: 8px;
padding-left: 8px;
padding-right: 8px;
}

.nbdime-Diff .nbdime-header-banner {
display: grid;
/* editor | gap | editor */
grid-template-columns: 47% 6% 47%;
}

.nbdime-Diff .nbdime-header-base {
display: inline-block;
width: calc(50% - 8px);
background-color: var(--jp-diff-deleted-color0);
padding: 0px 4px;
vertical-align: top;
grid-column: 1;
display: inline-block;
background-color: var(--jp-diff-deleted-color0);
padding: 0px 4px;
}

.nbdime-Diff .nbdime-header-remote {
display: inline-block;
width: calc(49% - 8px);
background-color: var(--jp-diff-added-color0);
padding: 0px 4px;
vertical-align: top;
grid-column: 3;
display: inline-block;
background-color: var(--jp-diff-added-color0);
padding: 0px 4px;
}

.nbdime-Diff .nbdime-header-local {
display: none;
width: calc(49% - 8px);
padding: 0px 4px;
vertical-align: top;
display: none;
width: calc(49% - 8px);
padding: 0px 4px;
vertical-align: top;
}

/* Hiding unchanged cells if told to */
.nbdime-root.jp-mod-hideUnchanged .jp-Cell-diff.jp-Diff-unchanged {
display: none;
display: none;
}

/* Show a marker with the number of cells hidden before */
.nbdime-root.jp-mod-hideUnchanged
.jp-Cell-diff[data-nbdime-NCellsHiddenBefore]::before,
.jp-Cell-diff[data-nbdime-NCellsHiddenBefore]::before,
.nbdime-root.jp-mod-hideUnchanged
.jp-Diff-addremchunk[data-nbdime-NCellsHiddenBefore]::before {
content: attr(data-nbdime-NCellsHiddenBefore) ' unchanged cell(s) hidden';
position: absolute;
width: 100%;
top: 0;
background-color: var(--jp-layout-color2);
border-top: solid var(--jp-layout-color3) 1px;
border-bottom: solid var(--jp-layout-color3) 1px;
text-align: center;
.jp-Diff-addremchunk[data-nbdime-NCellsHiddenBefore]::before {
content: attr(data-nbdime-NCellsHiddenBefore) ' unchanged cell(s) hidden';
position: absolute;
width: 100%;
top: 0;
background-color: var(--jp-layout-color2);
border-top: solid var(--jp-layout-color3) 1px;
border-bottom: solid var(--jp-layout-color3) 1px;
text-align: center;
}

/* Show a marker with the number of cells hidden after (for hidden cells at end) */
.nbdime-root.jp-mod-hideUnchanged
.jp-Cell-diff[data-nbdime-NCellsHiddenAfter]::after,
.jp-Cell-diff[data-nbdime-NCellsHiddenAfter]::after,
.nbdime-root.jp-mod-hideUnchanged
.jp-Diff-addremchunk[data-nbdime-NCellsHiddenAfter]::after {
content: attr(data-nbdime-NCellsHiddenAfter) ' unchanged cell(s) hidden';
position: absolute;
width: 100%;
bottom: 0;
background-color: var(--jp-layout-color2);
border-top: solid var(--jp-layout-color3) 1px;
border-bottom: solid var(--jp-layout-color3) 1px;
text-align: center;
.jp-Diff-addremchunk[data-nbdime-NCellsHiddenAfter]::after {
content: attr(data-nbdime-NCellsHiddenAfter) ' unchanged cell(s) hidden';
position: absolute;
width: 100%;
bottom: 0;
background-color: var(--jp-layout-color2);
border-top: solid var(--jp-layout-color3) 1px;
border-bottom: solid var(--jp-layout-color3) 1px;
text-align: center;
}

.nbdime-root.jp-mod-hideUnchanged .jp-Cell-diff[data-nbdime-NCellsHiddenBefore],
.nbdime-root.jp-mod-hideUnchanged
.jp-Diff-addremchunk[data-nbdime-NCellsHiddenBefore] {
padding-top: 40px;
.jp-Diff-addremchunk[data-nbdime-NCellsHiddenBefore] {
padding-top: 40px;
}

.nbdime-root.jp-mod-hideUnchanged .jp-Cell-diff[data-nbdime-NCellsHiddenAfter],
.nbdime-root.jp-mod-hideUnchanged
.jp-Diff-addremchunk[data-nbdime-NCellsHiddenAfter] {
padding-bottom: 40px;
.jp-Diff-addremchunk[data-nbdime-NCellsHiddenAfter] {
padding-bottom: 40px;
}

/* Marker for when all cells are unchanged and hidden */
.nbdime-root.jp-mod-hideUnchanged
.jp-Notebook-diff[data-nbdime-AllCellsHidden]::after {
content: 'No changes, ' attr(data-nbdime-AllCellsHidden)
.jp-Notebook-diff[data-nbdime-AllCellsHidden]::after {
content: 'No changes, ' attr(data-nbdime-AllCellsHidden)
' unchanged cell(s) hidden';
display: block;
width: 100%;
background-color: var(--jp-layout-color2);
border-top: solid var(--jp-layout-color3) 1px;
border-bottom: solid var(--jp-layout-color3) 1px;
text-align: center;
display: block;
width: 100%;
background-color: var(--jp-layout-color2);
border-top: solid var(--jp-layout-color3) 1px;
border-bottom: solid var(--jp-layout-color3) 1px;
text-align: center;
}

Loading