提交 11cb6746 编写于 作者: M Miguel Solorio

Update notebook color token names (fixes #98984)

上级 4c7d5640
...@@ -215,29 +215,42 @@ ...@@ -215,29 +215,42 @@
.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-top:before,
.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-bottom:before, .monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-bottom:before,
.monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused:before, .monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused:before,
.monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused:after{ .monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused:after {
content: ""; content: "";
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 1px; height: 1px;
background-color: rgba(255, 255, 255, 0.12);
} }
/* top border */
.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-top:before,
.monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused:before { .monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused:before {
top: 0; border-top: 1px solid transparent;
}
.monaco-workbench.hc-black .notebookOverlay .monaco-list .monaco-list-row.focused.cell-editor-focus .cell-focus-indicator-top:before,
.monaco-workbench.hc-black .notebookOverlay .monaco-list .markdown-cell-row.focused.cell-editor-focus:before {
border-top-style: dashed;
} }
/* bottom border */
.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-bottom:before, .monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-bottom:before,
.monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused:after { .monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused:after {
bottom: 0px; border-bottom: 1px solid transparent;
}
.monaco-workbench.hc-black .notebookOverlay .monaco-list .monaco-list-row.focused.cell-editor-focus .cell-focus-indicator-bottom:before,
.monaco-workbench.hc-black .notebookOverlay .monaco-list .markdown-cell-row.focused.cell-editor-focus:after {
border-bottom-style: dashed;
} }
/* border color on light theme */ .monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-top:before,
.monaco-workbench.vs .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-top:before, .monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused:before {
.monaco-workbench.vs .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-bottom:before, top: 0;
.monaco-workbench.vs .notebookOverlay .monaco-list .markdown-cell-row.focused:before, }
.monaco-workbench.vs .notebookOverlay .monaco-list .markdown-cell-row.focused:after { .monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-bottom:before,
background-color: rgba(0, 0, 0, 0.12); .monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused:after {
bottom: 0px;
} }
.monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .menu.mouseover, .monaco-workbench .notebookOverlay > .cell-list-container > .monaco-list > .monaco-scrollable-element > .monaco-list-rows > .monaco-list-row .menu.mouseover,
......
...@@ -1312,11 +1312,11 @@ export const notebookCellBorder = registerColor('notebook.cellBorderColor', { ...@@ -1312,11 +1312,11 @@ export const notebookCellBorder = registerColor('notebook.cellBorderColor', {
hc: PANEL_BORDER hc: PANEL_BORDER
}, nls.localize('notebook.cellBorderColor', "The border color for notebook cells.")); }, nls.localize('notebook.cellBorderColor', "The border color for notebook cells."));
export const focusedEditorIndicator = registerColor('notebook.focusedEditorIndicator', { export const focusedEditorBorderColor = registerColor('notebook.focusedEditorBorder', {
light: focusBorder, light: focusBorder,
dark: focusBorder, dark: focusBorder,
hc: focusBorder hc: focusBorder
}, nls.localize('notebook.focusedEditorIndicator', "The color of the notebook cell editor indicator.")); }, nls.localize('notebook.focusedEditorBorder', "The color of the notebook cell editor border."));
export const cellStatusIconSuccess = registerColor('notebookStatusSuccessIcon.foreground', { export const cellStatusIconSuccess = registerColor('notebookStatusSuccessIcon.foreground', {
light: debugIconStartForeground, light: debugIconStartForeground,
...@@ -1349,17 +1349,29 @@ export const CELL_TOOLBAR_SEPERATOR = registerColor('notebook.cellToolbarSeperat ...@@ -1349,17 +1349,29 @@ export const CELL_TOOLBAR_SEPERATOR = registerColor('notebook.cellToolbarSeperat
hc: contrastBorder hc: contrastBorder
}, nls.localize('cellToolbarSeperator', "The color of the seperator in the cell bottom toolbar")); }, nls.localize('cellToolbarSeperator', "The color of the seperator in the cell bottom toolbar"));
export const cellFocusBackground = registerColor('notebook.cellFocusBackground', { export const focusedCellBackground = registerColor('notebook.focusedCellBackground', {
dark: transparent(PANEL_BORDER, .4), dark: transparent(PANEL_BORDER, .4),
light: transparent(listFocusBackground, .4), light: transparent(listFocusBackground, .4),
hc: PANEL_BORDER hc: null
}, nls.localize('cellFocusBackground', "The background color of focused or hovered cells")); }, nls.localize('focusedCellBackground', "The background color of focused cells."));
export const cellHoverBackground = registerColor('notebook.cellHoverBackground', {
dark: transparent(focusedCellBackground, .5),
light: transparent(focusedCellBackground, .7),
hc: null
}, nls.localize('notebook.cellHoverBackground', "The background color of hovered cells."));
export const focusedCellBorder = registerColor('notebook.focusedCellBorder', {
dark: Color.white.transparent(0.12),
light: Color.black.transparent(0.12),
hc: focusBorder
}, nls.localize('notebook.focusedCellBorder', "The color of focused cells."));
export const focusedCellShadow = registerColor('notebook.focusedCellShadow', { export const focusedCellShadow = registerColor('notebook.focusedCellShadow', {
dark: transparent(widgetShadow, 0.6), dark: transparent(widgetShadow, 0.6),
light: transparent(widgetShadow, 0.4), light: transparent(widgetShadow, 0.4),
hc: Color.transparent hc: Color.transparent
}, nls.localize('cellShadow', "The color of the shadow on the focused or hovered cell")); }, nls.localize('notebook.focusedCellShadow', "The color of the shadow on the focused or hovered cell"));
export const cellStatusBarItemHover = registerColor('notebook.cellStatusBarItemHoverBackground', { export const cellStatusBarItemHover = registerColor('notebook.cellStatusBarItemHoverBackground', {
light: new Color(new RGBA(0, 0, 0, 0.08)), light: new Color(new RGBA(0, 0, 0, 0.08)),
...@@ -1456,18 +1468,30 @@ registerThemingParticipant((theme, collector) => { ...@@ -1456,18 +1468,30 @@ registerThemingParticipant((theme, collector) => {
collector.addRule(`.notebookOverlay .monaco-list-row > .monaco-toolbar { border: solid 1px ${cellToolbarSeperator}; }`); collector.addRule(`.notebookOverlay .monaco-list-row > .monaco-toolbar { border: solid 1px ${cellToolbarSeperator}; }`);
} }
const cellFocusBackgroundColor = theme.getColor(cellFocusBackground); const focusedCellBackgroundColor = theme.getColor(focusedCellBackground);
if (cellFocusBackgroundColor) { if (focusedCellBackgroundColor) {
collector.addRule(`.notebookOverlay .code-cell-row:hover .cell-focus-indicator, collector.addRule(`.notebookOverlay .code-cell-row.focused .cell-focus-indicator,
.notebookOverlay .code-cell-row.focused .cell-focus-indicator, .notebookOverlay .markdown-cell-row.focused { background-color: ${focusedCellBackgroundColor} !important; }`);
.notebookOverlay .code-cell-row.cell-output-hover .cell-focus-indicator { background-color: ${cellFocusBackgroundColor} !important; }`); }
collector.addRule(`.notebookOverlay .markdown-cell-row:hover,
.notebookOverlay .markdown-cell-row.focused { background-color: ${cellFocusBackgroundColor} !important; }`); const cellHoverBackgroundColor = theme.getColor(cellHoverBackground);
if (cellHoverBackgroundColor) {
collector.addRule(`.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: ${cellHoverBackgroundColor} !important; }`);
} }
const focusedEditorIndicatorColor = theme.getColor(focusedEditorIndicator); const focusedCellBorderColor = theme.getColor(focusedCellBorder);
if (focusedEditorIndicatorColor) { collector.addRule(`.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-top:before,
collector.addRule(`.notebookOverlay .monaco-list-row.cell-editor-focus .cell-editor-part:before { outline: solid 1px ${focusedEditorIndicatorColor}; }`); .monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.focused .cell-focus-indicator-bottom:before,
.monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused:before,
.monaco-workbench .notebookOverlay .monaco-list .markdown-cell-row.focused:after {
border-color: ${focusedCellBorderColor} !important;
}`);
const focusedEditorBorderColorColor = theme.getColor(focusedEditorBorderColor);
if (focusedEditorBorderColorColor) {
collector.addRule(`.notebookOverlay .monaco-list-row.cell-editor-focus .cell-editor-part:before { outline: solid 1px ${focusedEditorBorderColorColor}; }`);
} }
const editorBorderColor = theme.getColor(notebookCellBorder); const editorBorderColor = theme.getColor(notebookCellBorder);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册