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

Jump to bottom

Move notebook editor widget theme to css variables #165300

Merged
merged 1 commit into from Nov 3, 2022
Merged

Move notebook editor widget theme to css variables #165300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
View file
Open in desktop
Expand Up @@ -222,24 +222,24 @@ export class InteractiveEditor extends EditorPane {
if (focusIndicator === 'gutter') {
styleSheets.push(`
.interactive-editor .input-cell-container:focus-within .input-focus-indicator::before {
border-color: var(--notebook-focused-cell-border-color) !important;
border-color: var(--vscode-notebook-focusedCellBorder) !important;
}
.interactive-editor .input-focus-indicator::before {
border-color: var(--notebook-inactive-focused-cell-border-color) !important;
border-color: var(--vscode-notebook-inactiveFocusedCellBorder) !important;
}
.interactive-editor .input-cell-container .input-focus-indicator {
display: block;
top: ${INPUT_CELL_VERTICAL_PADDING}px;
}
.interactive-editor .input-cell-container {
border-top: 1px solid var(--notebook-inactive-focused-cell-border-color);
border-top: 1px solid var(--vscode-notebook-inactiveFocusedCellBorder);
}
`);
} else {
// border
styleSheets.push(`
.interactive-editor .input-cell-container {
border-top: 1px solid var(--notebook-inactive-focused-cell-border-color);
border-top: 1px solid var(--vscode-notebook-inactiveFocusedCellBorder);
}
.interactive-editor .input-cell-container .input-focus-indicator {
display: none;
Expand Down Expand Up @@ -687,10 +687,10 @@ export class InteractiveEditor extends EditorPane {
registerThemingParticipant((theme, collector) => {
collector.addRule(`
.interactive-editor .input-cell-container:focus-within .input-editor-container .monaco-editor {
outline: solid 1px var(--notebook-focused-cell-border-color);
outline: solid 1px var(--vscode-notebook-focusedCellBorder);
}
.interactive-editor .input-cell-container .input-editor-container .monaco-editor {
outline: solid 1px var(--notebook-inactive-focused-cell-border-color);
outline: solid 1px var(--vscode-notebook-inactiveFocusedCellBorder);
}
.interactive-editor .input-cell-container .input-focus-indicator {
top: ${INPUT_CELL_VERTICAL_PADDING}px;
Expand Down
170 changes: 168 additions & 2 deletions src/vs/workbench/contrib/notebook/browser/media/notebook.css
View file
Open in desktop
Expand Up @@ -252,11 +252,11 @@
}

.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .input-collapse-container .collapsed-execution-icon .codicon-notebook-state-success {
color: var(--notebook-cell-status-icon-success);
color: var(--vscode-notebookStatusSuccessIcon-foreground);
}

.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .input-collapse-container .collapsed-execution-icon .codicon-notebook-state-error {
color: var(--notebook-cell-status-icon-error);
color: var(--vscode-notebookStatusErrorIcon-foreground);
}

.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .input-collapse-container .cell-collapse-preview {
Expand Down Expand Up @@ -569,3 +569,169 @@
.cell-comment-container.review-widget {
background-color: var(--vscode-peekViewResult-background);
}

/** Cell output show more*/
.notebookOverlay .output-show-more-container a,
.notebookOverlay div.output-show-more a {
color: var(--vscode-textLink-foreground);
}

.notebookOverlay .output-show-more-container a:active,
.notebookOverlay .output-show-more a:active {
color: var(--vscode-textLink-activeForeground);
}

/** Notebook cell output background */
.notebookOverlay .output,
.notebookOverlay .output-element,
.notebookOverlay .output-show-more-container {
background-color: var(--vscode-notebook-outputContainerBackgroundColor);
}

.notebookOverlay .output-element {
border-top: none !important; border: 1px solid transparent; border-color: var(--vscode-notebook-outputContainerBorderColor) !important;
}

/** Notebook editor background */
.notebookOverlay .cell-drag-image .cell-editor-container > div {
background: var(--vscode-editor-background) !important;
}
.notebookOverlay .monaco-list-row .cell-title-toolbar,
.notebookOverlay .monaco-list-row.cell-drag-image,
.notebookOverlay .cell-bottom-toolbar-container .action-item,
.notebookOverlay .cell-list-top-cell-toolbar-container .action-item {
background-color: var(--vscode-editor-background);
}

.monaco-workbench .notebookOverlay.notebook-editor {
background-color: var(--vscode-notebook-editorBackground);
}

.notebookOverlay .cell .monaco-editor-background,
.notebookOverlay .cell .margin-view-overlays,
.notebookOverlay .cell .cell-statusbar-container {
background: var(--vscode-notebook-cellEditorBackground, var(--vscode-editor-background));
}

/** Cell toolbar separator */

.notebookOverlay .monaco-list-row .cell-title-toolbar,
.notebookOverlay .cell-bottom-toolbar-container .action-item,
.notebookOverlay .cell-list-top-cell-toolbar-container .action-item {
border: solid 1px var(--vscode-notebook-cellToolbarSeparator);
}
.notebookOverlay .monaco-action-bar .action-item.verticalSeparator {
background-color: var(--vscode-notebook-cellToolbarSeparator);
}
.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .input-collapse-container {
border-bottom: solid 1px var(--vscode-notebook-cellToolbarSeparator);
}

/** Focused cell background */

.notebookOverlay .code-cell-row.focused .cell-focus-indicator,
.notebookOverlay .markdown-cell-row.focused,
.notebookOverlay .code-cell-row.focused .input-collapse-container {
background-color: var(--vscode-notebook-focusedCellBackground) !important;
}

/** Selected cell background */
.notebookOverlay .monaco-list.selection-multiple .markdown-cell-row.selected,
.notebookOverlay .monaco-list.selection-multiple .code-cell-row.selected .cell-focus-indicator-top,
.notebookOverlay .monaco-list.selection-multiple .code-cell-row.selected .cell-focus-indicator-left,
.notebookOverlay .monaco-list.selection-multiple .code-cell-row.selected .cell-focus-indicator-right,
.notebookOverlay .monaco-list.selection-multiple .code-cell-row.selected .cell-focus-indicator-bottom {
background-color: var(--vscode-notebook-selectedCellBackground, inherit) !important;
}

.notebookOverlay .monaco-list.selection-multiple:focus-within .monaco-list-row.selected .cell-focus-indicator-top:before,
.notebookOverlay .monaco-list.selection-multiple:focus-within .monaco-list-row.selected .cell-focus-indicator-bottom:before,
.notebookOverlay .monaco-list.selection-multiple:focus-within .monaco-list-row.selected .cell-inner-container:not(.cell-editor-focus) .cell-focus-indicator-left:before,
.notebookOverlay .monaco-list.selection-multiple:focus-within .monaco-list-row.selected .cell-inner-container:not(.cell-editor-focus) .cell-focus-indicator-right:before {
border-color: var(--vscode-notebook-inactiveSelectedCellBorder, transparent) !important;
}

/** Cell hover background */
.notebookOverlay .code-cell-row:not(.focused):hover .cell-focus-indicator,
.notebookOverlay .code-cell-row:not(.focused).cell-output-hover .cell-focus-indicator,
.notebookOverlay .markdown-cell-row:not(.focused):hover {
background-color: var(--vscode-notebook-cellHoverBackground) !important;
}

.notebookOverlay .code-cell-row:not(.focused):hover .input-collapse-container,
.notebookOverlay .code-cell-row:not(.focused).cell-output-hover .input-collapse-container {
background-color: var(--vscode-notebook-cellHoverBackground);
}

/** Cell symbol higlight */
.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.nb-symbolHighlight .cell-focus-indicator,
.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.markdown-cell-row.nb-symbolHighlight {
background-color: var(--vscode-notebook-symbolHighlightBackground) !important;
}

/** Cell focused editor border */
.notebookOverlay .monaco-list:focus-within .monaco-list-row.focused .cell-editor-focus .cell-editor-part:before {
outline: solid 1px var(--vscode-notebook-focusedEditorBorder);
}

/** Cell border color */
.notebookOverlay .cell.markdown h1 { border-color: var(--vscode-notebook-cellBorderColor); }
.notebookOverlay .monaco-list-row .cell-editor-part:before { outline: solid 1px var(--vscode-notebook-cellBorderColor); }

/** Cell status bar */
.monaco-workbench .notebookOverlay .cell-statusbar-container .cell-language-picker:hover,
.monaco-workbench .notebookOverlay .cell-statusbar-container .cell-status-item.cell-status-item-has-command:hover {
background-color: var(--vscode-notebook-cellStatusBarItemHoverBackground);
}

/** Insert toolbar */
.notebookOverlay > .cell-list-container > .cell-list-insertion-indicator {
background-color: var(--vscode-notebook-cellInsertionIndicator);
}

/** Scrollbar */
.notebookOverlay .cell-list-container > .monaco-list > .monaco-scrollable-element > .scrollbar > .slider {
background: var(--vscode-notebookScrollbarSlider-background);
}

.notebookOverlay .cell-list-container > .monaco-list > .monaco-scrollable-element > .scrollbar > .slider:hover {
background: var(--vscode-notebookScrollbarSlider-hoverBackground);
}

.notebookOverlay .cell-list-container > .monaco-list > .monaco-scrollable-element > .scrollbar > .slider.active {
background: var(--vscode-notebookScrollbarSlider-activeBackground);
}

/** Cell expand */
.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .expandInputIcon:hover,
.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .expandOutputIcon:hover,
.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .cell-expand-part-button:hover {
background-color: var(--vscode-toolbar-hoverBackground);
}

/** Cell insertion/deletion */
.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.nb-cell-modified .cell-focus-indicator {
background-color: var(--vscode-editorGutter-modifiedBackground) !important;
}

.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.markdown-cell-row.nb-cell-modified {
background-color: var(--vscode-editorGutter-modifiedBackground) !important;
}

.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.nb-cell-added .cell-focus-indicator {
background-color: var(--vscode-diffEditor-insertedTextBackground) !important;
}

.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.markdown-cell-row.nb-cell-added {
background-color: var(--vscode-diffEditor-insertedTextBackground) !important;
}

.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.nb-cell-deleted .cell-focus-indicator {
background-color: var(--vscode-diffEditor-removedTextBackground) !important;
}

.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.markdown-cell-row.nb-cell-deleted {
background-color: var(--vscode-diffEditor-removedTextBackground) !important;
}

.monaco-workbench .notebookOverlay .codicon-debug-continue { color: var(--vscode-icon-foreground) !important; }
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/notebook/browser/media/notebookFocusIndicator.css
View file
Open in desktop
Expand Up @@ -54,19 +54,19 @@
.monaco-workbench .notebookOverlay .monaco-list:focus-within .monaco-list-row.focused .cell-editor-focus .cell-focus-indicator-top:before,
.monaco-workbench .notebookOverlay .monaco-list:focus-within .monaco-list-row.focused .cell-editor-focus .cell-focus-indicator-bottom:before,
.monaco-workbench .notebookOverlay .monaco-list:focus-within .monaco-list-row.focused .cell-inner-container.cell-editor-focus:before {
border-color: var(notebook-selected-cell-border-color) !important;
border-color: var(--vscode-notebook-selectedCellBorder) !important;
}

.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-top:before,
.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-bottom:before {
border-color: var(--notebook-inactive-focused-cell-border-color) !important;
border-color: var(--vscode-notebook-inactiveFocusedCellBorder) !important;
}

.monaco-workbench .notebookOverlay .monaco-list:focus-within .monaco-list-row.focused .cell-inner-container:not(.cell-editor-focus) .cell-focus-indicator-top:before,
.monaco-workbench .notebookOverlay .monaco-list:focus-within .monaco-list-row.focused .cell-inner-container:not(.cell-editor-focus) .cell-focus-indicator-bottom:before,
.monaco-workbench .notebookOverlay .monaco-list:focus-within .monaco-list-row.focused .cell-inner-container:not(.cell-editor-focus) .cell-focus-indicator-left:before,
.monaco-workbench .notebookOverlay .monaco-list:focus-within .monaco-list-row.focused .cell-inner-container:not(.cell-editor-focus) .cell-focus-indicator-right:before {
border-color: var(--notebook-focused-cell-border-color) !important;
border-color: var(--vscode-notebook-focusedCellBorder) !important;
}

.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row .cell-focus-indicator-left .codeOutput-focus-indicator-container {
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/notebook/browser/media/notebookToolbar.css
View file
Open in desktop
Expand Up @@ -82,5 +82,5 @@
}

.monaco-workbench .notebookOverlay .notebook-toolbar-container .monaco-action-bar .action-item .codicon-notebook-state-error {
color: var(--notebook-cell-status-icon-error);
color: var(--vscode-notebookStatusErrorIcon-foreground);
}