From 8e872f41d4ba7807e58938bbf861ca6a22d534aa Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 19 Aug 2020 19:23:02 -0700 Subject: [PATCH] Move execution order label Fix #104680 --- .../notebook/browser/media/notebook.css | 21 +++++++++---------- .../browser/view/renderers/cellRenderer.ts | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/vs/workbench/contrib/notebook/browser/media/notebook.css b/src/vs/workbench/contrib/notebook/browser/media/notebook.css index c4bf75602a0..b8d061f818b 100644 --- a/src/vs/workbench/contrib/notebook/browser/media/notebook.css +++ b/src/vs/workbench/contrib/notebook/browser/media/notebook.css @@ -61,6 +61,10 @@ z-index: 1000; } +.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row.cell-drag-image .execution-count-label { + display: none; +} + .monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row.cell-drag-image .cell-editor-container > div { padding: 12px 16px; } @@ -401,24 +405,19 @@ visibility: visible; } -.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .cell .run-button-container .execution-count-label { +.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .cell .execution-count-label { position: absolute; - top: -2px; font-size: 10px; font-family: var(--monaco-monospace-font); - visibility: visible; white-space: pre; - width: 100%; - text-align: center; - padding-right: 8px; box-sizing: border-box; opacity: .6; -} -.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row:hover .cell .run-button-container .execution-count-label, -.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row.cell-output-hover .cell .run-button-container .execution-count-label, -.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row.focused .cell .run-button-container .execution-count-label { - visibility: hidden; + /* Sizing hacks */ + left: 26px; + width: 35px; + bottom: 0px; + text-align: center; } .monaco-workbench .notebookOverlay .cell .cell-editor-part { diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts index 76a93795aa8..f2195abb858 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts @@ -661,7 +661,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende const runButtonContainer = DOM.append(cellContainer, $('.run-button-container')); const runToolbar = disposables.add(this.createToolbar(runButtonContainer)); - const executionOrderLabel = DOM.append(runButtonContainer, $('div.execution-count-label')); + const executionOrderLabel = DOM.append(cellContainer, $('div.execution-count-label')); // create a special context key service that set the inCompositeEditor-contextkey const editorContextKeyService = disposables.add(this.contextKeyServiceProvider(container));